Bump enigmail to use current tb source tarball/patchset

Package-Manager: portage-2.1.9.10/cvs/Linux x86_64

4 files changed, 22 insertions, 187 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index b2e2359512d3..90c5446b335c 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.203 2010/09/14 17:03:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.204 2010/09/26 17:27:47 anarchy Exp $
+
+*enigmail-1.1.2-r3 (26 Sep 2010)
+
+  26 Sep 2010; Jory A. Pratt <anarchy@gentoo.org> -enigmail-1.0.1-r3.ebuild,
+  -enigmail-1.1.2-r1.ebuild, +enigmail-1.1.2-r3.ebuild:
+  Bump enigmail to use current tb source tarball/patchset
 
   14 Sep 2010; Christian Faulhammer <fauli@gentoo.org>
   enigmail-1.1.2-r2.ebuild:
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 1ea96885b66b..7284592c0dda 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 AUX 75_enigmai-js-fixup.patch 1260 RMD160 b89620f3495a286c1e5636b0c65b423d3a158944 SHA1 033b817e08acd35c9d4e943b24f07d9191900912 SHA256 66e3e9ddce9d191ce1417e364757f1d35873f031abd94c817e069249d18a3dd3
 AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
-DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 DIST enigmail-1.1.2.tar.gz 1280923 RMD160 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 SHA1 d29fce2b20a36d210b12c28fcbbee965007c95aa SHA256 dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
-DIST mozilla-thunderbird-3.0-patches-0.3.tar.bz2 3241 RMD160 bc3b163b9c5bd7c7fb497786b2dc2da4e0a4bd28 SHA1 0182b73d48cd21204504f3bb8e17f0d9a7289464 SHA256 a430c71a12fe63662d43b4eeb5b185841a4788cbbbbd7178a3c73056ba94c5cd
-DIST mozilla-thunderbird-3.1-patches-0.1.tar.bz2 2451 RMD160 31b5126836b4fb6b5e62f4d1772fab2e4111320e SHA1 b86c3e93edc632801f3e331884404332b458d7b1 SHA256 79c6a48cdcf322226e39c0d8b5136506d6fb9c939c7ce531ac7f5c6ad3588d28
-DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
 DIST thunderbird-3.1-patches-0.8.tar.bz2 4226 RMD160 614cf7907d1392b57b1b8027f292f157d049b588 SHA1 caaa4f22590a6d3cc011c7a5306943494e5a9d3a SHA256 10bb16cbebaf1c6e93f8ba5caab1a03c8fc5337ca0c2f809633a8869581f64b1
+DIST thunderbird-3.1-patches-1.1.tar.bz2 3702 RMD160 24538a1db5256e33692181266704100071c66d74 SHA1 4a70aa3c8c21736c0d9588eca7c0bf50b5d5adfb SHA256 1b9358ba174180d64106d3656fa0623847fdb2197039de23a7f9cf63d9c764de
 DIST thunderbird-3.1.1.source.tar.bz2 65820406 RMD160 f7c635610eace54a29601a796f8f5e34bc7d198e SHA1 8e25fd786fbe094c3f4d9bc4e18285701bd42279 SHA256 206a0fb7d9464b5e3b46c8ad5f1b76fd3de88858236dd5f9b7082f5b893e955d
-DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 SHA1 89e9d8099a5437ce401577fc4d526eb0dd9e51da SHA256 494090fd47944c15e3906847931d7efe77ec0e05f56dbae3a8c36d0a48616a86
-EBUILD enigmail-1.0.1-r3.ebuild 4108 RMD160 8706883241129e832b007eb466322083f3eef350 SHA1 cd04496787dd88196e12b289b5193759b4581015 SHA256 3202a5485200e9fa86adbbcabfdda1c08274a723a1243b7a92d62ee566c29550
-EBUILD enigmail-1.1.2-r1.ebuild 4297 RMD160 1aabaa2f796f42eed88a27c9c73fa910e84b6b28 SHA1 dab6c0c1c367b793a6df2af2456c397e515e302d SHA256 5d0e63d309ca83cf9f78e04a06f8f950a848cf98f259e1575428f0b30b61142b
+DIST thunderbird-3.1.4.source.tar.bz2 66636919 RMD160 9c9275960fa3a50d77f3a4998329ac5f307bbc83 SHA1 54f4f735982cad3ab721ab0aaea641f7febe85c3 SHA256 788905714e768c94025a954e1bea281f8e728d52b8249f2df43e6732d2ea7a08
 EBUILD enigmail-1.1.2-r2.ebuild 4234 RMD160 6b3dfe5bafde11f474a3c6ea24117880fba07327 SHA1 d94c2fc8a9af3a1ade3b129a720dadafc09b3ee9 SHA256 898938de7484c1b0cdacf5851179a6b43cc726ffb402ac87b3932b4446d1dd04
