Use 2.0.0.16

Package-Manager: portage-2.1.4.4

3 files changed, 200 insertions, 2 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 4f36fa7575b3..9fec4654bfbe 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.128 2008/05/05 14:11:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.129 2008/07/24 14:13:38 armin76 Exp $
+
+*enigmail-0.95.6-r4 (24 Jul 2008)
+
+  24 Jul 2008; Raúl Porcel <armin76@gentoo.org> +enigmail-0.95.6-r4.ebuild:
+  Use 2.0.0.16
 
   05 May 2008; Brent Baude <ranger@gentoo.org> enigmail-0.95.6-r3.ebuild:
   Marking enigmail-0.95.6-r3 ppc for bug 214816
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index e8ff59664ddf..59e31dcbd792 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -57,8 +57,10 @@ DIST mozilla-thunderbird-2.0.0.14-patches-0.1.tar.bz2 29619 RMD160 999148d25487b
 DIST thunderbird-1.5.0.13-source.tar.bz2 36162915 RMD160 6d9d8c1ea091725728ad0400c58b606a73346ef9 SHA1 2275d92724976896b6529ceb8ae890b10bc94109 SHA256 1849df86b6f145ff974e5a478e985a8ee8c3239e8a187d6dcba176b8730358db
 DIST thunderbird-1.5.0.7-source.tar.bz2 35994957 RMD160 b8948723e4a96e22409e6a2cb3cd1b6512bef189 SHA1 9e5acff9bd098979dd798c0111805dc8d67479ad SHA256 99f67c50a94af48bc738c19cda390561ec518b5fec4bc4f1f43e65337b645fc9
 DIST thunderbird-2.0.0.14-source.tar.bz2 37473129 RMD160 b7a61bfe9b3b06fc26051e97e7ca4da0b7ab64a4 SHA1 5f30f6e54895e67d96304cdbce15e69aee4d3230 SHA256 deae3f00be4734c8a4dd6480639d253f0606bd0df6ef3e4432210d449d789730
+DIST thunderbird-2.0.0.16-source.tar.bz2 40418085 RMD160 6100058cca8d75e108a11b09d03b85d705ca48c2 SHA1 30092e38d621c30af02653d3bf246d98d2533853 SHA256 9a566725ac2f4f7ddcbbf0dbee90265ca63180557fa27843d5ea43ac0ff3a396
 EBUILD enigmail-0.94.1.ebuild 5827 RMD160 3b88e89764a477eb17a245f2ce3ee7d14d534ff8 SHA1 7e32bffe90f6124178f59209451bb687ee55e65b SHA256 6b745c17d684bd29535ae1cc731a5380d83ca7f71290fc82d0a89d9831d8097b
 EBUILD enigmail-0.94.4.ebuild 5816 RMD160 a307499b1225e7f1224a3caf8047a37571657a08 SHA1 8197d1b4022559c00ec673bdce8f0c333a9c435f SHA256 0930dedc092fe38b7ce6a65679cef2fbb3ebc8ee793a02984c6a29fc7f04951d
 EBUILD enigmail-0.95.6-r3.ebuild 5697 RMD160 eeca37127268929d561a2f52fc01a5b9e528e0aa SHA1 a3a16b8bea7e8cdd937ccc2c33ed6d3a0d81b472 SHA256 7efa0b9186a42c2496a088fbe049d06dc3af2f077865c43156ea7659d5162f9c
-MISC ChangeLog 17855 RMD160 d2b77b8799a358d4c8cb3138c7dc407ab955615f SHA1 7a1d40a63fc44659efe158aa986a9a40b8c29098 SHA256 56b30fa76da65bc1279a5a6ce472ddd7898564a327a27bc8bc095394b7be7e13
+EBUILD enigmail-0.95.6-r4.ebuild 5705 RMD160 d415a241920f0bb387e9dd8c8c684ce3deec85e0 SHA1 a5ba14e1a15fc8db2c293091986778f840be505d SHA256 9de8943b435e70a96e089a44ee517e8774edc7c9dbccfece9186ace8a835fdf3
+MISC ChangeLog 17984 RMD160 7e5d40b4c773f8a1443db630a24ae92158d97dfb SHA1 360adde8e9e7454a4cb9a5d85bff8b1202e70490 SHA256 33fb4918440784ba474c4de65aa83437c3cae18ce0fc22d149f43ac19ced3db7
 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
new file mode 100644
index 000000000000..b3e231c8d733
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.95.6-r4.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.6-r4.ebuild,v 1.1 2008/07/24 14:13:38 armin76 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/downloads/src/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
+}