From 0cae06d2630e396cbfa84d3a3fcb9951a76fe752 Mon Sep 17 00:00:00 2001
From: Raúl Porcel <armin76@gentoo.org>
Date: Wed, 31 Dec 2008 15:28:14 +0000
Subject: Revision bump for 2.0.0.19 Package-Manager: portage-2.1.6.4/cvs/Linux
 2.6.26-gentoo-r2 ia64

---
 x11-plugins/enigmail/ChangeLog                 |   8 +-
 x11-plugins/enigmail/Manifest                  |  32 +---
 x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild | 191 -----------------------
 x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild | 191 -----------------------
 x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild | 205 +++++++++++++++++++++++++
 5 files changed, 215 insertions(+), 412 deletions(-)
 delete mode 100644 x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild
 delete mode 100644 x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild
 create mode 100644 x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild

(limited to 'x11-plugins')

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 75617b56a48d..02ba25e6e76c 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.146 2008/12/14 22:54:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.147 2008/12/31 15:28:14 armin76 Exp $
+
+*enigmail-0.95.7-r3 (31 Dec 2008)
+
+  31 Dec 2008; Raúl Porcel <armin76@gentoo.org> -enigmail-0.95.6-r4.ebuild,
+  -enigmail-0.95.7-r1.ebuild, +enigmail-0.95.7-r3.ebuild:
+  Revision bump for 2.0.0.19
 
   14 Dec 2008; Jeremy Olexa <darkside@gentoo.org> enigmail-0.95.7-r2.ebuild:
   amd64 stable, bug 246628
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b499ce5fbc8a..f122bbfa684f 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -5,29 +5,6 @@ AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SH
 AUX firefox-1.5-visibility-check.patch 10955 RMD160 9a5db3a7d6f5539ca77e116aed276d833925a43a SHA1 b43088167a5a9f86986030979f0a572edc445b73 SHA256 439355e899ea43fd2f82adae6fb4dc7363ca526ce307ce0faba76e533af1dc7c
 AUX firefox-1.5-visibility-fix.patch 485 RMD160 86461454b4723c19c43bb81b77a7067656e0f0ff SHA1 53ad985dfd359edad05ae4be23be553bf13d5648 SHA256 9d9afd53a6c16d81e43b779371bc7d38a95a44c599fe500e368c4024652c058a
 DIST enigmail-0.94.4.tar.gz 571082 RMD160 ad4a06254bf9775b84f3ffae9d521ddcb59827e5 SHA1 725870e4e074b97cd9ca073212c7250198366b97 SHA256 1815c191391bc66d6ee9f78dbb8b49634c51566edfce906fa7d9db6bd5fd8a37
