Add revision for 2.0.0.18

Package-Manager: portage-2.1.4.5

3 files changed, 200 insertions, 12 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 1db6214b42fc..5eb42f2c2c3c 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,11 @@
 # 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.139 2008/09/28 17:15:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.140 2008/11/23 16:16:24 armin76 Exp $
+
+*enigmail-0.95.7-r2 (23 Nov 2008)
+
+  23 Nov 2008; Raúl Porcel <armin76@gentoo.org> +enigmail-0.95.7-r2.ebuild:
+  Add revision for 2.0.0.18
 
   28 Sep 2008; Markus Meier <maekke@gentoo.org> enigmail-0.95.7-r1.ebuild:
   amd64 stable, bug #238535
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 99b201a7a478..da94f86267fe 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.95.0-replytolist.patch 1173 RMD160 e3a4b616809b1f4b9f1cdcc38ae27bc6ce6cbeba SHA1 1a52599aa5c4c69b6d613623f273fe3c2bbbd447 SHA256 61dce6cc85d11186465ed5c28708978ae8761b848e1d76281d40ceb4f8d1a714
 AUX 50_enigmail_no_upgrade-1.patch 651 RMD160 1631ce4cb6e2758d2fe475327b9665fbefbcbe56 SHA1 e1964aa817320c56181cfcfad997bf975f8cbf46 SHA256 1dbbc22e22d4639c407b9690280cc37d9a86919fde694be10daa3eac6c44ada2
 AUX 50_enigmail_no_upgrade.patch 633 RMD160 38d30cb7ac0b1fddea62224d60b209dbafe0a26e SHA1 cfa574efd57cf76a8c0ebe76aaa4fa0f9ba514e5 SHA256 db3cf07fb3acf18d31716b30f7b4d74c543b6acf304a3fc18686b7bcd91ececb
@@ -87,16 +84,11 @@ DIST thunderbird-1.5.0.13-source.tar.bz2 36162915 RMD160 6d9d8c1ea091725728ad040
 DIST thunderbird-1.5.0.7-source.tar.bz2 35994957 RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 SHA1 9e5acff9bd098979dd798c0111805dc8d67479ad SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
 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
 EBUILD enigmail-0.94.1.ebuild 5829 RMD160 faaafa1268826cdb95e286739eba795cef4f2033 SHA1 7344f437ed6004151075ab832cbceda2dddbc016 SHA256 9cbded53c01a42b73fbc1586bc3f51b4256078683245902f82bf1c278b85b2ca
 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
-MISC ChangeLog 19286 RMD160 dad75368937e8a5e388c0d699aafe84d3638ec4e SHA1 018fdf00e1d78ef1957211d4514e66c0b840a115 SHA256 ff95ea077a0d6d14e408cee5707b3deceb7e203a610007b72c1984eb349845e8
+EBUILD enigmail-0.95.7-r2.ebuild 5716 RMD160 bf2567d8d12a2fd955fd0e24e20630cd9b777be3 SHA1 e2d033860504d7b3606b4a2150343991191ddf31 SHA256 e9ba06e4ad63df9a21f35bc6909174dda7befc4fa6c6a137f78bcba1906f114f
+MISC ChangeLog 19428 RMD160 74b191c4d64d1eb65fe4807e56eb44230ef6edf6 SHA1 9cc7679ab404548736bad38a306fb1b270ef8608 SHA256 9d2a6709f2dd8f3c54ff2145e5087ad9c0d2e635c531d24611e1fbcea955b9e9
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjfvA4ACgkQkKaRLQcq0GL7JwCdGA5+ZaxVc8mmug9ZbC8clXPW
-tlwAn3WboIRAOtfBioLU49qWnGi7gL5V
-=I5Wq
------END PGP SIGNATURE-----
diff --git a/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild b/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild
new file mode 100644
index 000000000000..0679a95f31ee
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild
@@ -0,0 +1,191 @@
+# 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-r2.ebuild,v 1.1 2008/11/23 16:16:24 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.18"
+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
+}