glibc-2.4 support wrt bug #125832

(Portage version: 2.1_pre6-r3)

4 files changed, 163 insertions, 11 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 30e2fd65c69c..75a7dddc5c21 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.8 2006/03/12 22:53:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.9 2006/03/19 02:34:27 anarchy Exp $
+
+*enigmail-0.94.0-r1 (19 Mar 2006)
+
+  19 Mar 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +enigmail-0.94.0-r1.ebuild:
+  glibc-2.4 support wrt bug #125832
 
   12 Mar 2006; Aron Griffis <agriffis@gentoo.org> enigmail-0.94.0.ebuild:
   Remove ~ia64 (missing tbird dep).  Will re-add when thunderbird-1.5* builds
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index a31ffaf704cc..681c1a5805a9 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c9142cdac747f2cb30fa212c67c1cf6c ChangeLog 1620
 RMD160 056bb3197923a5bd8b7dce2b0d4eb88932483c2d ChangeLog 1620
 SHA256 8adf886772ef79fcf1472d218cabd91d8f23cbe0a4cbb6124ff36a37f4ad0274 ChangeLog 1620
@@ -10,6 +7,9 @@ SHA256 01c40f747d0ca4d3e47359cff6ac24ae5da22521c4e0be0122d19bed0cef722f enigmail
 MD5 9135cffca87783cce3d9b07d3c484f9e enigmail-0.93.1-r3.ebuild 4324
 RMD160 016b1fde7d3c16438f19cd8afe04771e5f64f06e enigmail-0.93.1-r3.ebuild 4324
 SHA256 ac4b0d58e04ed470314d0f96dd8f6c38dd6f0bc2f8286ca399e48a9a0e161ee2 enigmail-0.93.1-r3.ebuild 4324
+MD5 e9a11a4d50fdd01d2032072bd1cd197c enigmail-0.94.0-r1.ebuild 4496
+RMD160 06a018d9c6a20d3f59c84dba663b3ddc7d6f0a27 enigmail-0.94.0-r1.ebuild 4496
+SHA256 7e5043f595b8de1362ef75acc101d6ce1773d214b3a0a4f9fbc04fc5b314c6af enigmail-0.94.0-r1.ebuild 4496
 MD5 c111242453fc272162407c13183200b4 enigmail-0.94.0.ebuild 4496
 RMD160 04c9d220422d8705db05418db9cb4c42f61d57bb enigmail-0.94.0.ebuild 4496
 SHA256 8a3c75a7ae8a428f01893d489d30892231a4c9212f8739187bd9a898067ac160 enigmail-0.94.0.ebuild 4496
@@ -31,6 +31,9 @@ SHA256 e117bbe850a282dd870e0fe5ccfdd2935dab97fa633afc4834f7f9c8e501e851 files/di
 MD5 ae0343cdc7a6578cae9391954cefae59 files/digest-enigmail-0.94.0 831
 RMD160 dc81c6e71741f709cd8b1e1fcec418c546dabdec files/digest-enigmail-0.94.0 831
 SHA256 f7f94087eb0d4280bf6398026cea3cdd41db7f31352a3a571b4aac2aac777248 files/digest-enigmail-0.94.0 831
+MD5 cd5c51587cb3f4a8c22da638f90f61fe files/digest-enigmail-0.94.0-r1 831
+RMD160 68cab18950cc3d55a25dddf83d374588dc187465 files/digest-enigmail-0.94.0-r1 831
+SHA256 70db0ce5d932e655175328a44f99b916323abd5c2066f66e4c66d8ab90d9ca5e files/digest-enigmail-0.94.0-r1 831
 MD5 c00ea2b2717491804ceababb4c14cc5b files/firefox-1.5-visibility-check.patch 10955
 RMD160 9a5db3a7d6f5539ca77e116aed276d833925a43a files/firefox-1.5-visibility-check.patch 10955
 SHA256 439355e899ea43fd2f82adae6fb4dc7363ca526ce307ce0faba76e533af1dc7c files/firefox-1.5-visibility-check.patch 10955
@@ -40,10 +43,3 @@ SHA256 9d9afd53a6c16d81e43b779371bc7d38a95a44c599fe500e368c4024652c058a files/fi
 MD5 d048ab0ca56f9151afdebcff86b18438 metadata.xml 303
 RMD160 81b0fdab4803a6a0ecfc1cc18ea45579ab15e803 metadata.xml 303
 SHA256 54b7ccf6b578c1e9c4e964eb9c84e7bfd2510e82af4fae284745650f1ca90a95 metadata.xml 303
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEFKaTJrHF4yAQTrARAv0BAJ4+A2vf0ABCLapx4JCi0D4LRZsJWACaA9Uy
-A6qDRnhHgbcblKcFzxVykd4=
-=ZUUO
------END PGP SIGNATURE-----
diff --git a/x11-plugins/enigmail/enigmail-0.94.0-r1.ebuild b/x11-plugins/enigmail/enigmail-0.94.0-r1.ebuild
new file mode 100644
index 000000000000..781d6c457789
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-0.94.0-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.94.0-r1.ebuild,v 1.1 2006/03/19 02:34:27 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf makeedit multilib autotools
+
+EMVER=${PV}
+TBVER="1.5"
+TBPVER="1.3"
+
+DESCRIPTION="Gnupg encryption plugin for thunderbird."
+HOMEPAGE="http://www.enigmail.mozdev.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}-source.tar.bz2
+	mirror://gentoo/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2
+	http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND=">=mail-client/mozilla-thunderbird-1.5"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.4
+	>=www-client/mozilla-launcher-1.37"
+
+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
+
+src_unpack() {
+	unpack thunderbird-${TBVER}-source.tar.bz2 mozilla-thunderbird-${TBVER}-patches-${TBPVER}.tar.bz2 || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	# Apply our patches
+	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"
+	typeset m topdir
+	for m in $(find ../ -name Makefile.in); do
+		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
+		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
+			< ${m} > ${m%.in} || die "sed ${m} failed"
+	done
+
+	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
+
+	# Don't allow upgrades via the browser
+	epatch ${FILESDIR}/50_enigmail_no_upgrade-1.patch
+
+	# Fix installation of enigmail.js
+	epatch ${FILESDIR}/70_enigmail-fix.patch
+
+	eautoreconf || die "failed running autoreconf"
+}
+
+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
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# thunderbird
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf  || die "econf failed"
+
+	# 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}
+}
diff --git a/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r1 b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r1
new file mode 100644
index 000000000000..90b83f4adc55
--- /dev/null
+++ b/x11-plugins/enigmail/files/digest-enigmail-0.94.0-r1
@@ -0,0 +1,9 @@
+MD5 d326c302c1d2d68217fffcaa01ca7632 enigmail-0.94.0.tar.gz 508113
+RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 enigmail-0.94.0.tar.gz 508113
+SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3 enigmail-0.94.0.tar.gz 508113
+MD5 443f58aa6f9d56b2d044a27c5cc782cf mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+RMD160 fe7fab0318edb79d02d2d62aef983dedd8e9c905 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+SHA256 0dc0e056337e85ddae8b103cb7a759c9147cdd25887263312f22f78aeb280127 mozilla-thunderbird-1.5-patches-1.3.tar.bz2 19535
+MD5 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 35028308
+RMD160 5c3a8c42c1239144c8498a81a791a534345cda3c thunderbird-1.5-source.tar.bz2 35028308
+SHA256 f075c0a3f9cf714639eb26e9f370d50efbc72d4e02bd667404f7e1128543ee57 thunderbird-1.5-source.tar.bz2 35028308