-DIST enigmail-0.95.6-ca-AD.xpi 30605 RMD160 6827573391899f49f03e895b02292dbec0f598cd SHA1 d6d5866521ecf9800f2d7843d22a01a8f9cebd5e SHA256 68c7c716478e2dd9e64dff7bd3b209417665c7dbe12146bc9284880806869721
-DIST enigmail-0.95.6-cs-CZ.xpi 33358 RMD160 30970684d12663138ddde7cb8ee038ca67ebc161 SHA1 6dbfce1d141d3d0157069e61f6afd1811202b582 SHA256 88ef26d77005b5517912edb3aa0fefa49e7145ffc979e6ba13ecc755b48ffc2a
-DIST enigmail-0.95.6-de.xpi 31707 RMD160 45a89393badcb0453984f050b57d5172330b874a SHA1 047f8d425c79d5e9df1585fb9d95c0ee7862cc85 SHA256 16358d6d651640acfbd110b1c3dd8c6f764c90b5bac24d952f99d9eda9c6a9f7
-DIST enigmail-0.95.6-el.xpi 38899 RMD160 c3d90eb73a078a827b1fb180d47e7e3e92de8d50 SHA1 16def878b0c5c3e8fba0194b8a61149f666536ba SHA256 df694f3c2045cb847f1938a483d0c74b223eca80755146cd1dd2aafd67f08327
-DIST enigmail-0.95.6-es-ES.xpi 29637 RMD160 602183e597a6d6924e079c468d93d6e7ee328d40 SHA1 dc16649ab59cd8a88dc24a8e1a85ad65d9b1225d SHA256 8537f7a3ab14b53733e0be89661938a0faff468aa1f1eed14e49f9e7feab25ed
-DIST enigmail-0.95.6-fi-FI.xpi 30081 RMD160 f06aebc55d6d4481c70e0fbba3d7f3c809bea2f9 SHA1 b5b61cc7e6e0104d553ce53185b1e9f5335c7cc0 SHA256 618fd0b74406ff3ac625f99cb3dbca1d4a347b2d36fcb0f3ccf7070387681cb2
-DIST enigmail-0.95.6-fr-FR.xpi 32665 RMD160 d78200280157af1de58ac02981a10b82af34f1ce SHA1 e801eb82ed31a8b6f58f97b3972f4d964cb1e533 SHA256 55ee6357e52ae111b5ad8a0587f34a93c5b97d7f7b1443bccb195e9e8b88d417
-DIST enigmail-0.95.6-hu-HU.xpi 33707 RMD160 2459f373e0a6af92896ea5ae82079e7a0391ef6a SHA1 ac507ffc4f4cd7992fd6651624afbf9368d276f0 SHA256 42aa4c8b3e77f0c211c8b4f83299f57ed1c4132b914acdbc2da74969405884fc
-DIST enigmail-0.95.6-it-IT.xpi 31757 RMD160 936c1747da644bbace844cbf7fe462c6de9d2275 SHA1 6a84ceff3aa556390986bc08526bc973cfe29bc5 SHA256 2761ca7812591751c2e9ea615182a1f2ba8d9812a1903ac13b67aeca21868432
-DIST enigmail-0.95.6-ja-JP.xpi 34024 RMD160 2da46a0f27110e6b8519b8a17850fe0e1aa757cf SHA1 ae3a5a50cf3fa13a629c1f13788a89822f08eae4 SHA256 8af4bedc0f94c48053b24d64381b0a8323f01c3da283f057d05e5c7e6029e359
-DIST enigmail-0.95.6-ko-KR.xpi 33683 RMD160 53157cecc20ca0d47716d32f8ecfb6af9cb09781 SHA1 7b0df520ca5168a1a304d5502a6274ef86ed16cc SHA256 680321c7d04651a0f7f9edd6d2a7e4d31a80be7c4dcf53a9e42fd90558781afc
-DIST enigmail-0.95.6-nb-NO.xpi 29634 RMD160 297ea983b4272b0435be36cb15e80aab05676807 SHA1 13acd543af381b1cd250c757ed68f88f4a1f68e3 SHA256 eab131a7ecb6fd70214e971002bb3437c1329a51bec1576f2a2b55e2829b5376
-DIST enigmail-0.95.6-pl-PL.xpi 31811 RMD160 d3cbe067173bd95ed2985b9c844dc3316a29862c SHA1 48ff0b0952d8d761521ed55fb159ea04547532e5 SHA256 c7ea658e75548643ee5b60a7d54c94788e3ea24e98b850b947fda17a7c70c6b3
-DIST enigmail-0.95.6-pt-BR.xpi 32891 RMD160 03f9661f6b0ddc3550313180171483a4ee35dd66 SHA1 b8c60014cec1042bdfd5d12acf7d3a7ecd7bd37d SHA256 c1ac0d55859bd6caa9982e14e8ec635365783e5cc106e96fc873ecd295a4771f
-DIST enigmail-0.95.6-pt-PT.xpi 31702 RMD160 dde72992f27c5a373dbf336c794173a07b0f2ba9 SHA1 d8bbeb7c84c10df6785ecd9bf5594246b45b0e3a SHA256 8886ad0f82b9eaab8504de52a0c33292955fc8f0a602e5facd7d16a02a41c57d
-DIST enigmail-0.95.6-ro-RO.xpi 30984 RMD160 0a912798b433e6917d0ef7ea361440ab426bfceb SHA1 3c6cf19fce48366e0f039ade18cadb35c0cc6473 SHA256 10d5128f09e07df9e5c30c9c74318594853359b8578ba2e000327c6c6bae5893
-DIST enigmail-0.95.6-ru-RU.xpi 34504 RMD160 a12e26c7a2976dbd22234b9ca75d01a83e2b43b3 SHA1 ccd547b2e027e3ca87b6bf50d74e01b56a1c4468 SHA256 9f8f6d5e6a42c0b4c0f518ed481c4163a92aa8ea43e5287f5e6813604b1e3340
-DIST enigmail-0.95.6-sl-SI.xpi 35703 RMD160 fee4fd189dbc8da57b75e10bc91b0c0bbfd7cba0 SHA1 976f9bc4ed0162bc7a73453fb654d14c3feac4f7 SHA256 f2b129ef86502e4f69098c800ba299555c02288def9492d29f4a2699530382bf
-DIST enigmail-0.95.6-sv-SE.xpi 31284 RMD160 bc8d6ebaf8e6d3b10024c054e6fb0e67a37eb6b0 SHA1 cf0c77abe48730cbddf650afa3407cd90b1c7d97 SHA256 95e5f918763d7f87b3b2d8d4ddf6427c1f6090e83ce905ae2b24aea88394294d
-DIST enigmail-0.95.6-tr-TR.xpi 30638 RMD160 44110bbb7b4e30ebfe05e0c798337a7a139f8860 SHA1 67b7b83f0c800cbf7ece740b4496ccaf760f60ec SHA256 e2d6769c830e0604cd3b7996f627de09995f25d4c8843bb023c88ca78e29ae94
-DIST enigmail-0.95.6-zh-CN.xpi 31621 RMD160 3adf067c27060706b0b5649b2bd0cda9bbbf3f54 SHA1 657e4353cadf1760438b0b3b956288cb08b93c60 SHA256 f73339e2e9edd9f447b8101885c78b5f19ad7d3f4e52121f0141ecbf63b14412
-DIST enigmail-0.95.6-zh-TW.xpi 31721 RMD160 dfe5c6cc8162fc361c075b8e5c70fced41e3880f SHA1 034f5ac8312e5cbf4b977fa817e4aec93243a9b3 SHA256 d3ee112972b4e7788d34841121fadc0083d5e50fc14ce8e1355b765fa8aaaf42
-DIST enigmail-0.95.6.tar.gz 1183899 RMD160 1ac4f3946f1371633b4c89692fd9c62adb0de4e3 SHA1 47259c22b5aa67ff73556eb0b269409eb064be37 SHA256 08d77f64ae8f240530e1c448427725ac5baa6e7465dffd1fec8e52298862d5f9
 DIST enigmail-0.95.7-ar.xpi 31417 RMD160 56c565137f1faf20acbe7bd9d4fba8c630b9117a SHA1 5350069cb9130377e383a522a547a4d73dd38cae SHA256 ac30f5f49bf5954fc676a22403371ed3bfc78e4b898dd3929cd9cd5a8dccfa3a
 DIST enigmail-0.95.7-ca-AD.xpi 30605 RMD160 6827573391899f49f03e895b02292dbec0f598cd SHA1 d6d5866521ecf9800f2d7843d22a01a8f9cebd5e SHA256 68c7c716478e2dd9e64dff7bd3b209417665c7dbe12146bc9284880806869721
 DIST enigmail-0.95.7-cs-CZ.xpi 33167 RMD160 07603183856f8b0a19478c09c069bd57f5690b38 SHA1 0a5f50f0be85deed2a4cf40934bf3833c0275c9f SHA256 c5bc7dfb86f7853f1c736af6fd0ae384cc9b8985366d8f2a10d76109d3317931
