diff options
author | Aron Griffis <agriffis@gentoo.org> | 2004-05-28 02:41:33 +0000 |
---|---|---|
committer | Aron Griffis <agriffis@gentoo.org> | 2004-05-28 02:41:33 +0000 |
commit | d514921d91faf0f45cffc6689e97c80abd5ab021 (patch) | |
tree | ba77adfcf6d7c20cc95459c99dbf247f13be6de4 | |
parent | arm KEYWORDS (diff) | |
download | historical-d514921d91faf0f45cffc6689e97c80abd5ab021.tar.gz historical-d514921d91faf0f45cffc6689e97c80abd5ab021.tar.bz2 historical-d514921d91faf0f45cffc6689e97c80abd5ab021.zip |
Allow installation alongside mozilla-firefox-bin now that they can co-exist and are both mozilla-launcher-powered. Update symlinks in postinst and postun
-rw-r--r-- | net-www/mozilla-firefox/ChangeLog | 7 | ||||
-rw-r--r-- | net-www/mozilla-firefox/Manifest | 4 | ||||
-rw-r--r-- | net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild | 16 |
3 files changed, 20 insertions, 7 deletions
diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog index 5e736f3e0f44..af0ebc982bc3 100644 --- a/net-www/mozilla-firefox/ChangeLog +++ b/net-www/mozilla-firefox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/mozilla-firefox # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.34 2004/05/07 19:31:30 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.35 2004/05/28 02:41:33 agriffis Exp $ + + 27 May 2004; Aron Griffis <agriffis@gentoo.org> + mozilla-firefox-0.8-r3.ebuild: + Allow installation alongside mozilla-firefox-bin now that they can co-exist + and are both mozilla-launcher-powered. Update symlinks in postinst and postun 07 May 2004; Aron Griffis <agriffis@gentoo.org> mozilla-firefox-0.8-r2.ebuild, mozilla-firefox-0.8-r3.ebuild: diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest index 5240a5834dd2..04a977ce1f5b 100644 --- a/net-www/mozilla-firefox/Manifest +++ b/net-www/mozilla-firefox/Manifest @@ -1,8 +1,8 @@ MD5 07327189e5c59dd45903cbf6e73d726a mozilla-firefox-0.8-r2.ebuild 7686 MD5 6577d9ffb39c6cc66a8a8fb41307e1c6 mozilla-firefox-0.8.ebuild 7672 MD5 7eec2b27a51c55f06d60487bb24e33be mozilla-firefox-0.8-r1.ebuild 7594 -MD5 038b80d8fa2e1dafeb79b8ba966552ff mozilla-firefox-0.8-r3.ebuild 8301 -MD5 f080e438536cb1ad77853aff21d29312 ChangeLog 5670 +MD5 d48632b9ac3bbd9c73db1f6da661bb2a mozilla-firefox-0.8-r3.ebuild 8529 +MD5 bbf6b055134072fb784e5438f8255227 ChangeLog 5912 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099 diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild index 43080d9c3b8b..c3b6be5760e3 100644 --- a/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild +++ b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild @@ -1,8 +1,8 @@ # 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/mozilla-firefox-0.8-r3.ebuild,v 1.8 2004/05/07 19:31:30 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild,v 1.9 2004/05/28 02:41:33 agriffis Exp $ -inherit makeedit flag-o-matic gcc nsplugins eutils +inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher S=${WORKDIR}/mozilla @@ -28,8 +28,7 @@ RDEPEND="virtual/x11 gtk2? ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 ) !gtk2? ( =x11-libs/gtk+-1.2* >=gnome-base/ORBit-0.5.10-r1 ) java? ( virtual/jre ) - >=net-www/mozilla-launcher-1.7-r1 - !net-www/mozilla-firefox-bin" + >=net-www/mozilla-launcher-1.7-r1" DEPEND="${RDEPEND} virtual/glibc @@ -277,4 +276,13 @@ pkg_postinst() { find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || : # Fix permissions on chrome files find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : + + # This should be called in the postinst and postun of all the + # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and + # thunderbird-bin ebuilds. + update_mozilla_launcher_symlinks +} + +pkg_postun() { + update_mozilla_launcher_symlinks } |