Add workaround on amd64 and gcc-4.3, bug #246421

Package-Manager: portage-2.1.4.5

4 files changed, 14 insertions, 204 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 90b3c26e634b..466acc9f923a 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.144 2008/11/29 18:08:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.145 2008/12/13 15:02:02 armin76 Exp $
+
+  13 Dec 2008; Raúl Porcel <armin76@gentoo.org> -enigmail-0.94.1.ebuild,
+  enigmail-0.95.7-r2.ebuild:
+  Add workaround on amd64 and gcc-4.3, bug #246421
 
   29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   enigmail-0.95.7-r2.ebuild:
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 25ab49b90656..5e835b576da4 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -4,7 +4,6 @@ AUX 50_enigmail_no_upgrade.patch 633 RMD160 38d30cb7ac0b1fddea62224d60b209dbafe0
 AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 AUX firefox-1.5-visibility-check.patch 10955 RMD160 9a5db3a7d6f5539ca77e116aed276d833925a43a SHA1 b43088167a5a9f86986030979f0a572edc445b73 SHA256 439355e899ea43fd2f82adae6fb4dc7363ca526ce307ce0faba76e533af1dc7c
 AUX firefox-1.5-visibility-fix.patch 485 RMD160 86461454b4723c19c43bb81b77a7067656e0f0ff SHA1 53ad985dfd359edad05ae4be23be553bf13d5648 SHA256 9d9afd53a6c16d81e43b779371bc7d38a95a44c599fe500e368c4024652c058a
-DIST enigmail-0.94.1.tar.gz 513084 RMD160 1b8719c7669449f706bd3ff6964565e6ba9f8902 SHA1 d507757c065b607edecd193406ad60fcb7a67ace SHA256 3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1
 DIST enigmail-0.94.4.tar.gz 571082 RMD160 ad4a06254bf9775b84f3ffae9d521ddcb59827e5 SHA1 725870e4e074b97cd9ca073212c7250198366b97 SHA256 1815c191391bc66d6ee9f78dbb8b49634c51566edfce906fa7d9db6bd5fd8a37
 DIST enigmail-0.95.6-ca-AD.xpi 30605 RMD160 6827573391899f49f03e895b02292dbec0f598cd SHA1 d6d5866521ecf9800f2d7843d22a01a8f9cebd5e SHA256 68c7c716478e2dd9e64dff7bd3b209417665c7dbe12146bc9284880806869721
 DIST enigmail-0.95.6-cs-CZ.xpi 33358 RMD160 30970684d12663138ddde7cb8ee038ca67ebc161 SHA1 6dbfce1d141d3d0157069e61f6afd1811202b582 SHA256 88ef26d77005b5517912edb3aa0fefa49e7145ffc979e6ba13ecc755b48ffc2a
@@ -77,18 +76,15 @@ DIST enigmail-sl-SI-0.9x.xpi 30090 RMD160 3f2f81d526c4665100f154231310a36c4aeeab
 DIST enigmail-sv-SE-0.9x.xpi 30803 RMD160 5f4259a55e6753a6ec61a7a5eac64b365d3a1973 SHA1 49e1d49ce5e53bba196dd75867b0b660078b4337 SHA256 afa3b754d9372cc531752e83909c6147cdc10d7a5ef42f364dc8cbbc686af93c
 DIST enigmail-zh-CN-0.9x.xpi 31747 RMD160 a65e2a014777d1d13c9d45e14b6f9abec03b75f2 SHA1 8a6da45522b3853ce7bf6774d3ee5f2798591cff SHA256 628141041a7b316ede43cb0fda01d834dc02b344f6ad6b491d4329d2eead7512
 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.14-patches-0.1.tar.bz2 29619 RMD160 999148d25487b7e52bd976b07a61881220f6d55c SHA1 c02eee8c8ec0757339ff97769cf67f718270fa7e SHA256 3a992616dc65315a8e55efc83a4efaacf18352a235813207ad1de994ebc09a07
 DIST mozilla-thunderbird-2.0.0.16-patches-0.1.tar.bz2 30163 RMD160 58d8b067c9a15d9e550b9264a3406d61d8bb7406 SHA1 38e41cc7fbe382991637fd67374ee4df87402273 SHA256 afa27ebd5203a4897f896135733fd74f4aebeddfad5ff6126f7e89196ae37e51
 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.16-source.tar.bz2 40418085 RMD160 6100058cca8d75e108a11b09d03b85d705ca48c2 SHA1 30092e38d621c30af02653d3bf246d98d2533853 SHA256 9a566725ac2f4f7ddcbbf0dbee90265ca63180557fa27843d5ea43ac0ff3a396
 DIST thunderbird-2.0.0.17-source.tar.bz2 40444452 RMD160 983ee59312b2dabdebfed2751ab38168a0bfb6fc SHA1 98a7ff5206fe1bddcb895dc2276e348229af99d9 SHA256 526eda34654499e7838b4fc47a3329905b643b30241e599bf4bf3ab609ff1aec
 DIST thunderbird-2.0.0.18-source.tar.bz2 40455125 RMD160 093b2328a000f18494fd552cce58fa2ec55085a1 SHA1 4d05300280763e34c7a115835523ed2805f7733c SHA256 f18f97833661b260d819161080329f857e489b3c934f4648012b8728b7f3d597