@@ -76,15 +53,12 @@ DIST enigmail-sl-SI-0.9x.xpi 30090 RMD160 3f2f81d526c4665100f154231310a36c4aeeab
 DIST enigmail-sv-SE-0.9x.xpi 30803 RMD160 5f4259a55e6753a6ec61a7a5eac64b365d3a1973 SHA1 49e1d49ce5e53bba196dd75867b0b660078b4337 SHA256 afa3b754d9372cc531752e83909c6147cdc10d7a5ef42f364dc8cbbc686af93c
 DIST enigmail-zh-CN-0.9x.xpi 31747 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 SHA1 8a6da45522b3853ce7bf6774d3ee5f2798591cff SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512
 DIST mozilla-thunderbird-1.5.0.10-patches-0.1.tar.bz2 30777 RMD160 08da7a7dadfc731e5e18d86ca9aa2679eb14fa1d SHA1 7e9862eafbb41f603aa354eab8ccf7347afa71a2 SHA256 7bf7d7abe757cc1dc0ce67fe083c6663fedbcc6e6bdd65cc09ce543ac8e54b9c
-DIST mozilla-thunderbird-2.0.0.14-patches-0.1.tar.bz2 29619 RMD160 999148d25487b7e52bd976b07a61881220f6d55c SHA1 c02eee8c8ec0757339ff97769cf67f718270fa7e SHA256 3a992616dc65315a8e55efc83a4efaacf18352a235813207ad1de994ebc09a07
 DIST mozilla-thunderbird-2.0.0.16-patches-0.1.tar.bz2 30163 RMD160 58d8b067c9a15d9e550b9264a3406d61d8bb7406 SHA1 38e41cc7fbe382991637fd67374ee4df87402273 SHA256 afa27ebd5203a4897f896135733fd74f4aebeddfad5ff6126f7e89196ae37e51
 DIST thunderbird-1.5.0.13-source.tar.bz2 36162915 RMD160 6d9d8c1ea091725728ad0400c58b606a73346ef9 SHA1 2275d92724976896b6529ceb8ae890b10bc94109 SHA256 1849df86b6f145ff974e5a478e985a8ee8c3239e8a187d6dcba176b8730358db
