[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...

[Lars Wendler]

commit:     64c62a2256d2976ef34a539b4f4440f5a41bb5e8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 22:51:25 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 22:51:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=64c62a22

seamonkey: Added libpng15 patch. Removed old beta1 ebuild.

---
 www-client/seamonkey/Manifest                      |   14 +-
 .../files/2.1/seamonkey-2.1b1-bug607222.patch      |   47 ---
 .../seamonkey/files/2.1/xulrunner-libpng15.diff    |   12 +
 ...enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch |   11 -
 www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild |  359 --------------------
 www-client/seamonkey/seamonkey-2.1_beta2.ebuild    |    3 +
 6 files changed, 17 insertions(+), 429 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 7116aa6..9ee97b2 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,23 +1,14 @@
-AUX 2.1/seamonkey-2.1b1-bug607222.patch 1570 RMD160 e1ccd2e3ffc293ac6a0b0b46e0e352551f491c92 SHA1 7bdfcb1e0aea8e6238b6c1560627cee712737d7c SHA256 8daacb3ef9cbb53ec3886ad7108107799682609e32af237434f3c8695ac63d86
 AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
 AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5
 AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac706424e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05ed978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac
+AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51
 AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
 AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
-AUX enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch 388 RMD160 e87b1d5d7ebab0c7bff851b6cd15575288addd7f SHA1 a45b74b08eca03f44dd174bc466d0bde02c7f082 SHA256 35f63bf315c3b9b096ccab4c351d7c85b5651c0d5bf85e9ecde83f39bfad23f6
 AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
 AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044
 DIST seamonkey-2.0.5-patches-01.tar.bz2 14905 RMD160 b9323ffc75c31343982b37151a879129fe37dc9b SHA1 5bb55b2fc707f84157af181aa9e30a3b7d839dbc SHA256 288ea43820b8c1f5380024f751fa23e59bc9bafba9d506678968ac7e40ea9dc5
-DIST seamonkey-2.1b1-de.xpi 551777 RMD160 a26bc15e0aeb0241e434766febe39bcff9775750 SHA1 c1192256b20b66ba78044aa1828321b8a7aeae8f SHA256 68ede1f62e1823339caebde78b1772e4490c93bf06216510bbb51f67e4afecac
-DIST seamonkey-2.1b1-es-ES.xpi 513747 RMD160 4cf7478d3672cb4e7b0811a287eef704833a00ee SHA1 469dd2fca9b47b6c91fc56434ff07cf9d484edee SHA256 bc0eacfd09541741cdba27886e117d47a20187113d89938dedfe38345cd69b1c
-DIST seamonkey-2.1b1-fr.xpi 631303 RMD160 86c27a0710003c8c84912480f458b497a97a8470 SHA1 ba8675f3b4c3f818991dca09864c49a66ee8cd1a SHA256 8328cfbdc7555d266a441e64ca510bf9f29b1fca026b9e9bcf279ab5962936a0
-DIST seamonkey-2.1b1-lt.xpi 609956 RMD160 2b96157ffcb3b2833b005a86123fa0e6558b9eaa SHA1 c0eaf1cbf7f46bae9fb4987b4d241884007a9094 SHA256 eaf12f26f38a6f870da0ccb19e876b2ec7d0542c1cdc972a1c84a52c61d8a327
-DIST seamonkey-2.1b1-nb-NO.xpi 503305 RMD160 7f9c5ef52c6208ab3af722acd7bec18172b38be2 SHA1 91d99023d55601b9dd8c087195124d4fb52827df SHA256 21523862f76c9ff7511f644403923fe6cdfab5c928c23e65767a360125e25771
-DIST seamonkey-2.1b1-ru.xpi 566693 RMD160 fd3d87af623ebba27d1145827262228352447894 SHA1 998aaf0ff3dfbed43afefc355e9a5e36f847fd23 SHA256 e3891cd4f71bac88ced5d8a0f99e8b3776b2b319c41628121fbb2418973bb66f
-DIST seamonkey-2.1b1-sk.xpi 532895 RMD160 acf5aa1e10ded262e36fef99aba478bc1d88700b SHA1 fff2eb4932c16a2852bd5e99bdc2e0c35801bdf5 SHA256 ea365bf6f93482b0fd2c8bd6af829cbfdd0ae2afe8c4eaf234fc30c0ff96aacb
-DIST seamonkey-2.1b1.source.tar.bz2 78582261 RMD160 28a2fafdfedb1e602c15b2aab554549354ddac08 SHA1 8bc7bfe512fbd1eeed4950b77f0da4f7408ab434 SHA256 0fa74bbd1f5eba6495e3e3373e5cec419d721e21c7e71bbb92a367eb98212df4
 DIST seamonkey-2.1b2-be.xpi 789040 RMD160 6c79a349353cecb1b14bfdb93891caa4ceb2d047 SHA1 32a2c65dad11733d75d86965e846d50ce413042d SHA256 2610a08907c15de896ce799d144489e5b85e94b8de33c9ff1e49d11ce9d39c82
 DIST seamonkey-2.1b2-cs.xpi 813191 RMD160 59d344f2e4221c63893b2bd27cc0dcf754e5a560 SHA1 e80cd550f3aa96427fcc4b6ff16868c90ae9ac49 SHA256 a21ee7ba40ec280903d6eb00a44591b56492e94ef58a32be7bb072f6712fc2ec
 DIST seamonkey-2.1b2-de.xpi 851721 RMD160 681e3d607ebce24bab6b5b7a82a3f5b74a8fbf57 SHA1 99c45ff247f37147db5972dc1a8e28956fe2f755 SHA256 a3e05119f04cb3486b9d143ece730351fc8e0ac83d7627d139dd53c7886f2ede
@@ -33,5 +24,4 @@ DIST seamonkey-2.1b2-ru.xpi 885903 RMD160 7a2a6d60609521013fe2380d5ab67f59490730
 DIST seamonkey-2.1b2-sk.xpi 835935 RMD160 6ab9dcc723d2bb147a23d84532eaf13ca94eea07 SHA1 b3ef9378fd13566bd3443f9e3507c7ba96a8391a SHA256 78a5a655567e4fed278911b99443c23c671065a6a864aebfbb29fbafa4fae0f0
 DIST seamonkey-2.1b2-sv-SE.xpi 867156 RMD160 6d3ca2aab099e6bc6c57c641b20a1ab10751a31e SHA1 ec46f7c052ed388d3022ad7ffeb4c6a6c0e8b0aa SHA256 abb1bff1771543d6202fc520f66acec930be02dec1d2c75b329b96955ec6815c
 DIST seamonkey-2.1b2.source.tar.bz2 83425193 RMD160 d7a9a61fd470a58e19f4e9b2d2c7a00eaf1362ac SHA1 c94fd66240fd9d77a73fdeec271131c23fd6cf98 SHA256 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a
-EBUILD seamonkey-2.1_beta1-r1.ebuild 10839 RMD160 2fd92ff75172db7839f10ff33229cca4dc24d2bc SHA1 9db73e136810c70ccd5d12c9528e206f2bdef353 SHA256 a2f1ac22cc516dc86df9133bbb11617415fa76f39c551a857b8f305169b1570e
-EBUILD seamonkey-2.1_beta2.ebuild 11404 RMD160 5aa66c209276449d3fca8a4bcd5f334083db5d9e SHA1 c08443ec023fdc65d8d1c310ee8f23aa1554a9e7 SHA256 de8aa8a42a58cb9d4b8e72f9b6c3a9ca32529c64c545ec1b797a6571b80951ac
+EBUILD seamonkey-2.1_beta2.ebuild 11509 RMD160 53059d098eba0d51303bcfd5eafef109a6d9d017 SHA1 5c27af8e030445bef3ff83dcd549a080bcb38047 SHA256 1768c2d87bdf28dd4f3ddf2b179eec9417130858fb0fa693ae096747e98867d4

diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch b/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch
deleted file mode 100644
index 8f28c96..0000000
--- a/www-client/seamonkey/files/2.1/seamonkey-2.1b1-bug607222.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- mozilla/content/base/src/nsGenericElement.cpp
-+++ mozilla/content/base/src/nsGenericElement.cpp
-@@ -3573,18 +3573,18 @@
-     }
-   }
- 
--  PRUint32 childCount = aChildArray.ChildCount();
--  NS_ENSURE_TRUE(aIndex <= childCount, NS_ERROR_ILLEGAL_VALUE);
--
-   // The id-handling code, and in the future possibly other code, need to
-   // react to unexpected attribute changes.
-   nsMutationGuard::DidMutate();
- 
--  PRBool isAppend = (aIndex == childCount);
--
-+  // Do this before checking the child-count since this could cause mutations
-   nsIDocument* doc = GetCurrentDoc();
-   mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
- 
-+  PRUint32 childCount = aChildArray.ChildCount();
-+  NS_ENSURE_TRUE(aIndex <= childCount, NS_ERROR_ILLEGAL_VALUE);
-+  PRBool isAppend = (aIndex == childCount);
-+
-   rv = aChildArray.InsertChildAt(aKid, aIndex);
-   NS_ENSURE_SUCCESS(rv, rv);
-   if (aIndex == 0) {
-@@ -4039,6 +4039,8 @@
-   nsresult res = NS_OK;
-   PRInt32 insPos;
- 
-+  mozAutoDocConditionalContentUpdateBatch batch(GetCurrentDoc(), PR_TRUE);
-+
-   // Figure out which index to insert at
-   if (aRefChild) {
-     insPos = IndexOf(aRefChild);
-@@ -4100,11 +4102,6 @@
-     }
-   }
- 
--  // We want an update batch when we expect several mutations to be performed,
--  // which is when we're replacing a node, or when we're inserting a fragment.
--  mozAutoDocConditionalContentUpdateBatch batch(GetCurrentDoc(),
--    aReplace || nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE);
--
-   // If we're replacing
-   if (aReplace) {
-     refContent = GetChildAt(insPos + 1);

diff --git a/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff b/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff
new file mode 100644
index 0000000..34639fc
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/xulrunner-libpng15.diff
@@ -0,0 +1,12 @@
+--- mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
++++ mozilla/modules/libpr0n/decoders/nsPNGDecoder.cpp
+@@ -386,7 +386,8 @@
+   // First try to see if iCCP chunk is present
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+     png_uint_32 profileLen;
+-    char *profileData, *profileName;
++    png_bytep profileData;
++    png_charp profileName;
+     int compression;
+ 
+     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
deleted file mode 100644
index d34bcc7..0000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -23,7 +23,7 @@
-       <Description>
-         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-         <em:minVersion>2.1a1pre</em:minVersion>
--        <em:maxVersion>2.1a2</em:maxVersion>
-+        <em:maxVersion>2.1b1</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     <em:targetApplication>

diff --git a/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild b/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild
deleted file mode 100644
index 252d3e1..0000000
--- a/www-client/seamonkey/seamonkey-2.1_beta1-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension python
-
-PATCH="${PN}-2.0.5-patches-01"
-EMVER="1.1.2"
-
-LANGS="de en es-ES fr lt nb-NO ru sk"
-NOSHORTLANGS="es-ES nb-NO"
-
-MY_PV="${PV/_pre*}"
-MY_PV="${MY_PV/_alpha/a}"
-MY_PV="${MY_PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-# release versions usually have language packs. So be careful with changing this.
-HAS_LANGS="true"
-if [[ ${PV} == *_pre* ]] ; then
-	# pre-releases. No need for arch teams to change KEYWORDS here.
-
-	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
-	KEYWORDS=""
-	#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	HAS_LANGS="false"
-else
-	# This is where arch teams should change the KEYWORDS.
-
-	REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
-fi
-
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +chatzilla +composer +crypt libnotify ldap +mailclient +roaming system-sqlite +vpx wifi"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
-	crypt? ( mailclient? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110124.tar.bz2 ) )"
-
-if ${HAS_LANGS} ; then
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X/-/_}"
-		# english is handled internally
-		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-			if [ "${X}" != "en-US" ]; then
-				SRC_URI="${SRC_URI}
-					linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
-			fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	alsa? ( media-libs/alsa-lib )
-	system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,unlock-notify] )
-	>=media-libs/libpng-1.4.1[apng]
-	>=app-text/hunspell-1.2
-	>=x11-libs/gtk+-2.10.0
-	>=x11-libs/cairo-1.10.0[X]
-	>=x11-libs/pango-1.14.0[X]
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )
-	wifi? ( net-wireless/wireless-tools )"
-	#vpx? ( media-libs/libvpx )
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]
-	dev-util/pkgconfig
-	vpx? ( dev-lang/yasm )"
-
-S="${WORKDIR}/comm-central"
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			# FIXME: Add support for unpacking xpis to portage
-			[[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
-		done
-		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-			einfo "Selected language packs (first will be default): ${linguas}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${PV} == *_pre* ]] ; then
-		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
-		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
-		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
-	fi
-
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_EXCLUDE="1002_fix-system-hunspell-dict-detections.patch
-			118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
-			310-gecko-1.9.1-cairo-1.8.10-crash-fix.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	#epatch "${FILESDIR}"/2.1/${PN}-2.1b1-system-libvpx.patch
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
-	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-bug607222.patch
-	#epatch "${FILESDIR}"/2.1/${PN}-2.1b1-bug484968.scrolltabs.02.diff
-
-	if use crypt && use mailclient ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b1-versionfix.patch
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
-		eautomake
-		makemake2
-		cd "${S}"
-	fi
-
-	#pushd "${S}"/mozilla &>/dev/null || die pushd
-	#popd &>/dev/null || die popd
-
-	#Ensure we disable javaxpcom by default to prevent configure breakage
-	sed -i -e s:MOZ_JAVAXPCOM\=1::g ${S}/mozilla/xulrunner/confvars.sh \
-		|| die "sed javaxpcom"
-
-	eautoreconf
-	cd "${S}"/mozilla || die
-	eautoreconf
-	cd "${S}"/mozilla/js/src || die
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS=""
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	if ! use chatzilla ; then
-		MEXTENSIONS="${MEXTENSIONS},-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS="${MEXTENSIONS},-sroaming"
-	fi
-
-	if ! use gnome ; then
-		MEXTENSIONS="${MEXTENSIONS},-gnomevfs"
-	fi
-
-	if ! use composer ; then
-		if ! use chatzilla && ! use mailclient ; then
-			mozconfig_annotate '-composer' --disable-composer
-		fi
-	fi
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=suite
-	mozconfig_annotate 'broken' --disable-mochitest
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-printing
-
-	# Enable/Disable based on USE flags
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	#if use ldap ; then
-	#	mozconfig_annotate 'ldap' --enable-ldap
-	#	mozconfig_annotate 'ldap' --enable-ldap-experimental
-	#fi
-	mozconfig_use_enable mailclient mailnews
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable vpx webm
-	#mozconfig_use_with vpx system-vpx
-	mozconfig_use_enable wifi necko-wifi
-
-	if use vpx && ! use alsa; then
-		ewarn "USE=vpx needs USE=alsa, disabling WebM support."
-		mozconfig_annotate '+webm -alsa' --disable-webm
-	fi
-
-	if use amd64 || use x86 || use arm || use sparc; then
-		mozconfig_annotate '' --enable-tracejit
-	fi
-
-        # ZOMG! Mozilla guys wanna have APNG in libpng if building with
-        # system-libpng. Kids, leave your fingers from drugs that make you
-        # do such nasty "extensions"!!!
-        # See https://bugs.gentoo.org/183370 for details.
-        mozconfig_annotate '' --with-system-png
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Work around breakage in makeopts with --no-print-directory
-	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt && use mailclient ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use crypt && use mailclient ; then
-		cd "${T}" || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	if ${HAS_LANGS} ; then
-		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
-		done
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png seamonkey.png \
-		|| die
-	domenu "${FILESDIR}"/icon/seamonkey.desktop || die
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
-	fi
-
-	# Add our default prefs
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
-		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
-			|| die
-
-	# Plugins dir
-	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
-
-	doman "${S}"/suite/app/${PN}.1 || die
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
-
-	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
-		rm ${MOZILLA_FIVE_HOME}/plugins -rf
-	fi
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-
-	if use chatzilla ; then
-		elog "chatzilla is now an extension which can be en-/disabled and configured via"
-		elog "the Add-on manager."
-	fi
-}

diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
index 2a054b5..5b059d0 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild
@@ -158,6 +158,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/2.1/${PN}-2.1b1-configure-fix.patch
 	epatch "${FILESDIR}"/2.1/${PN}-2.1b2-system-cairo-fixup.patch
 	epatch "${FILESDIR}"/2.1/${PN}-libnotify07.patch
+	if has_version \>=media-libs/libpng-1.5.0 ; then
+		epatch "${FILESDIR}"/2.1/xulrunner-libpng15.diff
+	fi
 
 	if use crypt && use mailclient ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail