Port nsplugins patch from firefox ebuild. Do registration in pkg_postrm as

well as pkg_postinst. More synchronization goodness from mozilla and firefox
ebuilds
(Portage version: 2.0.51.22-r2)

4 files changed, 34 insertions, 11 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 340417ea8d71..3838cdeac400 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.75 2005/07/21 22:02:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.76 2005/07/22 00:00:36 agriffis Exp $
+
+  22 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  mozilla-thunderbird-1.0.6-r2.ebuild:
+  Port nsplugins patch from firefox ebuild. Do registration in pkg_postrm as
+  well as pkg_postinst. More synchronization goodness from mozilla and firefox
+  ebuilds
 
 *mozilla-thunderbird-1.0.6-r2 (21 Jul 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 689a774aa3e9..c8eefed4b9e6 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,12 +1,12 @@
 MD5 9f8a30a5db14358d2dc4415696e127af mozilla-thunderbird-1.0.5-r1.ebuild 4322
 MD5 4bc9516d4d3a8f835aedb450aa72caf4 mozilla-thunderbird-1.0.5.ebuild 4259
-MD5 709172844f8335af1cbf9ce1a6630219 mozilla-thunderbird-1.0.6-r2.ebuild 4846
+MD5 dd0cd6f47c8e965cd7878843dfa30a82 mozilla-thunderbird-1.0.6-r2.ebuild 5298
 MD5 6a798599c187778330701336acd07216 ChangeLog 10296
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5-r1 156
-MD5 a3e105f581342bc2ad6e81463ce2989c files/digest-mozilla-thunderbird-1.0.6-r2 227
+MD5 7bb4144812a01ca4baebba3acc63b143 files/digest-mozilla-thunderbird-1.0.6-r2 307
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 360f4688625a7f73f782b59d4b9575bd files/digest-mozilla-thunderbird-1.0.5 156
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2
index 9f4daad3fbaa..13ea2738b58e 100644
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.6-r2
@@ -1,3 +1,4 @@
 MD5 a0ddcc8bd5ee2c9be724b6963ad27111 thunderbird-1.0.6-source.tar.bz2 33366077
 MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
 MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild
index d0d6f645d117..39c2768bee59 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild,v 1.1 2005/07/21 22:02:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.6-r2.ebuild,v 1.2 2005/07/22 00:00:36 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2
 	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch"
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
@@ -28,7 +30,12 @@ export MOZILLA_OFFICIAL=1
 export MOZ_THUNDERBIRD=1
 
 src_unpack() {
-	unpack thunderbird-${PV}-source.tar.bz2 || die "unpack failed"
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
 	cd ${S} || die "cd failed"
 
 	####################################
@@ -53,17 +60,20 @@ src_unpack() {
 	#
 	####################################
 
-	# GCC 4 compile patch ; bug #87800
+	# GCC4 compile fix, bug #87800
 	epatch ${FILESDIR}/${PN}-1.0.2-gcc4.patch
 
 	# patch out ft caching code since the API changed between releases of
 	# freetype; this enables freetype-2.1.8+ compat.
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
 	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+
+	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
+	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.patch
 }
 
 src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
 	####################################
 	#
@@ -104,7 +114,7 @@ src_compile() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/mozilla-thunderbird
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
 	# Most of the installation happens here
 	dodir ${MOZILLA_FIVE_HOME}
@@ -131,7 +141,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
 
 	# Update the component registry
 	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
@@ -149,5 +159,11 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
 	update_mozilla_launcher_symlinks
 }