From dfa40571e02975247094179f3ebc893e4b630241 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 1 May 2009 23:13:22 +0000 Subject: Keeping the pkg_preinst is causing more problems than removing it, such as bug 267363 Package-Manager: portage-2.2_rc31/cvs/Linux i686 --- www-client/mozilla-firefox-bin/ChangeLog | 7 ++++++- www-client/mozilla-firefox-bin/Manifest | 16 +++------------- .../mozilla-firefox-bin-3.0.10.ebuild | 10 +--------- .../mozilla-firefox-bin-3.5_beta4.ebuild | 10 +--------- 4 files changed, 11 insertions(+), 32 deletions(-) (limited to 'www-client/mozilla-firefox-bin') diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog index 5311e2e49834..cec19c973f8d 100644 --- a/www-client/mozilla-firefox-bin/ChangeLog +++ b/www-client/mozilla-firefox-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/mozilla-firefox-bin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.188 2009/05/01 14:07:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.189 2009/05/01 23:13:22 nirbheek Exp $ + + 01 May 2009; Nirbheek Chauhan + mozilla-firefox-bin-3.0.10, mozilla-firefox-bin-3.5_beta4: + Keeping the pkg_preinst is causing more problems than removing it, such as + bug 267363 01 May 2009; Markus Meier mozilla-firefox-bin-3.0.10.ebuild: diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest index 01b85ff3b9b9..d5a57b65a88a 100644 --- a/www-client/mozilla-firefox-bin/Manifest +++ b/www-client/mozilla-firefox-bin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 AUX 71firefox-bin 22 RMD160 ad8d15a66d2f0d4b161808ca864f4d7c50faabd5 SHA1 9377344783592ae53aaeb9f0ae9992dae717b01b SHA256 2df8e74b89bfdad94bf1e534149b308b6905d1c3bfb6c927278d2ef5cb0f2fa4 AUX icon/mozilla-firefox-bin-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e @@ -241,15 +238,8 @@ DIST mozilla-firefox-3.5_beta4-vi.xpi 128228 RMD160 964c929d0fbc2a81d74e0abed0c9 DIST mozilla-firefox-3.5_beta4-zh-CN.xpi 126033 RMD160 a2343d51887abc7f547baa6da91d7d9ce6d4ad87 SHA1 7cf2b07514f3d91cdff51c8b6afc58b606c55e4d SHA256 e3ff4fabdeb2f98e321bab0e0ddc4f2787c74c3e778f01f72de000499b261544 DIST mozilla-firefox-3.5_beta4-zh-TW.xpi 127480 RMD160 42e0884588d74e69935c9928581ec7c215977c62 SHA1 bb2e54ea702d4810e3599d09b0fce233b8bedb15 SHA256 b45e00acb35b19a935372b1e935439e37051a73754f5f88161d82cec3d3f3659 EBUILD mozilla-firefox-bin-2.0.0.19.ebuild 4701 RMD160 6b173d28048981bfffee808332e492b565b62eea SHA1 777a7fc78f4ef999319ab6973e5aef99557152cf SHA256 baad50d084db89a6585437e3332df96c57e3c1cbecef6a491171bc09e777a887 -EBUILD mozilla-firefox-bin-3.0.10.ebuild 5071 RMD160 94c179b663c8f09ab0b42e405d54a8cc53c43f3a SHA1 1d9ea0244adb78123f847fbc33a2c9b0bdc5aa4f SHA256 b47ee73eab9805e88e2ca3ccb6eb5bed6861d6935675b4264e80b1a27e66feca +EBUILD mozilla-firefox-bin-3.0.10.ebuild 4874 RMD160 396fba0b6b44109d6d60063e482033b85befdc9f SHA1 1ea512dc3f708443fff4ebbb7f50812e7bb1d008 SHA256 68c85f909e4ea72add6f340fada7cb4ed57345b37000368675742729ec9d28bf EBUILD mozilla-firefox-bin-3.0.8.ebuild 5061 RMD160 3930d61a5e2a768f5a71696c60b45fc99b410a95 SHA1 b4199883c73fd4df5c64293d603be91a0cc77764 SHA256 bc9f7e97b6651e438613a49580fc98cef46eb59b2bc7fd43ba443c8218d6318a -EBUILD mozilla-firefox-bin-3.5_beta4.ebuild 5259 RMD160 06d6b852975afb4c9fd9c96b22bbaa0525ae72b0 SHA1 7fcda813cb30689c458f88fe02d9e6f8dcabd469 SHA256 eeb35eed902124ae39d88c0936e663bceee838b937b0c3c112dc7d3f5682987a -MISC ChangeLog 35044 RMD160 55a2ae154e04e2ca5b3fb2aaadee5dc96800118d SHA1 b241dd3e83be759865505e9d9371339c920218ac SHA256 6b6b78de11dc1ebb97ad51e5d1a23f47d94574b645c1c844c6ae9135ea3ce5cb +EBUILD mozilla-firefox-bin-3.5_beta4.ebuild 5061 RMD160 bbea650eb34b68994c6327efbe7dda29b58eb65f SHA1 d738d7397cb96a504fc73bd9a9fc7a120d8575c2 SHA256 aa332c3a79ba17ee82bbd5cec1a409a0fa077a0fc9774d0d3dde411343adf070 +MISC ChangeLog 35252 RMD160 a0530ef8f1aaaeb90f287a2c6b6e7d27bf2dbbf7 SHA1 fb9072770bd486c864f615efe2e8a7dbcfeadcb7 SHA256 ecb6bc9cf046b0f5bf10da337d2e25f105c07bdb078d89a017fc2f33e2637422 MISC metadata.xml 361 RMD160 875569d22de792136757a0f5885f7fdd11b40691 SHA1 ef5fecfad87eceaeb1b4af3bbfa4bacebf714277 SHA256 adcb3648206e341af38e084574e9e4851e4e51ffa7356bbeaf205e3e16553d3b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkn7AiMACgkQkKaRLQcq0GIhZgCfas8azs+EsXOPPqUljB0Z9mtl -9T4AoJAPrUWerypxkQmR+bF+UBnaz7BW -=HHLE ------END PGP SIGNATURE----- diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild index baefa697d315..564a9fe4cd39 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild,v 1.3 2009/05/01 14:07:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.10.ebuild,v 1.4 2009/05/01 23:13:22 nirbheek Exp $ EAPI="2" inherit eutils mozilla-launcher multilib mozextension @@ -138,14 +138,6 @@ EOF dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins } -pkg_preinst() { - declare MOZILLA_FIVE_HOME=/opt/firefox - - # Remove entire installed instance to prevent all kinds of - # problems... see bug 44772 for example - rm -rf "${ROOT}"${MOZILLA_FIVE_HOME} -} - pkg_postinst() { if use x86; then if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild index c9fde2b598ec..fde26c01f7ae 100644 --- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild +++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild,v 1.1 2009/04/28 14:17:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5_beta4.ebuild,v 1.2 2009/05/01 23:13:22 nirbheek Exp $ EAPI="2" inherit eutils mozilla-launcher multilib mozextension @@ -144,14 +144,6 @@ EOF dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins } -pkg_preinst() { - declare MOZILLA_FIVE_HOME=/opt/firefox - - # Remove entire installed instance to prevent all kinds of - # problems... see bug 44772 for example - rm -rf "${ROOT}"${MOZILLA_FIVE_HOME} -} - pkg_postinst() { if use x86; then if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ -- cgit v1.2.3-65-gdbad