Revbump for thunderbird 2.0.0.21

Package-Manager: portage-2.1.6.7/cvs/Linux ia64

3 files changed, 214 insertions, 2 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 79fd14479cf0..dd17f31861e0 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.152 2009/02/12 16:25:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.153 2009/03/19 16:30:12 armin76 Exp $
+
+*enigmail-0.95.7-r4 (19 Mar 2009)
+
+  19 Mar 2009; Raúl Porcel <armin76@gentoo.org> +enigmail-0.95.7-r4.ebuild:
+  Revbump for thunderbird 2.0.0.21
 
   12 Feb 2009; Raúl Porcel <armin76@gentoo.org> enigmail-0.95.7-r3.ebuild:
   Add blocker for thunderbird-3, bug #253331
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 5cd9e67b9957..ea08765b3a59 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -58,5 +58,6 @@ DIST thunderbird-1.5.0.13-source.tar.bz2 36162915 RMD160 6d9d8c1ea091725728ad040
 DIST thunderbird-2.0.0.19-source.tar.bz2 40452690 RMD160 7139fb27b1a236564ee6470c4be13e93b6ec9217 SHA1 4d2e0f8b405bb0ceab20a9f570ce91cf4640f456 SHA256 9a23d3a93c7646867227558727cf564eaba70da87e21e097eb46d951ed839f25
 EBUILD enigmail-0.94.4.ebuild 5818 RMD160 4b058e7ded7b6bfd2820420bfadf8c4456e5c7b9 SHA1 5991031893581a3f7aa602a41e5189f9cd2b0d82 SHA256 78b56db0dfd8c75b997d568ac85d68d7f477e8f3935180a2036c4849cf0d40ab
 EBUILD enigmail-0.95.7-r3.ebuild 6145 RMD160 3585e8da7ebc6b084a7c73b3c967f7d58dd6506e SHA1 e54482eb01870d573b1723b5f9abd14afa299aa2 SHA256 a952c181b60030cbeba4ac512f5d147ff084468369bd9f8f913eef980f909b3e
-MISC ChangeLog 20977 RMD160 8df27fb506861e549af999cc31df0c7cf1955329 SHA1 a69786ef8a68e366924fc9df31f9656e74e392d9 SHA256 93a328170a76c6ad829ed1fb2b3d832322481ef5bd56999553b7b9cfa0f4a2a5
+EBUILD enigmail-0.95.7-r4.ebuild 6152 RMD160 cf7cf7e147d902a587052fab6cc71cf3f9045065 SHA1 f587d14891fecfe216a1ddb2153d86bbe802ae8b SHA256 56a31daf03a3140ce8adba5f1ce50fa4f14e4c6c7892ac43c990fc1260c661e4
+MISC ChangeLog 21125 RMD160 8ac9f16ea7e983a34e71b1242dae38e597073aa5 SHA1 9a2228a1f2c256cd5e9781b1c2e8c82f7830a632 SHA256 b132def162d4cca83f651ebbd62492c90641d7c5d2d0567397802031afd21491
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
diff --git a/x11-plugins/enigmail/enigmail-0.95.7-r4.ebuild b/x11-plugins/enigmail/enigmail-0.95.7-r4.ebuild
new file mode 100644
index 000000000000..01709b44eda1
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.95.7-r4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/03/19 16:30:12 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.19"
+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}
+	!>=mail-client/mozilla-thunderbird-3"
+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
+}
+
+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"
+
+	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
+
+	# Bug 246421
+	# Breaks builds with gcc-4.3 on amd64
+	if use amd64 && [[ $(gcc-version) == "4.3" ]]; then
+		mozconfig_annotate 'gcc-4.3 breaks build on amd64 with -O2+' --enable-optimize=-Os
+	fi
+
+	# 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
+}