-DIST thunderbird-2.0.0.16-source.tar.bz2 40418085 RMD160 6100058cca8d75e108a11b09d03b85d705ca48c2 SHA1 30092e38d621c30af02653d3bf246d98d2533853 SHA256 9a566725ac2f4f7ddcbbf0dbee90265ca63180557fa27843d5ea43ac0ff3a396
-DIST thunderbird-2.0.0.17-source.tar.bz2 40444452 RMD160 983ee59312b2dabdebfed2751ab38168a0bfb6fc SHA1 98a7ff5206fe1bddcb895dc2276e348229af99d9 SHA256 526eda34654499e7838b4fc47a3329905b643b30241e599bf4bf3ab609ff1aec
 DIST thunderbird-2.0.0.18-source.tar.bz2 40455125 RMD160 093b2328a000f18494fd552cce58fa2ec55085a1 SHA1 4d05300280763e34c7a115835523ed2805f7733c SHA256 f18f97833661b260d819161080329f857e489b3c934f4648012b8728b7f3d597
+DIST thunderbird-2.0.0.19-source.tar.bz2 40452690 RMD160 7139fb27b1a236564ee6470c4be13e93b6ec9217 SHA1 4d2e0f8b405bb0ceab20a9f570ce91cf4640f456 SHA256 9a23d3a93c7646867227558727cf564eaba70da87e21e097eb46d951ed839f25
 EBUILD enigmail-0.94.4.ebuild 5818 RMD160 4b058e7ded7b6bfd2820420bfadf8c4456e5c7b9 SHA1 5991031893581a3f7aa602a41e5189f9cd2b0d82 SHA256 78b56db0dfd8c75b997d568ac85d68d7f477e8f3935180a2036c4849cf0d40ab
-EBUILD enigmail-0.95.6-r4.ebuild 5703 RMD160 7828be7ff6f0ca54b1df0f04089e80329bd69569 SHA1 bbfc2c77f6889fb994457441a02e832ffb42737a SHA256 51ff56bfab00b28d447d0246adbc92ccb2c693c35b679d2b5c3385b472a9d6aa
-EBUILD enigmail-0.95.7-r1.ebuild 5708 RMD160 d66b561424bf5803de0bbb297a7e98133160f52d SHA1 7fe37c0de935700224d88fd2e165ccbd1b082e28 SHA256 5955cf83baac47cc0ba2cc4fa116134b8d274b5ac0ba31833d7cf1638a4ed7a5
 EBUILD enigmail-0.95.7-r2.ebuild 6108 RMD160 41ccd37d011a70d3f15cf0a3175030035cc39ed2 SHA1 68cf9e190095f0aedf582b6f4e7f25e4c057f75a SHA256 de639516898fa7172680fd3a3c36ec80cf0caec41c647f482ba5178673c32da6
