summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2010-10-24 16:03:20 +0000
committerJory Pratt <anarchy@gentoo.org>2010-10-24 16:03:20 +0000
commit70dc70a8be8c2758934bf9284f9d71a9d18dc67a (patch)
tree2fe72918fc763a011f4536cea944b653a2fca3d2 /www-client
parentstable ppc, bug 339234 (diff)
downloadhistorical-70dc70a8be8c2758934bf9284f9d71a9d18dc67a.tar.gz
historical-70dc70a8be8c2758934bf9284f9d71a9d18dc67a.tar.bz2
historical-70dc70a8be8c2758934bf9284f9d71a9d18dc67a.zip
Fix firefox-bin stub creation
Package-Manager: portage-2.1.9.22/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox-bin/ChangeLog5
-rw-r--r--www-client/firefox-bin/Manifest14
-rw-r--r--www-client/firefox-bin/firefox-bin-3.6.11.ebuild15
3 files changed, 18 insertions, 16 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 2ee397c70813..0c4138f4bdb7 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/firefox-bin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.35 2010/10/24 03:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.36 2010/10/24 16:03:20 anarchy Exp $
+
+ 24 Oct 2010; Jory A. Pratt <anarchy@gentoo.org> firefox-bin-3.6.11.ebuild:
+ Fix firefox-bin stub creation
23 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
firefox-bin-3.6.11.ebuild:
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index a072efccf4d0..ba7fa58f43d2 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08
AUX firefox-bin.desktop 182 RMD160 05db60194cd89c92375c327fc63679331ded5ef3 SHA1 6da7835ef01e532f5bf3fa2f915a8b6e29581faf SHA256 c63c092bf0d571d7c84dd4b3e3656ae177a784b22fbb818a0afef7f25f1bbc60
DIST firefox-3.6.10-af.xpi 121642 RMD160 50c0a89c496aa54c8a96cd6614eed2f085eead1e SHA1 972af0933a8e84f700b0ea737ba8217120dd780b SHA256 9dfb774d59e20bd644b376dfc29cbd5bccade61399a06a8139ff516f746fb6b0
@@ -226,14 +223,7 @@ DIST firefox-3.6.9-zh-CN.xpi 127095 RMD160 8deee228e9e5ce633c5349cb5476631e83a62
DIST firefox-3.6.9-zh-TW.xpi 128401 RMD160 de40de1bb68c9cd708bf30049b7cd0b466797f3f SHA1 df9647c5e1cd9087fbaa98ca6502894ecd116383 SHA256 55e63f4d0cdedc4cce01589f0ae5805d831d74ecb1bb5b9eafa3cfea632670b2
DIST firefox-3.6.9.tar.bz2 10630180 RMD160 fa0e4cf3199cda7cf9e8e56298a0891579ca8c78 SHA1 8a43e431af86180500f9f8bbc1428b5c2b3b6016 SHA256 1952575f378cd8053815717b48ec70b8464ebb5065257673bfb66c73347cb56e
EBUILD firefox-bin-3.6.10.ebuild 5232 RMD160 8fe0d846785fe20f648311a9a3208c1db6c2eae3 SHA1 308d86ae826a54bd445dc70fea366107a6a9e77a SHA256 382c97b8dd2b13b292bc1fac239e7a730b8fc8e92ea0a020806006aa4c0964e3
-EBUILD firefox-bin-3.6.11.ebuild 5232 RMD160 402b113c55df5c354602ed86621f60eb4b288515 SHA1 2437a9503f5207db089cbbeca1d0a02eb0b799cc SHA256 285aaf02b4caf2e57ead752634d481fae06f47eb9080addb78da6a60b6c2c558
+EBUILD firefox-bin-3.6.11.ebuild 5414 RMD160 b00deb29c95913a1a2534ceb7d9e9415de3cae2b SHA1 2a246b3aba5815caeeb6bee07a7fa1cdadbbd34b SHA256 d8d1d758a74d43dee7fb774e032a022690fb0ab01ab6d772b3a64c2182828cd2
EBUILD firefox-bin-3.6.9.ebuild 5178 RMD160 3fe8cc04af86d3c7a3ae5d0b5f98061ee708f0c0 SHA1 a9f78bd50267912bd6059de7de570e5ad79ffaa1 SHA256 0d5c829bc3fa3880477a72c1c27792e0985f52e4b4d9a26d6a0352e97e8d2471
-MISC ChangeLog 44945 RMD160 871181234e3fcda2da3aef25e1ebac639c835bab SHA1 ef3bbc08daccc787a1d94597963f39ec565fa63b SHA256 db2bfdd1f55faf5d7296e03d6a0de4c0ac5723e78efa6bb6a3c57f685db03637
+MISC ChangeLog 45054 RMD160 fd5d8dd0be4b4b19e44b971fca49fcaa9f85955b SHA1 91fac56ad78ef663326dfc3b8caf872b5c936178 SHA256 44e6bb31cbf0a5854c4e33df9e04d84e064b7626c933adbab19e64faea3cac12
MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzDowAACgkQ9/cejkQaxBAbpACfa7VSjM3WNaprj7WyAulFWevZ
-TCgAn2M0peSDUkcrRgsex8MwRvkquB1A
-=FYl7
------END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/firefox-bin-3.6.11.ebuild b/www-client/firefox-bin/firefox-bin-3.6.11.ebuild
index 4086e6b7e07c..d603ac317707 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.11.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.11.ebuild,v 1.2 2010/10/24 03:07:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.11.ebuild,v 1.3 2010/10/24 16:03:20 anarchy Exp $
EAPI="2"
inherit eutils mozilla-launcher multilib mozextension
@@ -133,16 +133,25 @@ src_install() {
fi
# Create /usr/bin/firefox-bin
+if use amd64 ; then
+ dodir /usr/bin/
+ cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="/opt/firefox/"
+GTK_PATH=/usr/lib32/gtk-2.0/
+exec /opt/${MY_PN}/${MY_PN} "\$@"
+EOF
+else
dodir /usr/bin/
cat <<EOF >"${D}"/usr/bin/${PN}
#!/bin/sh
unset LD_PRELOAD
LD_LIBRARY_PATH="/opt/firefox/"
-if use amd64 ; then
GTK_PATH=/usr/lib32/gtk-2.0/
-fi
exec /opt/${MY_PN}/${MY_PN} "\$@"
EOF
+fi
fperms 0755 /usr/bin/${PN}
# revdep-rebuild entry