Version bump after testing as asked by Anarchy.

(Portage version: 2.2_rc46/cvs/Linux i686)

2 files changed, 216 insertions, 1 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 9c3a5b0b84d1..bbae73a63f62 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.163 2009/06/29 18:38:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.164 2009/10/25 17:51:57 betelgeuse Exp $
+
+*enigmail-0.96.0 (25 Oct 2009)
+
+  25 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +enigmail-0.96.0.ebuild:
+  Version bump after testing as asked by Anarchy.
 
   29 Jun 2009; Raúl Porcel <armin76@gentoo.org> -enigmail-0.95.7-r4.ebuild,
   enigmail-0.95.7-r5.ebuild:
diff --git a/x11-plugins/enigmail/enigmail-0.96.0.ebuild b/x11-plugins/enigmail/enigmail-0.96.0.ebuild
new file mode 100644
index 000000000000..2ffbf804cc4b
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.96.0.ebuild
@@ -0,0 +1,209 @@
+# 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.96.0.ebuild,v 1.1 2009/10/25 17:51:57 betelgeuse Exp $
+
+EAPI="2"
+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 es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO pl-PL pt-PT ru-RU sl-SI sv-SE tr-TR zh-TW"
+
+EMVER=${PV}
+TBVER="2.0.0.23"
+TBPATCH="2.0.0.21-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.gentoo.org/~anarchy/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.gentoo.org/~anarchy/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-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt3]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=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
+}
+
+src_prepare() {
+	# 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_configure() {
+	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
+
+	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 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
+}