-MISC ChangeLog 28140 RMD160 f93f3961a1d5d18f0fb3ed1950291970482e2856 SHA1 fd9ed32d8e6c050f19a509b660db93e209c36a39 SHA256 0fcf2e805515f433b138851a6fe94c32c72ee6524cd737986240b6c312e4e669
+EBUILD enigmail-1.1.2-r3.ebuild 4243 RMD160 c28f9ac341b068a9ac63b3060cc3ad78621fbe00 SHA1 e211d88e9a6cb161955a82718fd48895d6ba006f SHA256 3a11f1b9ddf249503c71f1777159ab2ed289a4fe27bc93dab470f9a6a8243837
+MISC ChangeLog 28368 RMD160 7b05b77ffb096133e2d5cd4a2ea21f0eef2c9413 SHA1 c4a9be66d351d12ad660fe6537ebacb1f75cf69b SHA256 8d7e09d5d7c3d4c0750fb17ab85ed1f7cbe9a009b3134659c793eaeb7fe9b24d
 MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyPqwcACgkQNQqtfCuFnePDXACfYak709AycAs/CtzhT5Y3I4e5
-WUcAniH1IEw5xWK9DNrHD4iQG4rUW3Lx
-=dSik
------END PGP SIGNATURE-----
diff --git a/x11-plugins/enigmail/enigmail-1.0.1-r3.ebuild b/x11-plugins/enigmail/enigmail-1.0.1-r3.ebuild
deleted file mode 100644
index 388e6ddac9f6..000000000000
--- a/x11-plugins/enigmail/enigmail-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.0.1-r3.ebuild,v 1.7 2010/06/13 02:27:59 nirbheek Exp $
-
-WANT_AUTOCONF="2.1"
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
-MY_P="${P/_beta/b}"
-EMVER="${PV}"
-TBVER="3.0.4"
-PATCH="mozilla-thunderbird-3.0-patches-0.3"
-
-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
-	http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
-	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE="system-sqlite"
-
-DEPEND=">=mail-client/thunderbird-3.0[system-sqlite=]"
-RDEPEND="${DEPEND}
-	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
-	|| (
-		(
-			>=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-
-S="${WORKDIR}"/comm-1.9.1
-
-pkg_setup() {
-	# EAPI=2 ensures they are set properly.
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export MOZ_CO_PROJECT=mail
-}
-
-src_unpack() {
-	unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
-}
-
-src_prepare(){
-	# Apply our patches
-	EPATCH_EXCLUDE="106-bz466250_att349521_fix_ftbfs_with_cairo_fb.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	cd mozilla
-	eautoreconf
-	cd js/src
-	eautoreconf
-
-	# 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}"
-
-	# Fix installation of enigmail.js
-	epatch "${FILESDIR}"/70_enigmail-fix.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	touch mail/config/mozconfig
-	mozconfig_init
-	mozconfig_config
-
-	# tb-specific settings
-	mozconfig_annotate '' \
-		--with-system-nspr \
-		--with-system-nss \
-		--disable-wave \
-		--disable-ogg \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
-		--with-user-appdir=.thunderbird \
-		--enable-application=mail
-
-	mozconfig_use_enable system-sqlite
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  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
-}
-
-src_compile() {
-	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C mozilla/modules/libreg || die "make modules/libreg failed"
-	emake -C mozilla/xpcom/string || die "make xpcom/string failed"
-	emake -C mozilla/xpcom || die "make xpcom failed"
-	emake -C mozilla/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}"/mozilla/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}"/mozilla/dist/bin/*.xpi
-}
diff --git a/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild b/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild
index 5d7780f1d0fd..162bd3fdd9f3 100644
--- a/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild,v 1.7 2010/08/10 15:56:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2-r3.ebuild,v 1.1 2010/09/26 17:27:47 anarchy Exp $
 
 WANT_AUTOCONF="2.1"
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
 MY_P="${P/_beta/b}"
 EMVER="${PV}"
-TBVER="3.1"
-PATCH="mozilla-thunderbird-3.1-patches-0.1"
+TBVER="3.1.4"
+PATCH="thunderbird-3.1-patches-1.1"
 
 DESCRIPTION="GnuPG encryption plugin for thunderbird."
 HOMEPAGE="http://enigmail.mozdev.org"
 REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
 SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
 	http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
-	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2"
 IUSE="system-sqlite"
 
-DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]"
+DEPEND=">=mail-client/thunderbird-3.1.1-r1[system-sqlite=]"
 RDEPEND="${DEPEND}
 	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
 	|| (
@@ -56,9 +56,6 @@ src_prepare(){
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
-	# ARM fixes, bug 327783
-	epatch "${FILESDIR}/thunderbird-xul-1.9.2-arm-fixes.patch"
-
 	cd mozilla
 	eautoreconf
 	cd js/src
@@ -80,7 +77,7 @@ src_prepare(){
 }
 
 src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
 
 	####################################
 	#
@@ -98,7 +95,7 @@ src_configure() {
 		--with-system-nss \
 		--disable-wave \
 		--disable-ogg \
-		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-default-mozilla-five-home="${EPREFIX}"${MOZILLA_FIVE_HOME} \
 		--with-user-appdir=.thunderbird \
 		--enable-application=mail \
 		--disable-necko-wifi \
@@ -147,7 +144,7 @@ src_compile() {
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
 	declare emid
 
 	cd "${T}"
@@ -155,6 +152,6 @@ src_install() {
 	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}
+	cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
 	unzip "${S}"/mozilla/dist/bin/*.xpi
 }