? enigmail-eapi2.patch
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/Manifest,v
retrieving revision 1.189
diff -u -r1.189 Manifest
--- Manifest	29 Jun 2009 18:38:29 -0000	1.189
+++ Manifest	7 Sep 2009 20:42:44 -0000
@@ -57,6 +57,6 @@
 DIST thunderbird-1.5.0.13-source.tar.bz2 36162915 RMD160 6d9d8c1ea091725728ad0400c58b606a73346ef9 SHA1 2275d92724976896b6529ceb8ae890b10bc94109 SHA256 1849df86b6f145ff974e5a478e985a8ee8c3239e8a187d6dcba176b8730358db
 DIST thunderbird-2.0.0.22-source.tar.bz2 40489725 RMD160 6f9693c0b7f5af0c60d245c96492f11a4c286efd SHA1 a9da470ff090dfd049cae6b0c3b1a4e95c3f2022 SHA256 e364e5e1a96521b98b8391c5028207408d3d285ab40e091fa503b87a19d24d04
 EBUILD enigmail-0.94.4.ebuild 5818 RMD160 4b058e7ded7b6bfd2820420bfadf8c4456e5c7b9 SHA1 5991031893581a3f7aa602a41e5189f9cd2b0d82 SHA256 78b56db0dfd8c75b997d568ac85d68d7f477e8f3935180a2036c4849cf0d40ab
-EBUILD enigmail-0.95.7-r5.ebuild 5996 RMD160 4ac50cb1da05003957f043f6eeab7104cd167d03 SHA1 dd4676f6b0fd0ed0b819816e1d2b1b2459c32a2c SHA256 646e453822f8c6d986ee587d6e47d91a02945a9532cd6633d9e23e9d17355b73
+EBUILD enigmail-0.95.7-r5.ebuild 5924 RMD160 f6453f852fdaa31ef895639ce7aa8761caa2c091 SHA1 ceb05ece8a04fc830557d3349c0b82d7ce723536 SHA256 3cb4bac50dd4e160aed6c1fdc02cf7843275cc2659ae483949444eb427923dcd
 MISC ChangeLog 22382 RMD160 5a75717847a1f0b0a79a7e152a45313e73f3d94f SHA1 6e35dfc5b375912d9df6fb0dbbebd7277c15bac7 SHA256 22dc0c2459003f25ee186b9b39e0a32558912168bb554c920676bdf8dd052c51
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
Index: enigmail-0.95.7-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.7-r5.ebuild,v
retrieving revision 1.5
diff -u -r1.5 enigmail-0.95.7-r5.ebuild
--- enigmail-0.95.7-r5.ebuild	29 Jun 2009 18:38:19 -0000	1.5
+++ enigmail-0.95.7-r5.ebuild	7 Sep 2009 20:42:44 -0000
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.7-r5.ebuild,v 1.5 2009/06/29 18:38:19 armin76 Exp $
 
+EAPI="2"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
@@ -39,7 +40,16 @@
 DEPEND=">=mail-client/mozilla-thunderbird-${TBVER}
 	!>=mail-client/mozilla-thunderbird-3"
 RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.4
+	|| (
+		(
+			>=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt3]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
 	>=www-client/mozilla-launcher-1.56"
 
 S="${WORKDIR}/mozilla"
@@ -77,14 +87,6 @@
 	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"
 
@@ -92,9 +94,10 @@
 	for X in ${linguas}; do
 		[[ ${X} != en ]] && xpi_unpack ${P}-${X}.xpi
 	done
+}
 
+src_prepare() {
 	# Apply our patches
-	cd "${S}" || die "cd failed"
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
@@ -118,7 +121,7 @@
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
 
 	####################################
@@ -160,7 +163,9 @@
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
 	edit_makefiles
+}
 
+src_compile() {
 	# 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"