Keeping the pkg_preinst is causing more problems than removing it, such as bug 268060

Package-Manager: portage-2.2_rc31/cvs/Linux i686

5 files changed, 15 insertions, 31 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 7e5f160c4a24..3cf3656e542f 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.127 2009/03/21 00:19:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.128 2009/05/02 00:03:44 nirbheek Exp $
+
+  01 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  mozilla-thunderbird-bin-2.0.0.21, mozilla-thunderbird-bin-3.0_beta2:
+  Keeping the pkg_preinst is causing more problems than removing it, such as
+  bug 268060
 
   21 Mar 2009; Markus Meier <maekke@gentoo.org>
   mozilla-thunderbird-bin-2.0.0.21.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.ebuild
index 4166b6f74244..10c7c168a9fa 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.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/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.ebuild,v 1.3 2009/03/21 00:19:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-2.0.0.21.ebuild,v 1.4 2009/05/02 00:03:44 nirbheek Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -127,14 +127,6 @@ src_install() {
 	doenvd "${FILESDIR}"/71thunderbird-bin
 }
 
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME="/opt/thunderbird"
-
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf "${ROOT}"${MOZILLA_FIVE_HOME}
-}
-
 pkg_postinst() {
 	elog "For enigmail, please see instructions at"
 	elog "  http://enigmail.mozdev.org/"
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.ebuild
index 68f015b3eb29..3592fa429b8c 100644
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.ebuild
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.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/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.ebuild,v 1.2 2009/04/04 17:35:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-3.0_beta2.ebuild,v 1.3 2009/05/02 00:03:44 nirbheek Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -128,14 +128,6 @@ src_install() {
 	doenvd "${FILESDIR}"/71thunderbird-bin
 }
 
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME="/opt/thunderbird"
-
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf "${ROOT}"${MOZILLA_FIVE_HOME}
-}
-
 pkg_postinst() {
 	#elog "For enigmail, please see instructions at"
 	#elog "  http://enigmail.mozdev.org/"
diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 66243337cfc1..9f698a41aff5 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.290 2009/03/22 15:24:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.291 2009/05/01 23:59:26 nirbheek Exp $
+
+  01 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  mozilla-thunderbird-2.0.0.21:
+  Keeping the pkg_preinst is causing more problems than removing it, such as
+  bug 268060
 
   22 Mar 2009; Raúl Porcel <armin76@gentoo.org>
   mozilla-thunderbird-2.0.0.21.ebuild:
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild
index 83db1d3e9892..133c9fc44d67 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.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/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild,v 1.6 2009/03/22 15:24:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.21.ebuild,v 1.7 2009/05/01 23:59:26 nirbheek Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -185,16 +185,6 @@ src_compile() {
 	emake || die
 }
 
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	elog "Removing old installs with some really ugly code.  It potentially"
-	elog "eliminates any problems during the install, however suggestions to"
-	elog "replace this are highly welcome.  Send comments and suggestions to"
-	elog "mozilla@gentoo.org."
-	rm -rf "${ROOT}"/"${MOZILLA_FIVE_HOME}"
-}
-
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"