-EBUILD enigmail-0.94.1.ebuild 5829 RMD160 faaafa1268826cdb95e286739eba795cef4f2033 SHA1 7344f437ed6004151075ab832cbceda2dddbc016 SHA256 9cbded53c01a42b73fbc1586bc3f51b4256078683245902f82bf1c278b85b2ca
 EBUILD enigmail-0.94.4.ebuild 5818 RMD160 4b058e7ded7b6bfd2820420bfadf8c4456e5c7b9 SHA1 5991031893581a3f7aa602a41e5189f9cd2b0d82 SHA256 78b56db0dfd8c75b997d568ac85d68d7f477e8f3935180a2036c4849cf0d40ab
 EBUILD enigmail-0.95.6-r4.ebuild 5703 RMD160 7828be7ff6f0ca54b1df0f04089e80329bd69569 SHA1 bbfc2c77f6889fb994457441a02e832ffb42737a SHA256 51ff56bfab00b28d447d0246adbc92ccb2c693c35b679d2b5c3385b472a9d6aa
 EBUILD enigmail-0.95.7-r1.ebuild 5708 RMD160 d66b561424bf5803de0bbb297a7e98133160f52d SHA1 7fe37c0de935700224d88fd2e165ccbd1b082e28 SHA256 5955cf83baac47cc0ba2cc4fa116134b8d274b5ac0ba31833d7cf1638a4ed7a5
-EBUILD enigmail-0.95.7-r2.ebuild 5915 RMD160 ea142478fea77109b4efc40ebdaee3c8f1621849 SHA1 9ce8c8bdadfb361dc8dec6410e6451a2da2f3804 SHA256 2f582e4531e50b83c8b55eaaffccd700ec5488c189425f3b005d6b6ac3a90108
-MISC ChangeLog 19917 RMD160 a71fefbf42f8ec2a50d74beb22f79fee630dbf0d SHA1 a436ea729a73b0316e258ff5ccbbf912ab722c01 SHA256 62fd5f2a5998d35e9cae6ca27ec732c7b8cc303fae26e8eca77c08688bff601d
+EBUILD enigmail-0.95.7-r2.ebuild 6108 RMD160 bb552223d7153a4e0cba50a384c12d135c22c653 SHA1 99045f51feb91c880ecb28a78aa97d48e2aaf61b SHA256 e7cb2ec90916366b0a03390b34dc6b0acd54ee20a0badd01622984fa2e8fa2f5
+MISC ChangeLog 20069 RMD160 1a9650d30bea46dd4b870770661b60d2bc5022d1 SHA1 affde867191c1f918c818faa11e12055c1d6b98b SHA256 2f2bcf41528fc9defa7bd5388071cd95b32cd53e94515c0495d1c48215baa2ff
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
diff --git a/x11-plugins/enigmail/enigmail-0.94.1.ebuild b/x11-plugins/enigmail/enigmail-0.94.1.ebuild
deleted file mode 100644
index 932aa34e8017..000000000000
--- a/x11-plugins/enigmail/enigmail-0.94.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.94.1.ebuild,v 1.14 2008/08/04 09:57:01 armin76 Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-WANT_AUTOCONF=2.1
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozcoreconf mozextension makeedit multilib autotools
-
-LANGS="de el es-AR es-ES nb-NO pt-BR sv-SE zh-CN"
-SHORTLANGS="ca-AD cs-CZ es-ES fi-FI fr-FR hu-HU it-IT ja-JP ko-KR nb-NO nl-NL pl-PL pt-PT ru-RU sk-SK sl-SI sv-SE"
-
-EMVER=${PV}
-TBVER="1.5.0.7"
-TBPVER="0.1"
-
-DESCRIPTION="Gnupg encryption plugin for thunderbird."
-HOMEPAGE="http://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://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz"
-
-KEYWORDS="mips"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE=""
-
-for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://www.mozilla-enigmail.org/downloads/lang/0.9x/${PN}-${X}-0.9x.xpi )"
-	IUSE="${IUSE} linguas_${X/-/_}"
-done
-# ( mirror://gentoo/${PN}-${X}-0.9x.xpi )"
-
-for X in ${SHORTLANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X%%-*}? ( http://www.mozilla-enigmail.org/downloads/lang/0.9x/${PN}-${X}-0.9x.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.5
-	>=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
-
-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 ${SHORTLANGS}; 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-${TBVER}-patches-${TBPVER}.tar.bz2 || die "unpack failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack ${PN}-${X}-0.9x.xpi
-	done
-
-	cd ${S} || die "cd failed"
-
-	# Apply our patches
-	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
-
-	# 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
-	gcc-specs-ssp && 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
-
-	# Fix registration on AMD64 per bug #143158
-	if use amd64; then
-		sed -i -e "s/_x86_64-gcc3//" \
-		${D}${MOZILLA_FIVE_HOME}/extensions/${emid}/install.rdf
-	fi
-
-	# 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}/${PN}-${X}-0.9x
-	done
-}
diff --git a/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild b/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild
index ff11a262d02d..fcbfb2b703c1 100644
--- a/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild
+++ b/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r2.ebuild,v 1.5 2008/11/29 18:08:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.7-r2.ebuild,v 1.6 2008/12/13 15:02:02 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -135,6 +135,12 @@ src_compile() {
 		--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