-MISC ChangeLog 20175 RMD160 5393b1103137fbcaa8ecaf1dd9a4d4f2c95b9607 SHA1 5f0ecf8d06d210eb025ed618069cac548ed8a985 SHA256 b38dff0531de8f13b474b93f66089a19df631a62a4cebd116059c36f0b077d84
+EBUILD enigmail-0.95.7-r3.ebuild 6114 RMD160 88ecb454d540639ab3abdf1d18d257b26d896e59 SHA1 edbca51f9957182c7a86633f890e45f2733bc6ef SHA256 6ac80d4f3324ebec269d68e92d81e2244214bf5cef8c1cdc460805f577dc5f89
+MISC ChangeLog 20374 RMD160 b335fd653ece5aad7836cb583e8381f37dd39335 SHA1 f58ebe67759644fcd94f53bd0751477b7d28075e SHA256 5db8c27050dac422d21913f599d2f4d5eed7e91a238e4d457d73ed5671bf58fb
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
diff --git a/x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild b/x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild
deleted file mode 100644
index a0bde91fdfb1..000000000000
--- a/x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.6-r4.ebuild,v 1.6 2008/08/04 15:03:30 keytoaster Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
-
-LANGS="de el es-ES nb-NO pt-BR zh-CN"
-NOSHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO pl-PL pt-PT ro-RO ru-RU sl-SI sv-SE tr-TR zh-TW"
-
-EMVER=${PV}
-TBVER="2.0.0.16"
-TBPATCH="2.0.0.14-patches-0.1"
-
-DESCRIPTION="GnuPG encryption plugin for thunderbird."
-HOMEPAGE="http://enigmail.mozdev.org"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
-	mirror://gentoo/mozilla-thunderbird-${TBPATCH}.tar.bz2
-	http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE=""
-
-for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
-	IUSE="${IUSE} linguas_${X/-/_}"
-done
-# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
-
-for X in ${NOSHORTLANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
-	IUSE="${IUSE} linguas_${X%%-*}"
-done
-#( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
-
-DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.4
-	>=www-client/mozilla-launcher-1.56"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-linguas() {
-	linguas=
-	local LANG
-	for LANG in ${LINGUAS}; do
-		if hasq ${LANG} en en_US; then
-			hasq en ${linguas} || \
-				linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif hasq ${LANG} ${LANGS//-/_}; then
-			hasq ${LANG//_/-} ${linguas} || \
-				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		else
-			local SLANG
-			for SLANG in ${NOSHORTLANGS}; do
-				if [[ ${LANG} == ${SLANG%%-*} ]]; then
-					hasq ${SLANG} ${linguas} || \
-						linguas="${linguas:+"${linguas} "}${SLANG}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBPATCH}.tar.bz2 || die "unpack failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi
-	done
-
-	# Apply our patches
-	cd "${S}" || die "cd failed"
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/patch
-
-	# Unpack the enigmail plugin
-	cd "${S}"/mailnews/extensions || die
-	unpack enigmail-${EMVER}.tar.gz
-	cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
-	makemake2
-
-	cd "${S}"
-
-	# Use the right theme for thunderbird #45609
-	sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn
-
-	# Fix installation of enigmail.js
-	epatch "${FILESDIR}"/70_enigmail-fix.patch
-	# Make replytolist work with >0.95.0
-	epatch "${FILESDIR}"/0.95.0-replytolist.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# tb-specific settings
-	mozconfig_annotate '' \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# -fstack-protector breaks us
-	if gcc-version ge 4 1; then
-		gcc-specs-ssp && append-flags -fno-stack-protector
-	else
-		gcc-specs-ssp && append-flags -fno-stack-protector-all
-	fi
-		filter-flags -fstack-protector -fstack-protector-all
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C modules/libreg || die "make modules/libreg failed"
-	emake -C xpcom/string || die "make xpcom/string failed"
-	emake -C xpcom || die "make xpcom failed"
-	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
-
-	# Build the enigmail plugin
-	einfo "Building Enigmail plugin..."
-	emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-
-	# Package the enigmail plugin; this may be the easiest way to collect the
-	# necessary files
-	emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-	declare emid
-
-	cd "${T}"
-	unzip "${S}"/dist/bin/*.xpi install.rdf
-	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-	cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-	unzip "${S}"/dist/bin/*.xpi
-
-	# these files will be picked up by mozilla-launcher -register
-	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
-	insinto ${MOZILLA_FIVE_HOME}/chrome.d
-	newins "${S}"/dist/bin/chrome/installed-chrome.txt ${PN}
-	echo "extension,${emid}" > "${D}"${MOZILLA_FIVE_HOME}/extensions.d/${PN}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/${P}-${X}
-	done
-}
diff --git a/x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild b/x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild
deleted file mode 100644
index f8ae60a11330..000000000000
--- a/x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.7-r1.ebuild,v 1.4 2008/09/28 17:15:19 maekke Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
-
-LANGS="ar de el es-ES nb-NO pt-BR zh-CN"
-NOSHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO pl-PL pt-PT ro-RO ru-RU sk-SK sl-SI sv-SE tr-TR zh-TW"
-
-EMVER=${PV}
-TBVER="2.0.0.17"
-TBPATCH="2.0.0.16-patches-0.1"
-
-DESCRIPTION="GnuPG encryption plugin for thunderbird."
-HOMEPAGE="http://enigmail.mozdev.org"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
-	mirror://gentoo/mozilla-thunderbird-${TBPATCH}.tar.bz2
-	http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE=""
-
-for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
-	IUSE="${IUSE} linguas_${X/-/_}"
-done
-# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
-
-for X in ${NOSHORTLANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
-	IUSE="${IUSE} linguas_${X%%-*}"
-done
-#( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
-
-DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.4
-	>=www-client/mozilla-launcher-1.56"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export MOZ_CO_PROJECT=mail
-
-linguas() {
-	linguas=
-	local LANG
-	for LANG in ${LINGUAS}; do
-		if hasq ${LANG} en en_US; then
-			hasq en ${linguas} || \
-				linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif hasq ${LANG} ${LANGS//-/_}; then
-			hasq ${LANG//_/-} ${linguas} || \
-				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		else
-			local SLANG
-			for SLANG in ${NOSHORTLANGS}; do
-				if [[ ${LANG} == ${SLANG%%-*} ]]; then
-					hasq ${SLANG} ${linguas} || \
-						linguas="${linguas:+"${linguas} "}${SLANG}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBPATCH}.tar.bz2 || die "unpack failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi
-	done
-
-	# Apply our patches
-	cd "${S}" || die "cd failed"
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"/patch
-
-	# Unpack the enigmail plugin
-	cd "${S}"/mailnews/extensions || die
-	unpack enigmail-${EMVER}.tar.gz
-	cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
-	makemake2
-
-	cd "${S}"
-
-	# Use the right theme for thunderbird #45609
-	sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn
-
-	# Fix installation of enigmail.js
-	epatch "${FILESDIR}"/70_enigmail-fix.patch
-	# Make replytolist work with >0.95.0
-	epatch "${FILESDIR}"/0.95.0-replytolist.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# tb-specific settings
-	mozconfig_annotate '' \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# -fstack-protector breaks us
-	if gcc-version ge 4 1; then
-		gcc-specs-ssp && append-flags -fno-stack-protector
-	else
-		gcc-specs-ssp && append-flags -fno-stack-protector-all
-	fi
-		filter-flags -fstack-protector -fstack-protector-all
-
-	####################################
-	#
-	#  Configure and build Thunderbird
-	#
-	####################################
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C modules/libreg || die "make modules/libreg failed"
-	emake -C xpcom/string || die "make xpcom/string failed"
-	emake -C xpcom || die "make xpcom failed"
-	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
-
-	# Build the enigmail plugin
-	einfo "Building Enigmail plugin..."
-	emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-
-	# Package the enigmail plugin; this may be the easiest way to collect the
-	# necessary files
-	emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-	declare emid
-
-	cd "${T}"
-	unzip "${S}"/dist/bin/*.xpi install.rdf
-	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-	cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-	unzip "${S}"/dist/bin/*.xpi
-
-	# these files will be picked up by mozilla-launcher -register
-	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
-	insinto ${MOZILLA_FIVE_HOME}/chrome.d
-	newins "${S}"/dist/bin/chrome/installed-chrome.txt ${PN}
-	echo "extension,${emid}" > "${D}"${MOZILLA_FIVE_HOME}/extensions.d/${PN}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/${P}-${X}
-	done
-}
diff --git a/x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild b/x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild
new file mode 100644
index 000000000000..227b6e754f26
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.7-r3.ebuild,v 1.1 2008/12/31 15:28:14 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
+
+LANGS="ar de el es-ES nb-NO pt-BR zh-CN"
+NOSHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO pl-PL pt-PT ro-RO ru-RU sk-SK sl-SI sv-SE tr-TR zh-TW"
+
+EMVER=${PV}
+TBVER="2.0.0.19"
+TBPATCH="2.0.0.16-patches-0.1"
+
+DESCRIPTION="GnuPG encryption plugin for thunderbird."
+HOMEPAGE="http://enigmail.mozdev.org"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
+	mirror://gentoo/mozilla-thunderbird-${TBPATCH}.tar.bz2
+	http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2"
+IUSE=""
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+done
+# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
+
+for X in ${NOSHORTLANGS} ; do
+	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X%%-*}"
+done
+#( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
+
+DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.4
+	>=www-client/mozilla-launcher-1.56"
+
+S="${WORKDIR}/mozilla"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_CO_PROJECT=mail
+
+linguas() {
+	linguas=
+	local LANG
+	for LANG in ${LINGUAS}; do
+		if hasq ${LANG} en en_US; then
+			hasq en ${linguas} || \
+				linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif hasq ${LANG} ${LANGS//-/_}; then
+			hasq ${LANG//_/-} ${linguas} || \
+				linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		else
+			local SLANG
+			for SLANG in ${NOSHORTLANGS}; do
+				if [[ ${LANG} == ${SLANG%%-*} ]]; then
+					hasq ${SLANG} ${linguas} || \
+						linguas="${linguas:+"${linguas} "}${SLANG}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	if has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT3 support"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBPATCH}.tar.bz2 || die "unpack failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi
+	done
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	# Unpack the enigmail plugin
+	cd "${S}"/mailnews/extensions || die
+	unpack enigmail-${EMVER}.tar.gz
+	cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
+	makemake2
+
+	cd "${S}"
+
+	# Use the right theme for thunderbird #45609
+	sed -i -ne '/^enigmail-skin.jar:$/ { :x; n; /^\t/bx; }; p' mailnews/extensions/enigmail/ui/jar.mn
+
+	# Fix installation of enigmail.js
+	epatch "${FILESDIR}"/70_enigmail-fix.patch
+	# Make replytolist work with >0.95.0
+	epatch "${FILESDIR}"/0.95.0-replytolist.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_annotate '' \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-user-appdir=.thunderbird
+
+	# Bug 246421
+	# Breaks builds with gcc-4.3 on amd64
+	if use amd64 && [[ $(gcc-version) == "4.3" ]]; then
+		mozconfig_annotate 'gcc-4.3 breaks build on amd64 with -O2+' --enable-optimize=-Os
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+		filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	# Only build the parts necessary to support building enigmail
+	emake -j1 export || die "make export failed"
+	emake -C modules/libreg || die "make modules/libreg failed"
+	emake -C xpcom/string || die "make xpcom/string failed"
+	emake -C xpcom || die "make xpcom failed"
+	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
+
+	# Build the enigmail plugin
+	einfo "Building Enigmail plugin..."
+	emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+
+	# Package the enigmail plugin; this may be the easiest way to collect the
+	# necessary files
+	emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	declare emid
+
+	cd "${T}"
+	unzip "${S}"/dist/bin/*.xpi install.rdf
+	emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+	dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+	cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+	unzip "${S}"/dist/bin/*.xpi
+
+	# these files will be picked up by mozilla-launcher -register
+	dodir ${MOZILLA_FIVE_HOME}/{chrome,extensions}.d
+	insinto ${MOZILLA_FIVE_HOME}/chrome.d
+	newins "${S}"/dist/bin/chrome/installed-chrome.txt ${PN}
+	echo "extension,${emid}" > "${D}"${MOZILLA_FIVE_HOME}/extensions.d/${PN}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/${P}-${X}
+	done
+}
-- 
cgit v1.2.3-65-gdbad