Use the thunderbird enigmail theme #45609

Package-Manager: portage-2.0.51.22-r1

3 files changed, 29 insertions, 18 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index d95a2c915071..a752fa05743e 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # 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.59 2005/06/22 19:35:36 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.60 2005/06/23 18:00:06 agriffis Exp $
+
+  23 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  mozilla-thunderbird-1.0.2-r1.ebuild:
+  Use the thunderbird enigmail theme #45609
 
 *mozilla-thunderbird-1.0.2-r1 (22 Jun 2005)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 5be53702a2b8..fd903a721955 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 cd216f0b74621c41992dfcf451636054 mozilla-thunderbird-1.0.2.ebuild 6174
-MD5 52881cc9030c1044343d210cb0ef9f1c mozilla-thunderbird-1.0.2-r1.ebuild 6183
-MD5 b5f55fdfa65035bbd6f4e1831ad9ef12 ChangeLog 6775
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 685201e1f278fec494aa6820d8c2714d ChangeLog 6911
+MD5 120dc0cff33695dfed54d87c79b7bc73 mozilla-thunderbird-1.0.2-r1.ebuild 6282
+MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
-MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
 MD5 f904cce3be497c53c3ffd5373b7851b4 files/digest-mozilla-thunderbird-1.0.2-r1 207
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
 MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCub3Ql5AvwDPiUowRAgIhAJ947WUd0P7vfL5YLbhesxPZptIB0QCfUxuT
-YDZRXyEWMqE92hOROrEivxw=
-=UCrA
+iD8DBQFCuvjLBXaUFmZvwyMRAgSdAKDIhWP+ADhSB7ka1aaZg3T8wPl6CACgx/s4
+PMlInDsMBTGfwd1eBrczQPk=
+=Otu5
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild
index 8b385d64571f..44d365921ae0 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.1 2005/06/22 19:35:36 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild,v 1.2 2005/06/23 18:00:06 agriffis Exp $
 
 IUSE="crypt"
 
@@ -107,12 +107,19 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/$(get_libdir)/MozillaThunderbird
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaThunderbird
+	declare tb_libdir=/usr/$(get_libdir)/MozillaThunderbird
+
+	dodir ${tb_libdir}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${tb_libdir}
+
+	# use the right theme for thunderbird #45609
+	if use crypt; then
+		mv ${D}${tb_libdir}/chrome/enigmail-skin-tbird.jar \
+			${D}${tb_libdir}/chrome/enigmail-skin.jar
+	fi
 
 	# fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaThunderbird
+	chown -R root:root ${D}${tb_libdir}
 
 	# use mozilla-launcher which supports thunderbird as of version 1.6.
 	# version 1.7-r1 moved the script to /usr/libexec
@@ -127,11 +134,12 @@ src_install() {
 export MOZILLA_LAUNCHER=thunderbird
 exec /usr/libexec/mozilla-launcher "\$@"
 EOF
-chmod 0755 ${D}/usr/bin/thunderbird
+	chmod 0755 ${D}/usr/bin/thunderbird
 
 	# Install icon and .desktop for menu entry
 	insinto /usr/share/pixmaps
 	doins ${FILESDIR}/icon/thunderbird-icon.png
+
 	# Fix bug 54179: Install .desktop file into /usr/share/applications
 	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
 	insinto /usr/share/applications
@@ -141,8 +149,7 @@ chmod 0755 ${D}/usr/bin/thunderbird
 	# be run as a normal user.  Drop in some initialized files to
 	# avoid this.
 	einfo "Extracting thunderbird-${PV} initialization files"
-	tar xjpf ${FILESDIR}/thunderbird-0.7-init.tar.bz2 \
-		-C ${D}/usr/$(get_libdir)/MozillaThunderbird
+	tar xjpf ${FILESDIR}/thunderbird-0.7-init.tar.bz2 -C ${tb_libdir}
 }
 
 pkg_preinst() {