summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2010-02-14 23:38:45 +0000
committerJory Pratt <anarchy@gentoo.org>2010-02-14 23:38:45 +0000
commite79e142781b0223962771fc53c6932ee815312e8 (patch)
tree79c9514a59f1cfb42c465068ca8256d05056c6de /www-client
parentBump to -r3 so that we can get users to fix the problem reported in bug #303141. (diff)
downloadhistorical-e79e142781b0223962771fc53c6932ee815312e8.tar.gz
historical-e79e142781b0223962771fc53c6932ee815312e8.tar.bz2
historical-e79e142781b0223962771fc53c6932ee815312e8.zip
Add LD_LIBRARY_PATH to launcher, bug #305055
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox-bin/ChangeLog8
-rw-r--r--www-client/firefox-bin/Manifest4
-rw-r--r--www-client/firefox-bin/firefox-bin-3.6-r1.ebuild (renamed from www-client/firefox-bin/firefox-bin-3.6.ebuild)6
3 files changed, 11 insertions, 7 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 94aacc4440de..32d93a29a015 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
# 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.6 2010/01/24 12:10:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.7 2010/02/14 23:38:45 anarchy Exp $
+
+*firefox-bin-3.6-r1 (14 Feb 2010)
+
+ 14 Feb 2010; <anarchy@gentoo.org> -firefox-bin-3.6.ebuild,
+ +firefox-bin-3.6-r1.ebuild:
+ Add LD_LIBRARY_PATH to launcher, bug #305055
*firefox-bin-3.6 (24 Jan 2010)
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index c87977f54374..dfb95af1361e 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -195,6 +195,6 @@ DIST firefox-3.6-zh-TW.xpi 128260 RMD160 d80b9aad4a77e21e9a4b9324a2ff6592e41520c
DIST firefox-3.6.tar.bz2 10161471 RMD160 65e78ec9772d1b323ffa7abfa70316c6b6fd47e5 SHA1 4fb39118e63a67ce5ab11d83c144674956394813 SHA256 8c46c9819d96bb863f0e821d7b46cad562ee78ce67916c978c2bc67fd39712ef
EBUILD firefox-bin-3.5.6.ebuild 5183 RMD160 8852c405baab61a15f12e75414f588a4bc457997 SHA1 4ea145d0f0c94acae162a1d2c49a4628a154e844 SHA256 bf4608d8b7f644ec7f87b16b7124edc2384509b22d10c3c24218240367af3cf0
EBUILD firefox-bin-3.5.7.ebuild 5185 RMD160 65fc5a7aa64c7b81b834b2f333e3693fc8dc6b05 SHA1 35331895cc2e57233843860a08ed032aea0790c5 SHA256 c967f4bd00aa8dfef1bfa49cc1f9e59a8a63faac0f51e0cc4ffb3aa3e590dc10
-EBUILD firefox-bin-3.6.ebuild 5183 RMD160 9eb8898761ae69ce83aadf6def87912bc0959a4d SHA1 79aa55ab0a33375526a00028b9f82c5fc1ed8b0b SHA256 bd369f72d3cbae1c5f96d7959c58f9c7bcb2e7118fdebcd14c504e092d52f7c6
-MISC ChangeLog 40797 RMD160 b1cba685ff14dbae7bac0d8efbba56c37b41c87e SHA1 fb276222ca8a36bf54792a55b5be45118c434e7e SHA256 a2bd119d9ec02ec030767384a39210950c5d3df336f71b11b2d668ffdf12f80c
+EBUILD firefox-bin-3.6-r1.ebuild 5156 RMD160 11b9d3087fd0f7a6115fe96ee950be4f5b5a4987 SHA1 755d40af5c500f6f9f3544e8d6bedbaa2c9e4f2f SHA256 4836b0b7fb6625fb911d026961081297bdac201eb2f8a8a8a365d6107f90ae08
+MISC ChangeLog 40971 RMD160 634e20d10092e5bc4076a5f42587528cb9e31aa2 SHA1 a4d48fb77229c65a0278848002e5fa79651f7ff3 SHA256 fc825aae302918fddded3ebcc8433748ee29afb6cfad3239572dcb341e58203b
MISC metadata.xml 361 RMD160 875569d22de792136757a0f5885f7fdd11b40691 SHA1 ef5fecfad87eceaeb1b4af3bbfa4bacebf714277 SHA256 adcb3648206e341af38e084574e9e4851e4e51ffa7356bbeaf205e3e16553d3b
diff --git a/www-client/firefox-bin/firefox-bin-3.6.ebuild b/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild
index 78a9a2b10dc0..e0fc4eb88cca 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6-r1.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.ebuild,v 1.1 2010/01/24 12:10:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6-r1.ebuild,v 1.1 2010/02/14 23:38:45 anarchy Exp $
EAPI="2"
inherit eutils mozilla-launcher multilib mozextension
@@ -134,6 +134,7 @@ src_install() {
cat <<EOF >"${D}"/usr/bin/${PN}
#!/bin/sh
unset LD_PRELOAD
+LD_LIBRARY_PATH="/opt/firefox/"
exec /opt/${MY_PN}/${MY_PN} "\$@"
EOF
fperms 0755 /usr/bin/${PN}
@@ -142,9 +143,6 @@ EOF
insinto /etc/revdep-rebuild
doins "${FILESDIR}"/10${PN} || die
- # install ldpath env.d
- doenvd "${FILESDIR}"/71${PN} || die
-
rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die
}