diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-04-26 01:41:16 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-04-26 01:41:16 +0000 |
| commit | 808cfd1424d5c8013281af6fe94e6a5ae8593b38 (patch) | |
| tree | 50434d1aa9760feed26998c9ffb0028961bc43a4 /net-www | |
| parent | Version bump (Manifest recommit) (diff) | |
| download | gentoo-2-808cfd1424d5c8013281af6fe94e6a5ae8593b38.tar.gz gentoo-2-808cfd1424d5c8013281af6fe94e6a5ae8593b38.tar.bz2 gentoo-2-808cfd1424d5c8013281af6fe94e6a5ae8593b38.zip | |
Fix bug 45698 (mozilla-firefox forces downgrade to gtk+-2.2*)
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild index d107d49c782e..a4a6269881c6 100644 --- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild +++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild,v 1.3 2004/03/21 18:10:01 jhuebel Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8.ebuild,v 1.4 2004/04/26 01:41:16 agriffis Exp $ inherit nsplugins eutils @@ -18,11 +18,17 @@ SLOT="0" LICENSE="MPL-1.1 NPL-1.1" DEPEND="virtual/glibc" -RDEPEND="x86? ( >=sys-libs/lib-compat-1.0-r2 ) - amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 ) - x86? ( =x11-libs/gtk+-2.2* ) - amd64? ( >=app-emulation/emul-linux-x86-gtklibs-1.0 ) +RDEPEND="virtual/x11 + x86? ( + >=sys-libs/lib-compat-1.0-r2 + >=x11-libs/gtk+-2.2* + ) + amd64? ( + >=app-emulation/emul-linux-x86-baselibs-1.0 + >=app-emulation/emul-linux-x86-gtklibs-1.0 + ) virtual/x11 + net-www/mozilla-launcher !net-www/mozilla-firefox" src_install() { @@ -30,11 +36,11 @@ src_install() { PLUGIN_DIR="/usr/lib/nsbrowser/plugins" dodir /${PLUGIN_DIR} + # Install firefox in /opt dodir /opt - mv ${S} ${D}/opt/firefox - # Plugin path setup (rescuing the existent plugins) + # Plugin path setup (rescuing the existing plugins) src_mv_plugins /opt/firefox/plugins # Fixing permissions @@ -45,23 +51,19 @@ src_install() { einfo "Enabling truetype fonts. Filesdir is ${FILESDIR}" epatch ${FILESDIR}/firebird-0.7-antialiasing-patch - # Misc stuff + # XXX: should become symlink to mozilla-launcher dobin ${FILESDIR}/firefox # Install icon and .desktop for menu entry - if [ "`use gnome`" ] - then + if use gnome; then insinto /usr/share/pixmaps doins ${FILESDIR}/icon/firefox-icon.png - insinto /usr/share/gnome/apps/Internet doins ${FILESDIR}/icon/mozillafirefox.desktop fi - } pkg_preinst() { # Remove the old plugins dir pkg_mv_plugins /opt/firefox/plugins } - |