Use 2.0.0.14

Package-Manager: portage-2.1.4.4

3 files changed, 201 insertions, 2 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 3a9cb64ab090..d25c42932ace 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.123 2008/03/02 10:33:19 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.124 2008/05/02 11:48:21 armin76 Exp $
+
+*enigmail-0.95.6-r3 (02 May 2008)
+
+  02 May 2008; Raúl Porcel <armin76@gentoo.org> +enigmail-0.95.6-r3.ebuild:
+  Use 2.0.0.14
 
   02 Mar 2008; Lars Weiler <pylon@gentoo.org> enigmail-0.95.6-r2.ebuild:
   stable ppc, security bug 208128
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 7e717c4cd02a..645e2c23835e 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -54,11 +54,14 @@ DIST enigmail-zh-CN-0.9x.xpi 31747 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75
 DIST mozilla-thunderbird-1.5.0.10-patches-0.1.tar.bz2 30777 RMD160 08da7a7dadfc731e5e18d86ca9aa2679eb14fa1d SHA1 7e9862eafbb41f603aa354eab8ccf7347afa71a2 SHA256 7bf7d7abe757cc1dc0ce67fe083c6663fedbcc6e6bdd65cc09ce543ac8e54b9c
 DIST mozilla-thunderbird-1.5.0.7-patches-0.1.tar.bz2 30715 RMD160 a86a745963ad911da7c4e30eb9a673f1b657c5af SHA1 8e6f9fff11d06ee5f9f441527d466e6e1862263b SHA256 1f7af196a2342a27ebd37c1deed0ec6fb2e028d4b55faa9e3c5e761716b3352d
 DIST mozilla-thunderbird-2.0.0.12-patches-0.1.tar.bz2 30412 RMD160 c327d22d10a377f3072506849cb75f18da755e3c SHA1 4caf0b6f758bbb193fcec51476cc0738ada93c3b SHA256 16cec414399917bb489894fc649f9056ffa60d9ef4e78d7c7603681e32c0c050
+DIST mozilla-thunderbird-2.0.0.14-patches-0.1.tar.bz2 29619 RMD160 999148d25487b7e52bd976b07a61881220f6d55c SHA1 c02eee8c8ec0757339ff97769cf67f718270fa7e SHA256 3a992616dc65315a8e55efc83a4efaacf18352a235813207ad1de994ebc09a07
 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.12-source.tar.bz2 37485204 RMD160 80d6fdb4b8e085a82234825cfbfc6cd05d015f6f SHA1 36ea64353d32a9f138ef658250cfdcf8f9e862f2 SHA256 a7ed39bcac6357687f9758f0b1282e9f0545e12277b4fc44c70506659c25a7b6
+DIST thunderbird-2.0.0.14-source.tar.bz2 37473129 RMD160 b7a61bfe9b3b06fc26051e97e7ca4da0b7ab64a4 SHA1 5f30f6e54895e67d96304cdbce15e69aee4d3230 SHA256 deae3f00be4734c8a4dd6480639d253f0606bd0df6ef3e4432210d449d789730
 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-r2.ebuild 5696 RMD160 66530be784bdb58da31e3de61b21459c808120f0 SHA1 6aced315b7308f853394d6de9affb1ae3381019a SHA256 02dbfa964bcc0da772bc1a8371daf24c67cec2c5ee796cb8038288608ab11710
-MISC ChangeLog 17263 RMD160 ec98be537fc2b7f3ca84d28b1c1ba358b29bd25c SHA1 056844421802997620edae672c18c548271e56f3 SHA256 3e8a71d3afc98abd157f33a406d9f2d8373fce8f79311229482a3defae57389f
+EBUILD enigmail-0.95.6-r3.ebuild 5705 RMD160 6bee082aa3798f8cde6cf891ceaf449e29805109 SHA1 d176e1ec5def8017b1d411299f224ef0d9f890fc SHA256 f2b34f23ebc56d021ad3b6f4d600ee7877fde7590a27a31dab2145c572fee180
+MISC ChangeLog 17393 RMD160 f255a18b2ba3813e586d93bf780c6fb9ff23e70d SHA1 65b2e63fa71652be66c80e234247a153641d5b08 SHA256 d026c18194311bee058c5b492343341e73ee0ad5940564e10b806626843b46af
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
diff --git a/x11-plugins/enigmail/enigmail-0.95.6-r3.ebuild b/x11-plugins/enigmail/enigmail-0.95.6-r3.ebuild
new file mode 100644
index 000000000000..219244ad6288
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.95.6-r3.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-r3.ebuild,v 1.1 2008/05/02 11:48:21 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.14"
+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
+}