diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild
index a882049a2bb6..d96745c4f586 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild,v 1.5 2011/10/16 12:10:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20110928.ebuild,v 1.6 2012/03/14 09:51:28 ssuominen Exp $
 
 EAPI="4"
 
@@ -12,7 +12,8 @@ KEYWORDS="-* amd64"
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 	~app-emulation/emul-linux-x86-xlibs-${PV}
-	!<=app-emulation/emul-linux-x86-sdl-20081109"
+	!<=app-emulation/emul-linux-x86-sdl-20081109
+	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
 PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}
 	~app-emulation/emul-linux-x86-sdl-${PV}"
 # sdl pdep should be dropped once bug #299324 is solved
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
index 2edb595f53b7..9c9696b74bf5 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild,v 1.2 2012/03/09 14:53:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20120127.ebuild,v 1.3 2012/03/14 09:51:28 ssuominen Exp $
 
 EAPI="4"
 
@@ -13,7 +13,8 @@ DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 	~app-emulation/emul-linux-x86-xlibs-${PV}
 	~app-emulation/emul-linux-x86-db-${PV}
-	!<=app-emulation/emul-linux-x86-sdl-20081109"
+	!<=app-emulation/emul-linux-x86-sdl-20081109
+	!<=app-emulation/emul-linux-x86-soundlibs-20110101"
 PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}
 	~app-emulation/emul-linux-x86-sdl-${PV}"
 # sdl pdep should be dropped once bug #299324 is solved
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 2b9740ee08e4..b4e674217b96 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -3,6 +3,5 @@ DIST libstemmer_c.tgz 129195 RMD160 3d255f174b462704a615f9c7871f2d86fce8c2dd SHA
 DIST sphinx-0.9.8.1.tar.gz 949660 RMD160 ab2bfee4cad552217e132449c7dd6b1071ed5bc9 SHA1 eed4c6f5b314f965c19cca8aebd0b6d847cd35f9 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013
 DIST sphinx-0.9.9.tar.gz 1218359 RMD160 ed3cd1a9328114c1d2a6325cce5520065076c275 SHA1 8c739b96d756a50972c27c7004488b55d7458015 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4
 DIST sphinx-1.10-beta.tar.gz 1518778 RMD160 1d600289c76d412e96af611ec5c614fcfd3489e1 SHA1 28e84071e75d017f4e3403e5d22dbc1302a3c912 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60
-DIST sphinx-2.0.1-beta.tar.gz 1761313 RMD160 678ff846c82dff890f1e38daa524464cabf9e563 SHA1 7c1244ea95ab4fed1322c6e0cbbf88c2f7e97f9c SHA256 fe27152ee24224bcf2ab7293dabe826d8db69c35eca16edf1ca510e0a1f4bf81
-DIST sphinx-2.0.2-beta.tar.gz 1916158 RMD160 66816276ae0ce13703aaf39563e1aea405e074d3 SHA1 af0fcca27abbc3d73e04ce7265748350e6bb93b9 SHA256 7023b394e1f8a11f10db53cffe37782c7e5aa5cb69cfcbb15ac246a74d7edeb8
 DIST sphinx-2.0.3-release.tar.gz 1923911 RMD160 04140bffc8e5c6cc9466cdb8d6eac226f7f06b3e SHA1 dcc8055648d6bebff17ee65673011d64cc02ca41 SHA256 875af63473875b7c7e152e85ed34bd1a92d09db062a289b594bf049b3a8c82dd
+DIST sphinx-2.0.4-release.tar.gz 1938089 RMD160 90eb45f5a703911ea9379d43259c1723e4636402 SHA1 168794dcfb4644ac02dcce863c04b351399b0863 SHA256 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886
diff --git a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild b/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
deleted file mode 100644
index 67a328f5d402..000000000000
--- a/app-misc/sphinx/sphinx-2.0.1_beta.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.1_beta.ebuild,v 1.3 2011/09/28 10:40:10 grobian Exp $
-
-EAPI=3
-inherit eutils autotools
-
-MY_P=${P/_/-}
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	odbc? ( dev-db/unixODBC )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-darwin8.patch
-	epatch "${FILESDIR}"/${P}-solaris.patch
-
-	# drop nasty hardcoded search path breaking Prefix
-	sed -i -e '/\/usr\/local\//d' configure.ac || die
-	eautoreconf
-
-	cd api/libsphinxclient || die
-	eautoreconf
-}
-
-src_configure() {
-	# fix libiconv detection
-	use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
-
-	cd api/libsphinxclient || die
-	econf STRIP=:
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-	dodir /var/run/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test || die "install of test files failed."
-	fi
-}
diff --git a/app-misc/sphinx/sphinx-2.0.2_beta.ebuild b/app-misc/sphinx/sphinx-2.0.4.ebuild
similarity index 91%
rename from app-misc/sphinx/sphinx-2.0.2_beta.ebuild
rename to app-misc/sphinx/sphinx-2.0.4.ebuild
index 2c7e3eb371cb..4810745146b1 100644
--- a/app-misc/sphinx/sphinx-2.0.2_beta.ebuild
+++ b/app-misc/sphinx/sphinx-2.0.4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.2_beta.ebuild,v 1.1 2011/11/28 18:23:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.4.ebuild,v 1.1 2012/03/14 07:40:27 graaff Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils autotools
 
-MY_P=${P/_/-}
+#MY_P=${P/_/-}
+MY_P=${P}-release
 
 # This has been added by Gentoo, to explicitly version libstemmer.
 # It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
@@ -95,6 +96,6 @@ src_install() {
 
 	if use test; then
 		insinto /usr/share/${PN}
-		doins -r test || die "install of test files failed."
+		doins -r test
 	fi
 }
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 73f186868aea..6870ba05b321 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,4 @@
 DIST texi2html-1.64.tar.gz 143333 RMD160 80a2b3917f17fce6131b7eab36c02d4c53cac148 SHA1 973b95dcc06fcdae4929a4a7a4ee7f51b568f84c SHA256 9926dc471d72f80d4b655ae4fdcb4ad74ebb443953e85e333f29ed8b30d59b2f
 DIST texi2html-1.76.tar.gz 470207 RMD160 987481a32d2aabf04f6217b3f43660696e5d7473 SHA1 b50bf52eb362b9eaf2c210da09752a3542455ac2 SHA256 387392086e591be9bd58879eb1e05908b6b886c871b92ad240b159af2ae6a623
 DIST texi2html-1.78.tar.bz2 453223 RMD160 e68bfcb4a8270d8d1e2fc4010c0c0bdde3d3ff47 SHA1 60474f8cf8de91b69a9f3b9fe525fa550c21639b SHA256 740b1074d053570d4899c943a4aa99b97f10025d6306d1cc09c2c76e40a98167
+DIST texi2html-5.0.tar.bz2 15397249 RMD160 193d2ab489e61546100a57943c410deffb8d4c4b SHA1 20072444ce814d0e74fd7e467d1506908f8c889c SHA256 e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa
diff --git a/app-text/texi2html/texi2html-5.0.ebuild b/app-text/texi2html/texi2html-5.0.ebuild
new file mode 100644
index 000000000000..3ad59ca76ef0
--- /dev/null
+++ b/app-text/texi2html/texi2html-5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-5.0.ebuild,v 1.1 2012/03/14 06:18:40 ssuominen Exp $
+
+EAPI=4
+
+DESCRIPTION="Perl script that converts Texinfo to HTML"
+HOMEPAGE="http://www.nongnu.org/texi2html/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="CCPL-ShareAlike-1.0 FDL-1.3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+RDEPEND=">=dev-lang/perl-5.10.1
+	dev-perl/libintl-perl
+	unicode? ( dev-perl/Text-Unidecode )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_configure() {
+	econf \
+		--with-external-libintl-perl \
+		$(use_with unicode unidecode)
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README}
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/usr/bin/${PN}
+}
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
index 896e3dd22632..a780823655ad 100644
--- a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild,v 1.2 2011/09/03 21:04:37 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild,v 1.3 2012/03/14 06:00:32 ssuominen Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="US-ASCII transliterations of Unicode text"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
new file mode 100644
index 000000000000..ab504ab1b023
--- /dev/null
+++ b/dev-php/awl/Manifest
@@ -0,0 +1 @@
+DIST awl-0.51.tar.gz 297202 RMD160 7936b361daaf460fcda1c71fc2c3eead6bf9fa96 SHA1 a5b2c13487604b0e38289e17021d1fa682180e10 SHA256 1ec6e0029779772aa9204c866c48e6d35fea63c812321a505cf087a4bd1c7234
diff --git a/dev-php/awl/awl-0.51.ebuild b/dev-php/awl/awl-0.51.ebuild
new file mode 100644
index 000000000000..bfc0ca0e3cbe
--- /dev/null
+++ b/dev-php/awl/awl-0.51.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/awl/awl-0.51.ebuild,v 1.1 2012/03/14 06:43:43 patrick Exp $
+
+EAPI=2
+
+inherit depend.php php-lib-r1
+
+DESCRIPTION="Andrew McMillan's web libraries: A collection of generic classes
+used by the davical calendar server"
+HOMEPAGE="http://andrew.mcmillan.net.nz/projects/awl"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/php[pdo,postgres,xml]
+	doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="${DEPEND}"
+
+need_php5
+
+src_compile() {
+	if use doc ; then
+		ebegin "Generating documentation"
+		phpdoc -c "docs/api/phpdoc.ini" || die "Documentation failed to build"
+	fi
+}
+
+src_install() {
+	local docs="debian/README.Debian debian/changelog"
+	dodoc-php ${docs} || die "dodoc failed"
+
+	if use doc ; then
+		dohtml -r "docs/api/" || die "dohtml failed"
+	fi
+
+	php-lib-r1_src_install . dba/* inc/* scripts/*
+}
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
new file mode 100644
index 000000000000..13427524e248
--- /dev/null
+++ b/dev-php/awl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+	<maintainer>
+                <email>francois.perichon@univ-lille2.fr</email>
+                <name>Francois Perichon</name>
+        </maintainer>
+        <maintainer>
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer (proxy)</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-python/rtf2xml/Manifest b/dev-python/rtf2xml/Manifest
index 314e7d9b99cd..a27edd0fb67b 100644
--- a/dev-python/rtf2xml/Manifest
+++ b/dev-python/rtf2xml/Manifest
@@ -1 +1,2 @@
 DIST rtf2xml-1.32.tar.gz 428711 RMD160 777fea5e8134a7407609f4302bce5a782ba24755 SHA1 7cda398ec84b490615a548dfec82f4ea294520d0 SHA256 3afc0e56d01dbb46a7d40000d839b96088fa3d611893027df0aab8a10846f757
+DIST rtf2xml-1.33.tar.gz 421817 RMD160 e5ed7539f3bfc9e3071be4d92e7f5d1c365e3a44 SHA1 3bf2bf8f78ef7ee05bccde34c78023af0c6ea08a SHA256 8dbfd3b8f266568775c2de812620288543771135212a836d1dd43d5dd45575a0
diff --git a/dev-python/rtf2xml/rtf2xml-1.33.ebuild b/dev-python/rtf2xml/rtf2xml-1.33.ebuild
new file mode 100644
index 000000000000..bf90a4d5995c
--- /dev/null
+++ b/dev-python/rtf2xml/rtf2xml-1.33.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rtf2xml/rtf2xml-1.33.ebuild,v 1.1 2012/03/14 05:32:02 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Converts a Microsoft RTF file to structured XML"
+HOMEPAGE="http://rtf2xml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	distutils_src_install
+
+	dohtml docs/html/*
+}
diff --git a/dev-util/egypt/Manifest b/dev-util/egypt/Manifest
index 074f34f1fb7d..1f417eb9e39a 100644
--- a/dev-util/egypt/Manifest
+++ b/dev-util/egypt/Manifest
@@ -1 +1,2 @@
 DIST egypt-1.8.tar.gz 4566 RMD160 8c7b17463d8c29cba6c1631872e544fc3d049ad5 SHA1 8a03eac676897d864d3ee02549d13c0cf7c5926c SHA256 c1c4af1fea42d698b5f30fd97234ae34fe0a9a8ff3210b7d8a8aa28f92b0627d
+DIST egypt-1.9.tar.gz 4607 RMD160 24bed5feb81d4b39fa2c3c24e5a7dd6416b17e4a SHA1 24672c8a83b5e4b9ed430fe63ab3449713c699ae SHA256 f3be611a97373f92b63f286ea17e4aae23ad62d75938e009448e9b70d97791c7
diff --git a/dev-util/egypt/egypt-1.9.ebuild b/dev-util/egypt/egypt-1.9.ebuild
new file mode 100644
index 000000000000..885b22ec7e5d
--- /dev/null
+++ b/dev-util/egypt/egypt-1.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/egypt/egypt-1.9.ebuild,v 1.1 2012/03/14 05:41:08 patrick Exp $
+
+inherit perl-app
+
+DESCRIPTION="devilishly simple tool for creating call graphs of C programs"
+HOMEPAGE="http://www.gson.org/egypt/"
+SRC_URI="http://www.gson.org/egypt/download/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-util/osdt/Manifest b/dev-util/osdt/Manifest
index 983bc3978c5a..db7d984cb206 100644
--- a/dev-util/osdt/Manifest
+++ b/dev-util/osdt/Manifest
@@ -1 +1,2 @@
 DIST osdt-1.1.0.tbz2 18715 RMD160 b45a7953ee793e0696057817d148462e557cc4c7 SHA1 05d8606b9d884b511c42ee3ca564c8482813ab54 SHA256 0ee6e2770b4fc8b2ad0e587351c4ec49918928257efbab4957e842695854021c
+DIST osdt-1.1.3.tbz2 48139 RMD160 676ca86eb146d2e4dcc172ac716ce3a2587985c7 SHA1 ffa8545df2d0a4a1d98cc300f711f69fc1006ad5 SHA256 fd262570efc7f4580f4728bc4ad656e24d0a54697cebf1ceac0104ccf0eb77de
diff --git a/dev-util/osdt/osdt-1.1.3.ebuild b/dev-util/osdt/osdt-1.1.3.ebuild
new file mode 100644
index 000000000000..7bfb7a428603
--- /dev/null
+++ b/dev-util/osdt/osdt-1.1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osdt/osdt-1.1.3.ebuild,v 1.1 2012/03/14 05:52:56 patrick Exp $
+
+DESCRIPTION="tools for Open Source software distribution"
+HOMEPAGE="http://sourceforge.net/projects/osdt/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5
+	dev-perl/XML-Simple
+	sys-devel/m4"
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr SYSCONFDIR=/etc \
+	  INFODIR=/usr/share/info MANDIR=/usr/share/man install || die
+
+	# Hack until the fix can be incorporated upstream: fix the permissions
+	# on /etc/osdt/project-skeletons/opensource/
+	chmod 755 "${D}"/etc/osdt/project-skeletons/opensource/
+}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index b7be86680432..35da44e375a9 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,2 +1,2 @@
-DIST pyfa-1.1.1-crucible-src.tar.bz2 4067326 RMD160 91b8417765758e2b12cec89a6c97fe4294a1a0ab SHA1 ad7452142acb07cd42d5ce032edf6b6cfb8d5e86 SHA256 e8ade754d85cf5a9a9718cd2ae696e9182c0e19fbefc79432edd6d2362161807
 DIST pyfa-1.1.2-crucible-src.tar.bz2 4034641 RMD160 deb3467c6b23652005d18670e0b147d64e07da8a SHA1 4e25ec9b68ce8390f43a1548ad57939b0cf79688 SHA256 f0b976a0975a91217850a1b4549a00fbb4bfe5d2cd427d543adca8348e32210f
+DIST pyfa-1.1.3-crucible-src.tar.bz2 3918655 RMD160 768be5be520b4a4515a1944588b784ef2b45495b SHA1 1dcf5cab833e0b739cce8b58686f4b3209a85507 SHA256 ad0ab1589cdd5b2783781e27f789c119883cef59437234aeaabea1f71c84b5d8
diff --git a/games-util/pyfa/pyfa-1.1.1.ebuild b/games-util/pyfa/pyfa-1.1.3.ebuild
similarity index 92%
rename from games-util/pyfa/pyfa-1.1.1.ebuild
rename to games-util/pyfa/pyfa-1.1.3.ebuild
index 7f89f74c09e4..3f4180909d5d 100644
--- a/games-util/pyfa/pyfa-1.1.1.ebuild
+++ b/games-util/pyfa/pyfa-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.1.ebuild,v 1.1 2011/12/26 03:40:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.3.ebuild,v 1.1 2012/03/14 06:41:11 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 21e89f9febab..66ae6926cf9e 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1 a81d7fb4be541547be78d648bbeb0d3c51f1a41e SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b24655908a8971fa10794e
 DIST gnome-screensaver-2.30.2.tar.bz2 4814653 RMD160 1b13722f3bebca709b9f44c45e995d07ed6c2044 SHA1 f9d7c0df0efaa6916099ca56078da8b36f4c4935 SHA256 dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
-DIST gnome-screensaver-3.2.0.tar.xz 566084 RMD160 cb21d95961763fcb831a9b1293569c04bc3deacb SHA1 69c87cd60f76a3a6626970c3dd3fd8f72fda542f SHA256 305f4a5be8736c4cf5e55b8288b7e177907bafa26e39273d1bb65ad1862295ed
 DIST gnome-screensaver-3.2.1.tar.xz 563292 RMD160 dd87cf7accf048897b23cdcbd0122d0c8c6f5eb6 SHA1 247031a20ec7010d7c9116eff6bf26b6e2fe9643 SHA256 a5beea3e854c27369eb10a2987ab6673101416f56f1c616075cefae2458f5411
+DIST gnome-screensaver-3.2.2.tar.xz 564728 RMD160 a67917aeb7f016ea43f7db50712a509dae761680 SHA1 3b6ef3845a2e237bb36ba8b4080410de7fbadb79 SHA256 7839ca0e034c4ecf40c8abe64296c4b0c95f3e04f28e3034fca861ebfe3d06b2
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.2.ebuild
similarity index 81%
rename from gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild
rename to gnome-extra/gnome-screensaver/gnome-screensaver-3.2.2.ebuild
index dfd73a237f84..a79ee92fcacd 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.0.ebuild,v 1.2 2012/02/14 04:24:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.2.2.ebuild,v 1.1 2012/03/14 07:00:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug doc pam"
+IUSE="debug doc pam systemd"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
@@ -34,6 +34,7 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic
 
 	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
@@ -54,11 +55,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable doc docbook-docs)
 		$(use_enable pam locking)
+		$(use_with systemd)
 		--with-mit-ext
 		--with-pam-prefix=/etc
 		--with-xf86gamma-ext
 		--with-kbd-layout-indicator
 		--disable-schemas-compile"
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
 	# xscreensaver and custom screensaver capability removed
 	# poke and inhibit commands were also removed, bug 579430
 }
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 927bcdf70435..c6f191fcf6eb 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -50,5 +50,59 @@ DIST thunderbird-10.0.2-uk.xpi 463922 RMD160 a6d34f5da36ba5066c3a5505e8e4c99db8b
 DIST thunderbird-10.0.2-vi.xpi 435882 RMD160 f4b428533728b2dbf7affdd93d7af1fcabf431e1 SHA1 8b475d626396debbb01ab9484ddebc9227f8245f SHA256 1ee138ed4f805d21a9028b70e2d568c730be95564aeb82bb5fdc66a133543406
 DIST thunderbird-10.0.2-zh-CN.xpi 431231 RMD160 c6c19ecd67dd35edffc1563efb1b33fb585db144 SHA1 def9055acb5b574103e4f0f0eca5e15501430810 SHA256 e8ba5f21fe037530cae7832db4ed33c2ce58cc0fae605a8a0d25654b4a0e09cc
 DIST thunderbird-10.0.2-zh-TW.xpi 431824 RMD160 a65bc34ef02a67350f8107016ae1f8e971506ac5 SHA1 8cefe8df6cb805306b91faed5d99f7c0a21eb36e SHA256 a92886276ee1750f4bcd0fdf9100fc90783e9abf8aace55f5422eb1ac1dd22d8
+DIST thunderbird-11.0-ar.xpi 441216 RMD160 899f5287bfdfa5a6af02bbf27c7d915663d1342d SHA1 3e5a7c2649484787dd3002c3ebb25c3c3a81acdf SHA256 30fa17d2c6237d22670466dc21c7b1c01370fe98e9a48c385affc87c168110a6
+DIST thunderbird-11.0-ast.xpi 362423 RMD160 bc98f7985b8bc38dbe8afd8bff21113db9ecf106 SHA1 f194cf28af94485e8da91b727bf3f56c0f012729 SHA256 80e5ac8b08dbf8c14d1b0fe14cf015b1d72a10238772071d84b3a3c898a6d40b
+DIST thunderbird-11.0-be.xpi 397779 RMD160 09ecbf1bfd029851f4427ad50749387f39ff429d SHA1 95dd4746fc30e50a27e3ae9a423736bda6790ce0 SHA256 db3bdc8906061620016288667574338833b796ea8833565d24001b781383fe46
+DIST thunderbird-11.0-bg.xpi 460349 RMD160 d7db456efad83a189763bbec2d263b762e4f3bf9 SHA1 683767da046343586812caced4873776bbd2fd6e SHA256 599d03e9ee87f3f5b6a8afc692c19ecfe4c37a384849f495cabecd99ac2b342e
+DIST thunderbird-11.0-bn-BD.xpi 477631 RMD160 091c321c32e88282ab3afc46d933eb9240f02a7a SHA1 60b640bbce8a299bde462a4aa3dfec12fe39a12a SHA256 8537fdbdefe58a50a69134e8bec8a19f760d1cf3fcabca19e2a0915c980d8f10
+DIST thunderbird-11.0-br.xpi 414897 RMD160 4ffd6299e912ea40ed64e84f4e5761deaa09ebae SHA1 e437eb4815747662ff5f1aae311d40b3cf8783ec SHA256 0cf0ed995520a60a36e6fa8117836d89de25340dff8d1bbc9477df946078fa69
+DIST thunderbird-11.0-ca.xpi 415451 RMD160 5bb98a5e38ae419c3c8fc0e68e42d2ccd1b72ea9 SHA1 354201bcbf413166a83595ef29c0da693919860a SHA256 2951e0e8cd2c1251528089e95c85b2972e550be161cbfce434b08d753c4a4386
+DIST thunderbird-11.0-cs.xpi 418864 RMD160 2064c56c9772489757d995b7e52e8c9bf8d570f9 SHA1 7918f686d5f6765de609c87dfd62c3c1d54b580d SHA256 79615e66683b4a048c7c5bf4520b9e8b85a432f40101f5f05daa051fae4439ea
+DIST thunderbird-11.0-da.xpi 362834 RMD160 90931ef4773b3668bcff0ac3ba10ec8b9c47a398 SHA1 ae660d77cffa53a38afceb8c5431cfb14819b4c2 SHA256 0ae1f7c84f6ba471bab6129652eff2c8ae78de122f2ab9292ce52270449b9e39
+DIST thunderbird-11.0-de.xpi 417768 RMD160 23cbd13c4b6013d98c02e95d047f3dcdc16ae2fe SHA1 a06a6a1d163c81023673888f211c13eefc9e1802 SHA256 759760e6db3eca027683f70fdd8454f72c7ea091ba37a27438809b9368a8d3db
+DIST thunderbird-11.0-el.xpi 404542 RMD160 8475287721c0be8465f0685149ef1ee48ca5f6a4 SHA1 bd00bee981c591875aeda6c31fe2d39b7b855836 SHA256 3237bb7f4211bcd24940ed757b216918aaec4eb16a175f69b784364a957dc778
+DIST thunderbird-11.0-en-GB.xpi 391086 RMD160 2c97928c3a01bbd65374b8013127ade8e4aed3cb SHA1 8d25d5ce6ef64368bdb8c631a0975071126159a6 SHA256 f43973cc2f806e9f7b5d199d22fe26d5bebdae45c02c92f58d8199d772265a22
+DIST thunderbird-11.0-es-AR.xpi 410204 RMD160 fb0f2248c32ec7185d27f1e74e46a06b0b0c31df SHA1 11771bd6d0fd2174ef2ed22eea13c63836f22202 SHA256 3879c2e188b9ccd04a302fe1d8ff901c235eb4c885b4766bfd0bcf951df701bd
+DIST thunderbird-11.0-es-ES.xpi 354876 RMD160 b9cdcaf235b6adc50ab523943438fc018b29ee44 SHA1 06deac2905167ac5bf0ad119efe06d6adb7e95b3 SHA256 2e0e8a3377b58538804aa98c4159ecad75b4a006c2df6d9bc6d78205b7470a8b
+DIST thunderbird-11.0-et.xpi 410223 RMD160 efce73b845160febd21e60367e8cfae8787ccac9 SHA1 6c3e9bb1edbd2a16608c0bd9f1cd0f1a66e2ab03 SHA256 61dbefbd6f3dc59dca5639b4b9cb83ece1d3c45769520718adf0b356be0f2133
+DIST thunderbird-11.0-eu.xpi 405865 RMD160 aa7fa4e3f5ccaae4148d5d2da85547de90f59681 SHA1 3d24f4c0fea109ce7bc99d2fe0079d997dbe62e5 SHA256 0272817e7b231c9456ccc94750c37f408e4a89195d38b80dd744517d3e0ff260
+DIST thunderbird-11.0-fi.xpi 411324 RMD160 b0ac81257dbcf327848563d4611d2929eb1c12ac SHA1 3692f0a8f33c63a8faa607a4a8bc8a626873ed54 SHA256 6c8ad91726ff2f545749a1c8a5bce75d918c9b6fa5a293018231dcea735e8739
+DIST thunderbird-11.0-fr.xpi 414191 RMD160 5ba208d73aa13a53af08ecc4bd57ad41aafece3f SHA1 b919d49f1011ee1e465ff90d223af404ee3295c9 SHA256 d07eb1db47b87cd666539010899393f6ff00ac91939ad600b0f1c0f2c3cd4b6f
+DIST thunderbird-11.0-fy-NL.xpi 413332 RMD160 83d9818b4ea7e6b11be0b3e4e72b5b1247741b32 SHA1 7b25fcd5598659fdd831e29f4005582e0fb74741 SHA256 bcb12c629b1cbbc81db3307cde76c76029a6f03f96ac3aebb7608a6acbe6d698
+DIST thunderbird-11.0-ga-IE.xpi 422574 RMD160 766d381c2ad5ef88fb55fbd01b8df5e236ab3937 SHA1 b687d6b7f481cc3d6112f86c3dfdc0d8894ebe04 SHA256 f858fbb1a58ef828f445660552b9abe142a4885118f1782025f65b538633eead
+DIST thunderbird-11.0-gd.xpi 425357 RMD160 d6a79866eab47063a3c14d71abf7dd39dfb13640 SHA1 90ce0afd9c5414da7fd329644040205b77332395 SHA256 fcded3e20deb4f21d5d1001a69b5d882ec5e2ee4a21810752a6e5fcb5d88ac25
+DIST thunderbird-11.0-gl.xpi 408702 RMD160 6263951fa99f9ea940006c95afbec24a8f9b5de4 SHA1 ef9fbc857257cf168d226e1155bb513f944e0da9 SHA256 f12d7e46088619db56568603ec26096432ca689d24934a9763b91e6c486d2aa0
+DIST thunderbird-11.0-he.xpi 439646 RMD160 61c8167ce6671098c513717c11f9aa4a1d5482f1 SHA1 f157096a79e415a448feca7d8be3c261aa01cd53 SHA256 38b38c6322526d5e2d814e05d96efeac779c998e6e1e346debf1801f22c75654
+DIST thunderbird-11.0-hu.xpi 425843 RMD160 87292c678a128c0cfaf9e4c413a3d043bcae2a94 SHA1 0687c830c2ce620e14abe8b869506ea6d6261d6f SHA256 888b6a86cb313212a855b66feb1d85668ea24d446723f093f24079b2faa6d0c6
+DIST thunderbird-11.0-id.xpi 399845 RMD160 13e7462bd8526bb724f8232c6e180489c9cf3750 SHA1 3238e6097831378726e4b164812d7ae118e5db1b SHA256 b079d72977c4245463ca014dda033f62642e69b1a45ecd8f9f1fa28f2d961240
+DIST thunderbird-11.0-is.xpi 412048 RMD160 bb3cece4f3a69d68d43d292d7abe98c1aa3dbaae SHA1 e1ff9c7d928eda4da236112a01a1edf2f4cc7af7 SHA256 3eaa4ae210fe7a0fa57fa6884ad7431f9aeaa9f04a35c2e9a8c57245e5d0a4de
+DIST thunderbird-11.0-it.xpi 347267 RMD160 49da608770ba128a5efd813bac7cada37f6251d0 SHA1 03d7c05b4c321906dcbbdfc61c1641bd02f70121 SHA256 39f108186b539c9fe67e5a5dce877476270d0fc0749f467fe1b4f0f85f41ce0b
+DIST thunderbird-11.0-ja.xpi 458649 RMD160 4ac2bf3b81828b6eed2067569e6b3f288755c485 SHA1 1cc0a4d3855704a6dd9b8ab4e015036dc1b65393 SHA256 a904627857600e4d2b25502908fe136423b915628c52e355bda0db16c859f4d0
+DIST thunderbird-11.0-ko.xpi 371463 RMD160 e47b49fe9dd7fd36a112db7512ac61ad1b6db1dd SHA1 75802f86f2658c6b5e065f193e625daddd2c8629 SHA256 5dc96ffc093abcf760592a80f8aa73b3a001d799576896e4b3c0e14900760912
+DIST thunderbird-11.0-lt.xpi 520217 RMD160 453f90f27d56fb61992cb7c93abf583614b18f38 SHA1 e1db2dc5224c426f1f3472775fefb3b4414e18fa SHA256 d48384a87bbca0b3de275cc6c54b0f2624b3e0d1904708a331e0df8e2a609474
+DIST thunderbird-11.0-nb-NO.xpi 407148 RMD160 56790fcfe5f8de46cf489e0689bd6810a925693f SHA1 557d381d3cbf563e4a2a212625491adcf02c0051 SHA256 e32b9741cdfe4a586f6e23b956d7a127ddedaa88db4aa67bd5b0047006873e87
+DIST thunderbird-11.0-nl.xpi 407421 RMD160 ad7519f46b5571f4932fa382d88854f78a790659 SHA1 81388728f91bb3ca5ae4df42e36f0c5e35257f76 SHA256 4bda863bb5b79979fc1bcc8dc75ad0b2b4b29632b13bc27e1a42e2a80bc8d99d
+DIST thunderbird-11.0-nn-NO.xpi 408835 RMD160 ff29c4743a7d42b28742a54559fa8eaccc0e98b1 SHA1 47fb893364ffe517898142a5c0e1187eb4c23fd0 SHA256 629623760abf73ab4bd5272d089ab08517618db316667247393663d47f9323ed
+DIST thunderbird-11.0-pa-IN.xpi 449835 RMD160 fa08b044c7346d9c3325e0b7efa037dade44d46d SHA1 3d9dc04ddc75f3ed139a0575b645649231ab723d SHA256 1e3f58ce18fc8506409d76b01d2388a9933494518660130db4c9343c17462f63
+DIST thunderbird-11.0-pl.xpi 393412 RMD160 947f65b7359b06c0ea48f9698a297fe8f1ad9cbd SHA1 d26e2021c55f48b913a531d9c350004dac6b6ac3 SHA256 d530bb9a048f71f48f9be322a52dc5f35ba4c233eccfaf31f60ea2f66a48bb14
+DIST thunderbird-11.0-pt-BR.xpi 416624 RMD160 823e1c5b135fe9a80b353a768c61eed17632ebd5 SHA1 bacfeda2285ec61fb27b3093e31a3aab64ac6380 SHA256 078221b6da7fc79bc39a7ade1d31eda6435d0bcc9f8d4ef7033b5df489b69214
+DIST thunderbird-11.0-pt-PT.xpi 413732 RMD160 1cb77d7fc69d764375bde2e18fe5b3e73d8f4ede SHA1 566f2faf12c7fff3edde422506db76928f2ec311 SHA256 a604e5e7f77b209d1af01c74649f6a8390f9e61a7986312659cad5d08646c6be
+DIST thunderbird-11.0-rm.xpi 414161 RMD160 b6483897e495e35405c0cd6fa6ee9627eddb5480 SHA1 be9535beff1077f1a3dd1a6ef9c168cd48095dd4 SHA256 9662fec1b1e58eff143d61ef91a1706763373723661c48efad9e1c2972607147
+DIST thunderbird-11.0-ro.xpi 440982 RMD160 af752cdf99a9021cbe0a6e4344eae2b5ff5afbf9 SHA1 eac57b8d40ea914fc6fa97d2f5fb18f4e95f0ec8 SHA256 3441413eab60679c406a2436642c15a605cb9f2a0d6f76ae0fac7e792ba544af
+DIST thunderbird-11.0-ru.xpi 411328 RMD160 e876cf149361b6865442dc45fa6c550c3f208f57 SHA1 3b9c9414aa53940f3669054f00aa9ac558ca6c78 SHA256 abd06f0beb71a45603ef4321ed4a7393410e047c52c713a63cf1a654ffe147eb
+DIST thunderbird-11.0-si.xpi 456006 RMD160 edfe042aed07941ae57bfd0a172953722bb1fdf2 SHA1 0b49ef216ab2831c501955ea5a61144f3959d1ff SHA256 afd28b8ca86b7b8fd3796b68932ee5f68aa803916af47633418b5f5385f66123
+DIST thunderbird-11.0-sk.xpi 424698 RMD160 d0fce6d8643d9d187b19e9dd54c70acabc93763a SHA1 79f61b0e372bd704de37838dd2e086c1b314a0b9 SHA256 46caacfc76e96f814251c801cc117d1a43766369e2520c211607fe6fbe13b935
+DIST thunderbird-11.0-sl.xpi 409944 RMD160 f19e96de7a8c6e26d3bbf0baf7a5bbbf5782e173 SHA1 9f46b1372717cced0d18230b55b557ed0ddb5441 SHA256 efa367daf15a1d3352629cc656f006412b50c52c4a1f497150addc76197f2c82
+DIST thunderbird-11.0-sq.xpi 360001 RMD160 266fb642fd16c00ea29c84a6b8fe91853a53b160 SHA1 6b6b0864ccd1e81e02ffe9c65f039314d027c0c7 SHA256 94b7dd81af38e3043e73cb56b821d3df586cad3c2c58a906f4868e72be12e8fe
+DIST thunderbird-11.0-sr.xpi 459911 RMD160 992056b0adab5d7360721d600e781569cd6eb8d2 SHA1 7d7056996fb7358c2d27733f52b1d9256b17a8a2 SHA256 e0c4e1a7d76984364228b253ab1369e4027fd9cd2707a2a99f1d07482afe1186
+DIST thunderbird-11.0-sv-SE.xpi 477713 RMD160 3525b8cf9f23b756f31a1b2714aee3b03f9551f3 SHA1 d04b768c4c3816f35deb25b81e14fe69934530bd SHA256 7a9a0f7df6a0addabdedd775c69b7296865ac62824cdf53ab33bdd3e1bc6addd
+DIST thunderbird-11.0-ta-LK.xpi 475122 RMD160 33c71f3d7c4aca8d09183a1dfddb6dfe6c32972f SHA1 2b6a895f1d34eda7508d8b536ec109ff60d5dd99 SHA256 c0870ffd0cdb7e4e61c73362bd04ea39816d89213e2a32b81f7338fef44fc5f4
+DIST thunderbird-11.0-tr.xpi 417468 RMD160 de0780f6233b70c32d72ab1e0f2aa7d7f0899200 SHA1 f0a6ed1113617b40f9c29adeb1596a74bf80b2a8 SHA256 87436b9d99af437e4641ad7a72b866c96e727cdef7b8bc560f6526c73c52d1cb
+DIST thunderbird-11.0-uk.xpi 463179 RMD160 1a971de1d45154a574075de20a6b3539ad0c5d26 SHA1 390c267f9005fa138ef708363fc5b57b5d2097fa SHA256 3794a9203aaf0d0d8560af4ca6660cd161813d1b9f419f6ca6f94bc888bffbd6
+DIST thunderbird-11.0-vi.xpi 435640 RMD160 54b5466ca62e25e273d100774d0ed382dc4e0e41 SHA1 3cd08c0d97e3fc70dbc4865a3c4017abf1ca5a81 SHA256 ed912bd2adb9111c3e0150077725edd230af95a601c50f508ed4445bb441646b
+DIST thunderbird-11.0-zh-CN.xpi 430646 RMD160 f81ba574d57ce22140e1c7a197d3df7a5e837017 SHA1 261459cf085f6149cfeee62ff07213d06e0a8e88 SHA256 cd6a889da84b559acc37022b8bedef92f4ed8a0264a785596738094363b7ff1b
+DIST thunderbird-11.0-zh-TW.xpi 431214 RMD160 c2c31a828342cce399c008cb0128f7d476952846 SHA1 0be122d14cd4cdfb33d4564141b69772d37bccba SHA256 38341b2457744a81a6d31fb727e8d47bee58aca594e27a5d645fadddc76706af
 DIST thunderbird-bin_i686-10.0.2.tar.bz2 18549327 RMD160 81eccac4baf6344380360f450226ba1cc4c4d1fa SHA1 0e7cdf0e8b73029474ec6b0ce98a98997e42491d SHA256 06abdafed6e6a5f1bbb7de90ed7fb6498d9b2c0a4a9c1c84a6f326ea606f3d5a
+DIST thunderbird-bin_i686-11.0.tar.bz2 18761612 RMD160 a1e5767f33d82b577b2556d7849154d26b07c51c SHA1 a926e70af1633f3ded54e9ebed3862f0a2d51bf9 SHA256 7251edac496ac0a456c92c97c57e4e235c19b5cbbb489f78eb0c60b194188f47
 DIST thunderbird-bin_x86_64-10.0.2.tar.bz2 21461716 RMD160 fdaeea491e4d74d48d384fb98be2794e9dad6585 SHA1 d1661b63a2e6c4d774e004b823e4ed035b36ec11 SHA256 bf3fb051064bb66980e2e63b871f09cf12dcff99c0401b046dbbf03a0d0ea48a
+DIST thunderbird-bin_x86_64-11.0.tar.bz2 21730134 RMD160 fc2ad5e0abbe5d53f6461899d37161af58c3d2f4 SHA1 0688e1b04d0f59f7115b270a453ccaef5c16daa0 SHA256 1924bdd7ee812cbd4d4587c020a083c23f7182c045489627f99baa5140801f06
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-11.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-11.0.ebuild
new file mode 100644
index 000000000000..80427990df23
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-11.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-11.0.ebuild,v 1.1 2012/03/14 08:36:47 jdhore Exp $
+
+EAPI="4"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
+fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
+pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip mirror binchecks"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+crashreporter"
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/freedesktop-icon-theme
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
+	crashreporter? ( net-misc/curl ) "
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/icon/${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild
index 4519243e94a9..a96cdac92762 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild,v 1.5 2012/01/19 12:32:36 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.7.0.ebuild,v 1.6 2012/03/14 09:33:57 eras Exp $
 
 EAPI=4
 
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
 	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp[perl] )
 	spamassassin? ( mail-filter/spamassassin )"
 
 AMAVIS_ROOT="/var/amavis"
diff --git a/mail-mta/postfix/postfix-2.9.1-r1.ebuild b/mail-mta/postfix/postfix-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..1e46196c3b2e
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.9.1-r1.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.1-r1.ebuild,v 1.1 2012/03/14 10:52:50 eras Exp $
+
+EAPI=4
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.8.8"
+VDA_P="${PN}-vda-v10-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2 )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	selinux? ( sec-policy/selinux-postfix )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward"
+
+# vda patch is broken in 2.9
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+	!vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	if ! use berkdb; then
+		epatch "${FILESDIR}/${PN}_no-berkdb.patch"
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		mylibs="${mylibs} $(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		mylibs="${mylibs} -lsqlite3"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
+			src/util/sys_defs.h || die "sed failed"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		CDB_LIBS=""
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+			done
+		fi
+		mylibs="${mylibs} ${CDB_LIBS}"
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		html_directory="/usr/share/doc/${PF}/html" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+}
+
+pkg_preinst() {
+	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
+	# check inet_protocols setting in main.cf and modify if necessary to prevent
+	# performance loss with useless DNS lookups and useless connection attempts.
+	[[ -d ${ROOT}/etc/postfix ]] && {
+	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
+		then
+			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+			ewarn "That will keep the same behaviour as previous postfix versions."
+			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+		else
+			# delete inet_protocols setting. there is already one in /etc/postfix
+			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+		fi
+	fi
+	}
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 9 ]]; then
+		elog "If you are using old style postfix instances by symlinking"
+		elog "startup scripts in ${ROOT}etc/init.d, please consider"
+		elog "upgrading your config for postmulti support. For more info:"
+		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+		if ! use berkdb; then
+			ewarn "\nPostfix is installed without BerkeleyDB support."
+			ewarn "Please turn on berkdb USE flag for hash or btree table"
+			ewarn "lookup support.\n"
+		fi
+		ewarn "Postfix daemons now live under /usr/libexec/postfix"
+		ewarn "Please adjust your main.cf accordingly by running"
+		ewarn "etc-update/dispatch-conf or similar and accepting the new"
+		ewarn "daemon_directory setting."
+	fi
+}
diff --git a/media-video/imagination/imagination-3.0-r1.ebuild b/media-video/imagination/imagination-3.0-r1.ebuild
index 8261edc63e27..bf27c7dc6f1d 100644
--- a/media-video/imagination/imagination-3.0-r1.ebuild
+++ b/media-video/imagination/imagination-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/imagination-3.0-r1.ebuild,v 1.1 2011/08/27 08:56:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/imagination-3.0-r1.ebuild,v 1.2 2012/03/14 08:41:06 hwoarang Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR
 linguas_sv linguas_zh_CN linguas_zh_TW"
 
diff --git a/media-video/imagination/imagination-3.0.ebuild b/media-video/imagination/imagination-3.0.ebuild
index 6f6600f0cbfe..f46cc5873f0f 100644
--- a/media-video/imagination/imagination-3.0.ebuild
+++ b/media-video/imagination/imagination-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/imagination-3.0.ebuild,v 1.1 2011/06/23 09:00:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/imagination/imagination-3.0.ebuild,v 1.2 2012/03/14 08:41:06 hwoarang Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR
 linguas_sv linguas_zh_CN linguas_zh_TW"
 
diff --git a/metadata/cache/app-emulation/emul-linux-x86-medialibs-20110928 b/metadata/cache/app-emulation/emul-linux-x86-medialibs-20110928
index dd7c39265c19..94d48f4e2b2f 100644
--- a/metadata/cache/app-emulation/emul-linux-x86-medialibs-20110928
+++ b/metadata/cache/app-emulation/emul-linux-x86-medialibs-20110928
@@ -1,5 +1,5 @@
 >=sys-apps/findutils-4.2.26
-~app-emulation/emul-linux-x86-baselibs-20110928 ~app-emulation/emul-linux-x86-xlibs-20110928 !<=app-emulation/emul-linux-x86-sdl-20081109
+~app-emulation/emul-linux-x86-baselibs-20110928 ~app-emulation/emul-linux-x86-xlibs-20110928 !<=app-emulation/emul-linux-x86-sdl-20081109 !<=app-emulation/emul-linux-x86-soundlibs-20110101
 0
 http://dev.gentoo.org/~pacho/emul/emul-linux-x86-medialibs-20110928.tar.xz
 strip
diff --git a/metadata/cache/app-emulation/emul-linux-x86-medialibs-20120127 b/metadata/cache/app-emulation/emul-linux-x86-medialibs-20120127
index 9af5601ee975..d0bdc664c617 100644
--- a/metadata/cache/app-emulation/emul-linux-x86-medialibs-20120127
+++ b/metadata/cache/app-emulation/emul-linux-x86-medialibs-20120127
@@ -1,5 +1,5 @@
 >=sys-apps/findutils-4.2.26
-~app-emulation/emul-linux-x86-baselibs-20120127 ~app-emulation/emul-linux-x86-xlibs-20120127 ~app-emulation/emul-linux-x86-db-20120127 !<=app-emulation/emul-linux-x86-sdl-20081109
+~app-emulation/emul-linux-x86-baselibs-20120127 ~app-emulation/emul-linux-x86-xlibs-20120127 ~app-emulation/emul-linux-x86-db-20120127 !<=app-emulation/emul-linux-x86-sdl-20081109 !<=app-emulation/emul-linux-x86-soundlibs-20110101
 0
 http://dev.gentoo.org/~pacho/emul/emul-linux-x86-medialibs-20120127.tar.xz
 strip
diff --git a/metadata/cache/app-misc/sphinx-2.0.2_beta b/metadata/cache/app-misc/sphinx-2.0.2_beta
deleted file mode 100644
index 129789962dc6..000000000000
--- a/metadata/cache/app-misc/sphinx-2.0.2_beta
+++ /dev/null
@@ -1,22 +0,0 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
-0
-http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-
-http://www.sphinxsearch.com/
-GPL-2
-Full-text search engine with support for MySQL and PostgreSQL
-~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-autotools eutils libtool multilib toolchain-funcs user
-debug id64 mysql odbc postgres stemmer test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-misc/sphinx-2.0.1_beta b/metadata/cache/app-misc/sphinx-2.0.4
similarity index 84%
rename from metadata/cache/app-misc/sphinx-2.0.1_beta
rename to metadata/cache/app-misc/sphinx-2.0.4
index 007058092266..3718cf1a738f 100644
--- a/metadata/cache/app-misc/sphinx-2.0.1_beta
+++ b/metadata/cache/app-misc/sphinx-2.0.4
@@ -1,7 +1,7 @@
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 0
-http://sphinxsearch.com/files/sphinx-2.0.1-beta.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
+http://sphinxsearch.com/files/sphinx-2.0.4-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
 
 http://www.sphinxsearch.com/
 GPL-2
@@ -12,7 +12,7 @@ debug id64 mysql odbc postgres stemmer test
 
 
 
-3
+4
 
 compile configure install prepare test unpack
 
diff --git a/metadata/cache/app-text/texi2html-5.0 b/metadata/cache/app-text/texi2html-5.0
new file mode 100644
index 000000000000..373c6369f875
--- /dev/null
+++ b/metadata/cache/app-text/texi2html-5.0
@@ -0,0 +1,22 @@
+>=dev-lang/perl-5.10.1 dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode )
+>=dev-lang/perl-5.10.1 dev-perl/libintl-perl unicode? ( dev-perl/Text-Unidecode )
+0
+mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
+
+http://www.nongnu.org/texi2html/
+CCPL-ShareAlike-1.0 FDL-1.3 GPL-2
+Perl script that converts Texinfo to HTML
+~amd64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+
+unicode
+
+
+
+4
+
+configure install preinst
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Text-Unidecode-0.40.0 b/metadata/cache/dev-perl/Text-Unidecode-0.40.0
index b0cdecea799b..28d74df3c797 100644
--- a/metadata/cache/dev-perl/Text-Unidecode-0.40.0
+++ b/metadata/cache/dev-perl/Text-Unidecode-0.40.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-0.04.tar.gz
 http://search.cpan.org/dist/Text-Unidecode/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 US-ASCII transliterations of Unicode text
-amd64 x86 ~x86-solaris
+amd64 ~ppc ~ppc64 x86 ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-php/awl-0.51 b/metadata/cache/dev-php/awl-0.51
new file mode 100644
index 000000000000..d7d3e5dbd2c1
--- /dev/null
+++ b/metadata/cache/dev-php/awl-0.51
@@ -0,0 +1,22 @@
+dev-lang/php[pdo,postgres,xml] doc? ( dev-php/PEAR-PhpDocumentor ) =dev-lang/php-5* dev-lang/php
+dev-lang/php[pdo,postgres,xml] doc? ( dev-php/PEAR-PhpDocumentor ) =dev-lang/php-5* dev-lang/php
+0
+http://debian.mcmillan.net.nz/packages/awl/awl-0.51.tar.gz
+
+http://andrew.mcmillan.net.nz/projects/awl
+GPL-2
+Andrew McMillan's web libraries: A collection of generic classes used by the davical calendar server
+~amd64 ~x86
+depend.php eutils multilib php-lib-r1 phpconfutils toolchain-funcs user
+doc
+
+
+
+2
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/dev-python/rtf2xml-1.33 b/metadata/cache/dev-python/rtf2xml-1.33
new file mode 100644
index 000000000000..2e6e339e8def
--- /dev/null
+++ b/metadata/cache/dev-python/rtf2xml-1.33
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://sourceforge/rtf2xml/rtf2xml-1.33.tar.gz
+
+http://rtf2xml.sourceforge.net/
+GPL-2
+Converts a Microsoft RTF file to structured XML
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+3
+
+compile install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-util/egypt-1.9 b/metadata/cache/dev-util/egypt-1.9
new file mode 100644
index 000000000000..70d8117bd99f
--- /dev/null
+++ b/metadata/cache/dev-util/egypt-1.9
@@ -0,0 +1,22 @@
+
+
+0
+http://www.gson.org/egypt/download/egypt-1.9.tar.gz
+
+http://www.gson.org/egypt/
+as-is
+devilishly simple tool for creating call graphs of C programs
+~amd64 ~x86
+base eutils multilib perl-app perl-module toolchain-funcs user
+
+
+
+
+
+
+compile install postinst postrm preinst prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/osdt-1.1.3 b/metadata/cache/dev-util/osdt-1.1.3
new file mode 100644
index 000000000000..18815eecdfe4
--- /dev/null
+++ b/metadata/cache/dev-util/osdt-1.1.3
@@ -0,0 +1,22 @@
+
+>=dev-lang/perl-5 dev-perl/XML-Simple sys-devel/m4
+0
+mirror://sourceforge/osdt/osdt-1.1.3.tbz2
+
+http://sourceforge.net/projects/osdt/
+BSD
+tools for Open Source software distribution
+~x86 ~amd64
+
+
+
+
+
+
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/games-util/pyfa-1.1.1 b/metadata/cache/games-util/pyfa-1.1.3
similarity index 92%
rename from metadata/cache/games-util/pyfa-1.1.1
rename to metadata/cache/games-util/pyfa-1.1.3
index 1c2b36f8ccfc..67b6df2ca265 100644
--- a/metadata/cache/games-util/pyfa-1.1.1
+++ b/metadata/cache/games-util/pyfa-1.1.3
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
 dev-python/sqlalchemy >=dev-python/wxpython-2.8 graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
 0
-http://dl.evefit.org/stable/1.1.1/pyfa-1.1.1-crucible-src.tar.bz2
+http://dl.evefit.org/stable/1.1.3/pyfa-1.1.3-crucible-src.tar.bz2
 
 http://www.evefit.org/Pyfa
 GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm
diff --git a/metadata/cache/gnome-extra/gnome-screensaver-3.2.0 b/metadata/cache/gnome-extra/gnome-screensaver-3.2.2
similarity index 73%
rename from metadata/cache/gnome-extra/gnome-screensaver-3.2.0
rename to metadata/cache/gnome-extra/gnome-screensaver-3.2.2
index a6710ed21634..7ad054f8b1f7 100644
--- a/metadata/cache/gnome-extra/gnome-screensaver-3.2.0
+++ b/metadata/cache/gnome-extra/gnome-screensaver-3.2.2
@@ -1,14 +1,14 @@
->=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-desktop-3.1.91:3 >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/gnome-icon-theme-symbolic pam? ( virtual/pam ) >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 sys-devel/gettext doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.1.2 ~app-text/docbook-xml-dtd-4.4 ) x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto app-arch/xz-utils >=sys-apps/sed-4
->=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-desktop-3.1.91:3 >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/gnome-icon-theme-symbolic pam? ( virtual/pam )
+>=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-desktop-3.1.91:3 >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/gnome-icon-theme-symbolic pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31 ) >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 sys-devel/gettext doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.1.2 ~app-text/docbook-xml-dtd-4.4 ) x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-desktop-3.1.91:3 >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/gnome-icon-theme-symbolic pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31 )
 0
-mirror://gnome/sources/gnome-screensaver/3.2/gnome-screensaver-3.2.0.tar.xz
+mirror://gnome/sources/gnome-screensaver/3.2/gnome-screensaver-3.2.2.tar.xz
 
 http://live.gnome.org/GnomeScreensaver
 GPL-2
 Replaces xscreensaver, integrating with the desktop.
 ~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
-debug doc pam debug
+debug doc pam systemd debug
 
 
 
diff --git a/metadata/cache/mail-client/thunderbird-bin-11.0 b/metadata/cache/mail-client/thunderbird-bin-11.0
new file mode 100644
index 000000000000..1d748760294f
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-bin-11.0
@@ -0,0 +1,22 @@
+app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+virtual/freedesktop-icon-theme x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 >=media-libs/alsa-lib-1.0.16 crashreporter? ( net-misc/curl )
+0
+linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ar.xpi -> thunderbird-11.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ast.xpi -> thunderbird-11.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/be.xpi -> thunderbird-11.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/bg.xpi -> thunderbird-11.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-11.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/br.xpi -> thunderbird-11.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ca.xpi -> thunderbird-11.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/cs.xpi -> thunderbird-11.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/da.xpi -> thunderbird-11.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/de.xpi -> thunderbird-11.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/el.xpi -> thunderbird-11.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/en-GB.xpi -> thunderbird-11.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/es-AR.xpi -> thunderbird-11.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/es-ES.xpi -> thunderbird-11.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/et.xpi -> thunderbird-11.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/eu.xpi -> thunderbird-11.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/fi.xpi -> thunderbird-11.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/fr.xpi -> thunderbird-11.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-11.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-11.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/gd.xpi -> thunderbird-11.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/gl.xpi -> thunderbird-11.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/he.xpi -> thunderbird-11.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/hu.xpi -> thunderbird-11.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/id.xpi -> thunderbird-11.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/is.xpi -> thunderbird-11.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/it.xpi -> thunderbird-11.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ja.xpi -> thunderbird-11.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ko.xpi -> thunderbird-11.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/lt.xpi -> thunderbird-11.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-11.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/nl.xpi -> thunderbird-11.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-11.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-11.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/pl.xpi -> thunderbird-11.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-11.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-11.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/rm.xpi -> thunderbird-11.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ro.xpi -> thunderbird-11.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ru.xpi -> thunderbird-11.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/si.xpi -> thunderbird-11.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/sk.xpi -> thunderbird-11.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/sl.xpi -> thunderbird-11.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/sq.xpi -> thunderbird-11.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/sr.xpi -> thunderbird-11.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-11.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-11.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/tr.xpi -> thunderbird-11.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/uk.xpi -> thunderbird-11.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/vi.xpi -> thunderbird-11.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-11.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-11.0-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-x86_64/en-US/thunderbird-11.0.tar.bz2 -> thunderbird-bin_x86_64-11.0.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//11.0/linux-i686/en-US/thunderbird-11.0.tar.bz2 -> thunderbird-bin_i686-11.0.tar.bz2 )
+strip mirror binchecks
+http://www.mozilla.com/thunderbird
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Thunderbird Mail Client
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
++crashreporter linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
+
+
+
+4
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-filter/amavisd-new-2.7.0 b/metadata/cache/mail-filter/amavisd-new-2.7.0
index 6292f757dcec..eea7f0bf4f3b 100644
--- a/metadata/cache/mail-filter/amavisd-new-2.7.0
+++ b/metadata/cache/mail-filter/amavisd-new-2.7.0
@@ -1,5 +1,5 @@
 >=sys-apps/sed-4 >=dev-lang/perl-5.8.2
->=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/ncompress app-arch/pax app-arch/unarj app-arch/xz-utils || ( app-arch/unrar app-arch/rar ) app-arch/zoo >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp ) spamassassin? ( mail-filter/spamassassin )
+>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/ncompress app-arch/pax app-arch/unarj app-arch/xz-utils || ( app-arch/unrar app-arch/rar ) app-arch/zoo >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin )
 0
 http://www.ijs.si/software/amavisd/amavisd-new-2.7.0.tar.gz
 
diff --git a/metadata/cache/mail-mta/postfix-2.9.1-r1 b/metadata/cache/mail-mta/postfix-2.9.1-r1
new file mode 100644
index 000000000000..28acf9213739
--- /dev/null
+++ b/metadata/cache/mail-mta/postfix-2.9.1-r1
@@ -0,0 +1,22 @@
+>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
+>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
+0
+ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.8.patch )
+
+http://www.postfix.org/
+IBM
+A fast and secure drop-in replacement for sendmail.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib pam ssl-cert toolchain-funcs user versionator
++berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
+ldap-bind? ( ldap sasl ) !vda
+
+
+4
+
+configure install postinst preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-video/imagination-3.0 b/metadata/cache/media-video/imagination-3.0
index c62ddbed08d9..27284f125f36 100644
--- a/metadata/cache/media-video/imagination-3.0
+++ b/metadata/cache/media-video/imagination-3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
 http://imagination.sourceforge.net/
 GPL-2
 Simple DVD slideshow maker
-~amd64
+~amd64 ~x86
 autotools eutils libtool multilib toolchain-funcs user
 linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR linguas_sv linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/media-video/imagination-3.0-r1 b/metadata/cache/media-video/imagination-3.0-r1
index c62ddbed08d9..27284f125f36 100644
--- a/metadata/cache/media-video/imagination-3.0-r1
+++ b/metadata/cache/media-video/imagination-3.0-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
 http://imagination.sourceforge.net/
 GPL-2
 Simple DVD slideshow maker
-~amd64
+~amd64 ~x86
 autotools eutils libtool multilib toolchain-funcs user
 linguas_cs linguas_de linguas_en_GB linguas_fr linguas_it linguas_pt_BR linguas_sv linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/sci-libs/scotch-5.1.12b b/metadata/cache/sci-libs/scotch-5.1.12b
new file mode 100644
index 000000000000..310918e1e4ea
--- /dev/null
+++ b/metadata/cache/sci-libs/scotch-5.1.12b
@@ -0,0 +1,22 @@
+sys-libs/zlib mpi? ( virtual/mpi )
+sys-libs/zlib mpi? ( virtual/mpi )
+0
+http://dev.gentooexperimental.org/~patrick/scotch_5.1.12b_esmumps.tar.gz
+
+http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/
+CeCILL-2
+Software for graph, mesh and hypergraph partitioning
+~amd64 ~x86
+eutils flag-o-matic multilib toolchain-funcs user versionator
+doc examples int64 mpi static-libs tools
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/ipmiutil-2.7.7 b/metadata/cache/sys-apps/ipmiutil-2.7.7
index fdcab2431d8d..54bbfc958c5a 100644
--- a/metadata/cache/sys-apps/ipmiutil-2.7.7
+++ b/metadata/cache/sys-apps/ipmiutil-2.7.7
@@ -1,5 +1,5 @@
-dev-libs/openssl virtual/os-headers || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/openssl
+dev-libs/openssl:0 virtual/os-headers || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl:0
 0
 mirror://sourceforge/ipmiutil/ipmiutil-2.7.7.tar.gz
 
@@ -12,7 +12,7 @@ autotools eutils libtool multilib toolchain-funcs user
 
 
 
-2
+4
 
 install prepare
 
diff --git a/metadata/cache/sys-apps/ipmiutil-2.8.2 b/metadata/cache/sys-apps/ipmiutil-2.8.2
new file mode 100644
index 000000000000..eb8d2e658a8c
--- /dev/null
+++ b/metadata/cache/sys-apps/ipmiutil-2.8.2
@@ -0,0 +1,22 @@
+>=dev-libs/openssl-1:0 virtual/os-headers || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/openssl-1:0
+0
+mirror://sourceforge/ipmiutil/ipmiutil-2.8.2.tar.gz
+
+http://ipmiutil.sourceforge.net/
+BSD
+IPMI Management Utilities
+~amd64 ~x86
+autotools eutils libtool multilib systemd toolchain-funcs user
+
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-block/tgt-1.0.24 b/metadata/cache/sys-block/tgt-1.0.24-r1
similarity index 100%
rename from metadata/cache/sys-block/tgt-1.0.24
rename to metadata/cache/sys-block/tgt-1.0.24-r1
diff --git a/metadata/cache/www-apps/davical-1.0.2-r1 b/metadata/cache/www-apps/davical-1.0.2-r1
new file mode 100644
index 000000000000..1080e3ab0a9f
--- /dev/null
+++ b/metadata/cache/www-apps/davical-1.0.2-r1
@@ -0,0 +1,22 @@
+doc? ( dev-php/PEAR-PhpDocumentor ) =dev-lang/php-5* || ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+app-admin/pwgen dev-lang/php[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.51 www-servers/apache =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
+1.0.2-r1
+http://debian.mcmillan.net.nz/packages/davical/davical-1.0.2.tar.gz
+
+http://davical.org/
+GPL-2
+A CalDAV and CardDAV Server
+~amd64 ~x86
+depend.php eutils multilib phpconfutils toolchain-funcs user webapp
+doc vhosts
+
+
+
+2
+
+compile install postinst prepare prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-client/firefox-bin-11.0 b/metadata/cache/www-client/firefox-bin-11.0
new file mode 100644
index 000000000000..c6ea1513d661
--- /dev/null
+++ b/metadata/cache/www-client/firefox-bin-11.0
@@ -0,0 +1,22 @@
+app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+dev-libs/dbus-glib virtual/freedesktop-icon-theme x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 >=media-libs/alsa-lib-1.0.16
+0
+linguas_af? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/af.xpi -> firefox-11.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ak.xpi -> firefox-11.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ar.xpi -> firefox-11.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/as.xpi -> firefox-11.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ast.xpi -> firefox-11.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/be.xpi -> firefox-11.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/bg.xpi -> firefox-11.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/bn-BD.xpi -> firefox-11.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/bn-IN.xpi -> firefox-11.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/br.xpi -> firefox-11.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/bs.xpi -> firefox-11.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ca.xpi -> firefox-11.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/cs.xpi -> firefox-11.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/csb.xpi -> firefox-11.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/cy.xpi -> firefox-11.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/da.xpi -> firefox-11.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/de.xpi -> firefox-11.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/el.xpi -> firefox-11.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/en-GB.xpi -> firefox-11.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/en-ZA.xpi -> firefox-11.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/eo.xpi -> firefox-11.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/es-AR.xpi -> firefox-11.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/es-CL.xpi -> firefox-11.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/es-ES.xpi -> firefox-11.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/es-MX.xpi -> firefox-11.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/et.xpi -> firefox-11.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/eu.xpi -> firefox-11.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/fa.xpi -> firefox-11.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/fi.xpi -> firefox-11.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/fr.xpi -> firefox-11.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/fy-NL.xpi -> firefox-11.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ga-IE.xpi -> firefox-11.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/gd.xpi -> firefox-11.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/gl.xpi -> firefox-11.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/gu-IN.xpi -> firefox-11.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/he.xpi -> firefox-11.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/hi-IN.xpi -> firefox-11.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/hr.xpi -> firefox-11.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/hu.xpi -> firefox-11.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/hy-AM.xpi -> firefox-11.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/id.xpi -> firefox-11.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/is.xpi -> firefox-11.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/it.xpi -> firefox-11.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ja.xpi -> firefox-11.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/kk.xpi -> firefox-11.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/kn.xpi -> firefox-11.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ko.xpi -> firefox-11.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ku.xpi -> firefox-11.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/lg.xpi -> firefox-11.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/lt.xpi -> firefox-11.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/lv.xpi -> firefox-11.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/mai.xpi -> firefox-11.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/mk.xpi -> firefox-11.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ml.xpi -> firefox-11.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/mr.xpi -> firefox-11.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/nb-NO.xpi -> firefox-11.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/nl.xpi -> firefox-11.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/nn-NO.xpi -> firefox-11.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/nso.xpi -> firefox-11.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/or.xpi -> firefox-11.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/pa-IN.xpi -> firefox-11.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/pl.xpi -> firefox-11.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/pt-BR.xpi -> firefox-11.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/pt-PT.xpi -> firefox-11.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/rm.xpi -> firefox-11.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ro.xpi -> firefox-11.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ru.xpi -> firefox-11.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/si.xpi -> firefox-11.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/sk.xpi -> firefox-11.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/sl.xpi -> firefox-11.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/son.xpi -> firefox-11.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/sq.xpi -> firefox-11.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/sr.xpi -> firefox-11.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/sv-SE.xpi -> firefox-11.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ta.xpi -> firefox-11.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/ta-LK.xpi -> firefox-11.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/te.xpi -> firefox-11.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/th.xpi -> firefox-11.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/tr.xpi -> firefox-11.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/uk.xpi -> firefox-11.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/vi.xpi -> firefox-11.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/zh-CN.xpi -> firefox-11.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/zh-TW.xpi -> firefox-11.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//11.0/linux-i686/xpi/zu.xpi -> firefox-11.0-zu.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-x86_64/en-US/firefox-11.0.tar.bz2 -> firefox-bin_x86_64-11.0.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-i686/en-US/firefox-11.0.tar.bz2 -> firefox-bin_i686-11.0.tar.bz2 )
+strip mirror binchecks
+http://www.mozilla.com/firefox
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Firefox Web Browser
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
+startup-notification linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/seamonkey-2.0.14-r1 b/metadata/cache/www-client/seamonkey-2.0.14-r1
index afd4873a1e94..a5f0da8e12b9 100644
--- a/metadata/cache/www-client/seamonkey-2.0.14-r1
+++ b/metadata/cache/www-client/seamonkey-2.0.14-r1
@@ -6,7 +6,7 @@ http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/source/sea
 http://www.seamonkey-project.org
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Seamonkey Web Browser
-alpha arm ia64 ppc ppc64 sparc
+alpha arm ia64 ppc64 sparc
 autotools eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib python toolchain-funcs user versionator
 +alsa +chatzilla +composer +crypt gnome java ldap +mailclient +roaming system-sqlite linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_ka linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_pl linguas_pt_PT linguas_pt linguas_ru linguas_sk linguas_sv_SE linguas_sv linguas_tr linguas_zh_CN linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi elibc_FreeBSD java
 
diff --git a/metadata/cache/www-client/seamonkey-2.4.1-r1 b/metadata/cache/www-client/seamonkey-2.4.1-r1
index e4cb33aaa63a..a6a80d621c0c 100644
--- a/metadata/cache/www-client/seamonkey-2.4.1-r1
+++ b/metadata/cache/www-client/seamonkey-2.4.1-r1
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/source/seamonkey-2.4.1.source
 http://www.seamonkey-project.org
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Seamonkey Web Browser
-~alpha amd64 ~arm ppc x86
+ppc
 autotools eutils fdo-mime flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib python toolchain-funcs user
 +alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm linguas_be linguas_ca linguas_cs linguas_de linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es_ES linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_pl linguas_pt_PT linguas_pt linguas_ru linguas_sk linguas_sv_SE linguas_sv linguas_tr linguas_zh_CN linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
 
diff --git a/metadata/cache/www-client/seamonkey-2.6.1 b/metadata/cache/www-client/seamonkey-2.6.1
deleted file mode 100644
index de9df9164d1b..000000000000
--- a/metadata/cache/www-client/seamonkey-2.6.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
-0
-ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/source/seamonkey-2.6.1.source.tar.bz2 -> seamonkey-2.6.1.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.6.1-patches-01.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.4.tar.gz ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.be.langpack.xpi -> seamonkey-2.6.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.ca.langpack.xpi -> seamonkey-2.6.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.cs.langpack.xpi -> seamonkey-2.6.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.de.langpack.xpi -> seamonkey-2.6.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.en-GB.langpack.xpi -> seamonkey-2.6.1-en-GB.xpi ) linguas_en_US? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.en-US.langpack.xpi -> seamonkey-2.6.1-en-US.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.es-AR.langpack.xpi -> seamonkey-2.6.1-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.es-AR.langpack.xpi -> seamonkey-2.6.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.es-ES.langpack.xpi -> seamonkey-2.6.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.es-ES.langpack.xpi -> seamonkey-2.6.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.fi.langpack.xpi -> seamonkey-2.6.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.fr.langpack.xpi -> seamonkey-2.6.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.gl.langpack.xpi -> seamonkey-2.6.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.hu.langpack.xpi -> seamonkey-2.6.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.it.langpack.xpi -> seamonkey-2.6.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.ja.langpack.xpi -> seamonkey-2.6.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.lt.langpack.xpi -> seamonkey-2.6.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.nb-NO.langpack.xpi -> seamonkey-2.6.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.nb-NO.langpack.xpi -> seamonkey-2.6.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.nl.langpack.xpi -> seamonkey-2.6.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.pl.langpack.xpi -> seamonkey-2.6.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.pt-PT.langpack.xpi -> seamonkey-2.6.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.pt-PT.langpack.xpi -> seamonkey-2.6.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.ru.langpack.xpi -> seamonkey-2.6.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.sk.langpack.xpi -> seamonkey-2.6.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.sv-SE.langpack.xpi -> seamonkey-2.6.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.sv-SE.langpack.xpi -> seamonkey-2.6.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.tr.langpack.xpi -> seamonkey-2.6.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.zh-CN.langpack.xpi -> seamonkey-2.6.1-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.6.1/langpack/seamonkey-2.6.1.zh-CN.langpack.xpi -> seamonkey-2.6.1-zh-CN.xpi )
-
-http://www.seamonkey-project.org
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Seamonkey Web Browser
-~alpha amd64 ~arm ~ppc x86
-autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils python toolchain-funcs user versionator
-+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm linguas_be linguas_ca linguas_cs linguas_de linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_pl linguas_pt_PT linguas_pt linguas_ru linguas_sk linguas_sv_SE linguas_sv linguas_tr linguas_zh_CN linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-
-
-
-3
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/seamonkey-2.7 b/metadata/cache/www-client/seamonkey-2.7
deleted file mode 100644
index 1d3e9a1dfc4c..000000000000
--- a/metadata/cache/www-client/seamonkey-2.7
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
-0
-linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.be.langpack.xpi -> seamonkey-2.7-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ca.langpack.xpi -> seamonkey-2.7-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.cs.langpack.xpi -> seamonkey-2.7-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.de.langpack.xpi -> seamonkey-2.7-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.en-GB.langpack.xpi -> seamonkey-2.7-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.es-AR.langpack.xpi -> seamonkey-2.7-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.es-ES.langpack.xpi -> seamonkey-2.7-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.fi.langpack.xpi -> seamonkey-2.7-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.fr.langpack.xpi -> seamonkey-2.7-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.gl.langpack.xpi -> seamonkey-2.7-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.hu.langpack.xpi -> seamonkey-2.7-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.it.langpack.xpi -> seamonkey-2.7-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ja.langpack.xpi -> seamonkey-2.7-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.lt.langpack.xpi -> seamonkey-2.7-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.nb-NO.langpack.xpi -> seamonkey-2.7-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.nl.langpack.xpi -> seamonkey-2.7-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.pl.langpack.xpi -> seamonkey-2.7-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.pt-PT.langpack.xpi -> seamonkey-2.7-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ru.langpack.xpi -> seamonkey-2.7-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.sk.langpack.xpi -> seamonkey-2.7-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.sv-SE.langpack.xpi -> seamonkey-2.7-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.tr.langpack.xpi -> seamonkey-2.7-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.zh-CN.langpack.xpi -> seamonkey-2.7-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.be.langpack.xpi -> seamonkey-2.7-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ca.langpack.xpi -> seamonkey-2.7-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.cs.langpack.xpi -> seamonkey-2.7-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.de.langpack.xpi -> seamonkey-2.7-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.en-GB.langpack.xpi -> seamonkey-2.7-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.es-AR.langpack.xpi -> seamonkey-2.7-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.es-ES.langpack.xpi -> seamonkey-2.7-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.fi.langpack.xpi -> seamonkey-2.7-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.fr.langpack.xpi -> seamonkey-2.7-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.gl.langpack.xpi -> seamonkey-2.7-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.hu.langpack.xpi -> seamonkey-2.7-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.it.langpack.xpi -> seamonkey-2.7-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ja.langpack.xpi -> seamonkey-2.7-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.lt.langpack.xpi -> seamonkey-2.7-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.nb-NO.langpack.xpi -> seamonkey-2.7-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.nl.langpack.xpi -> seamonkey-2.7-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.pl.langpack.xpi -> seamonkey-2.7-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.pt-PT.langpack.xpi -> seamonkey-2.7-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.ru.langpack.xpi -> seamonkey-2.7-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.sk.langpack.xpi -> seamonkey-2.7-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.sv-SE.langpack.xpi -> seamonkey-2.7-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.tr.langpack.xpi -> seamonkey-2.7-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/langpack/seamonkey-2.7.zh-CN.langpack.xpi -> seamonkey-2.7-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7/source/seamonkey-2.7.source.tar.bz2 -> seamonkey-2.7.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-02.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz )
-
-http://www.seamonkey-project.org
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Seamonkey Web Browser
-~alpha ~amd64 ~arm ~ppc ~x86
-autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
-+alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_zh_CN
-
-
-
-3
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/seamonkey-2.7.1 b/metadata/cache/www-client/seamonkey-2.7.1
index 9e0eba213e24..c123af3f903e 100644
--- a/metadata/cache/www-client/seamonkey-2.7.1
+++ b/metadata/cache/www-client/seamonkey-2.7.1
@@ -6,7 +6,7 @@ linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamon
 http://www.seamonkey-project.org
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Seamonkey Web Browser
-~alpha amd64 ~arm ~ppc ~ppc64 x86
+x86
 autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
 +alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_zh_CN
 
diff --git a/metadata/cache/www-client/seamonkey-2.8 b/metadata/cache/www-client/seamonkey-2.8
new file mode 100644
index 000000000000..e9f6861d8623
--- /dev/null
+++ b/metadata/cache/www-client/seamonkey-2.8
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
+0
+linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.be.langpack.xpi -> seamonkey-2.8-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ca.langpack.xpi -> seamonkey-2.8-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.cs.langpack.xpi -> seamonkey-2.8-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.de.langpack.xpi -> seamonkey-2.8-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.en-GB.langpack.xpi -> seamonkey-2.8-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-AR.langpack.xpi -> seamonkey-2.8-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-ES.langpack.xpi -> seamonkey-2.8-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fi.langpack.xpi -> seamonkey-2.8-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fr.langpack.xpi -> seamonkey-2.8-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.gl.langpack.xpi -> seamonkey-2.8-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.hu.langpack.xpi -> seamonkey-2.8-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.it.langpack.xpi -> seamonkey-2.8-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ja.langpack.xpi -> seamonkey-2.8-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.lt.langpack.xpi -> seamonkey-2.8-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nb-NO.langpack.xpi -> seamonkey-2.8-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nl.langpack.xpi -> seamonkey-2.8-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pl.langpack.xpi -> seamonkey-2.8-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pt-PT.langpack.xpi -> seamonkey-2.8-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ru.langpack.xpi -> seamonkey-2.8-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sk.langpack.xpi -> seamonkey-2.8-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sv-SE.langpack.xpi -> seamonkey-2.8-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.tr.langpack.xpi -> seamonkey-2.8-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.zh-CN.langpack.xpi -> seamonkey-2.8-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.be.langpack.xpi -> seamonkey-2.8-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ca.langpack.xpi -> seamonkey-2.8-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.cs.langpack.xpi -> seamonkey-2.8-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.de.langpack.xpi -> seamonkey-2.8-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.en-GB.langpack.xpi -> seamonkey-2.8-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-AR.langpack.xpi -> seamonkey-2.8-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-ES.langpack.xpi -> seamonkey-2.8-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fi.langpack.xpi -> seamonkey-2.8-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fr.langpack.xpi -> seamonkey-2.8-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.gl.langpack.xpi -> seamonkey-2.8-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.hu.langpack.xpi -> seamonkey-2.8-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.it.langpack.xpi -> seamonkey-2.8-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ja.langpack.xpi -> seamonkey-2.8-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.lt.langpack.xpi -> seamonkey-2.8-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nb-NO.langpack.xpi -> seamonkey-2.8-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nl.langpack.xpi -> seamonkey-2.8-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pl.langpack.xpi -> seamonkey-2.8-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pt-PT.langpack.xpi -> seamonkey-2.8-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ru.langpack.xpi -> seamonkey-2.8-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sk.langpack.xpi -> seamonkey-2.8-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sv-SE.langpack.xpi -> seamonkey-2.8-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.tr.langpack.xpi -> seamonkey-2.8-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.zh-CN.langpack.xpi -> seamonkey-2.8-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/source/seamonkey-2.8.source.tar.bz2 -> seamonkey-2.8.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-11.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.tar.gz )
+
+http://www.seamonkey-project.org
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Seamonkey Web Browser
+~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
++alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_zh_CN
+
+
+
+3
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/seamonkey-bin-2.8 b/metadata/cache/www-client/seamonkey-bin-2.8
new file mode 100644
index 000000000000..15da658ce4f9
--- /dev/null
+++ b/metadata/cache/www-client/seamonkey-bin-2.8
@@ -0,0 +1,22 @@
+app-arch/unzip app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+dev-libs/dbus-glib >=media-libs/alsa-lib-1.0.16 virtual/freedesktop-icon-theme >=x11-libs/gtk+-2.10:2 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu
+0
+linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.be.langpack.xpi -> seamonkey-2.8-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.ca.langpack.xpi -> seamonkey-2.8-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.cs.langpack.xpi -> seamonkey-2.8-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.de.langpack.xpi -> seamonkey-2.8-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.en-GB.langpack.xpi -> seamonkey-2.8-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.es-AR.langpack.xpi -> seamonkey-2.8-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.es-ES.langpack.xpi -> seamonkey-2.8-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.fi.langpack.xpi -> seamonkey-2.8-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.fr.langpack.xpi -> seamonkey-2.8-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.gl.langpack.xpi -> seamonkey-2.8-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.hu.langpack.xpi -> seamonkey-2.8-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.it.langpack.xpi -> seamonkey-2.8-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.ja.langpack.xpi -> seamonkey-2.8-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.lt.langpack.xpi -> seamonkey-2.8-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.nb-NO.langpack.xpi -> seamonkey-2.8-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.nl.langpack.xpi -> seamonkey-2.8-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.pl.langpack.xpi -> seamonkey-2.8-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.pt-PT.langpack.xpi -> seamonkey-2.8-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.ru.langpack.xpi -> seamonkey-2.8-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.sk.langpack.xpi -> seamonkey-2.8-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.sv-SE.langpack.xpi -> seamonkey-2.8-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.tr.langpack.xpi -> seamonkey-2.8-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/langpack/seamonkey-2.8.zh-CN.langpack.xpi -> seamonkey-2.8-zh-CN.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/contrib/seamonkey-2.8.en-US.linux-x86_64.tar.bz2 -> seamonkey-bin_x86_64-2.8.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases//2.8/linux-i686/en-US/seamonkey-2.8.tar.bz2 -> seamonkey-bin_i686-2.8.tar.bz2 )
+strip mirror binchecks
+http://www.seamonkey-project.org/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Mozilla Application Suite - web browser, email, HTML editor, IRC
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
+startup-notification linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_zh_CN
+
+
+
+4
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 51c52fce6efb..d5eea04cd59a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Mar 2012 05:36:47 +0000
+Wed, 14 Mar 2012 12:06:47 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 51c52fce6efb..d5eea04cd59a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Mar 2012 05:36:47 +0000
+Wed, 14 Mar 2012 12:06:47 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7bb4fce5dea0..00707d898bd3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Mar 2012 05:36:49 +0000
+Wed, 14 Mar 2012 12:06:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3ba35b0565ba..a946731f38a1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Mar 14 05:36:47 UTC 2012
+Wed Mar 14 12:06:46 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fd2034b8fc14..5fcef3583e94 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 14 Mar 2012 06:00:01 +0000
+Wed, 14 Mar 2012 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d98c86a3f94a..2e7d5a05ef22 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1331703301 Wed Mar 14 05:35:01 2012 UTC
+1331726701 Wed Mar 14 12:05:01 2012 UTC
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8321083925db..783dfda4afea 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4611,6 +4611,8 @@ sci-libs/plplot:dynamic - Build with dynamic drivers
 sci-libs/plplot:octave - Add bindings for sci-mathematics/octave
 sci-libs/plplot:qhull - Add bindings for media-libs/qhull bindings
 sci-libs/scipy:umfpack - Adds support for sparse solving with sci-libs/umfpack
+sci-libs/scotch:int64 - Build the 64 bits integer library (needed for > 2^31 vertices)
+sci-libs/scotch:tools - Build and install extra exec tools
 sci-libs/spqr:metis - Use METIS (sci-libs/metis or sci-libs/parmetis) for partitioning
 sci-libs/spqr:tbb - Enable multithreading with the Intel Threads Building Block (needs dev-cpp/tbb)
 sci-libs/spr:root - Add sci-physics/root graphics and i/o support
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 85184c6db440..59bc4659cc83 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,2 +1,3 @@
 DIST scotch_5.1.11_esmumps.tgz 3952439 RMD160 f8db2bb02cbdadb7e02782daccddcdc4cdec4cac SHA1 b62501e0bf7fd24af3712647578b3e764f166287 SHA256 595ccc664ba070264b851a27b7860042a6bc716d6aade93e0909619decfabc92
+DIST scotch_5.1.12b_esmumps.tar.gz 3989632 RMD160 38ed5135e401767d0df8ecea6bcf8f7e4a60a464 SHA1 3866deea3199bc364d31ec46c63adcb799a8cf48 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e
 DIST scotch_5.1.7.tgz 3733642 RMD160 3424d4386dc257cabae46a2a55081162a8e41e4a SHA1 45be932de03d9a404d83b577346d2e63d856d7c7 SHA256 51ac6046eec0229ac257969a44926b87e0f4eec0a4ca1ad7f3e287be40070a2d
diff --git a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
new file mode 100644
index 000000000000..73888d8797e7
--- /dev/null
+++ b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
@@ -0,0 +1,112 @@
+diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
+--- src.orig/esmumps/Makefile	2012-03-12 00:14:14.536109811 +0000
++++ src/esmumps/Makefile	2012-03-12 04:26:12.884108074 +0000
+@@ -44,7 +44,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
++		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -57,9 +57,9 @@
+ 					libesmumps$(LIB)							\
+ 					main_esmumps$(EXE)
+ 
+-ptscotch			:	clean
++ptscotch			:	clean common.h
+ 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
+-					libesmumps$(LIB)										\
++					libptesmumps$(LIB)										\
+ 					main_esmumps$(EXE)
+ 
+ install				:
+@@ -142,7 +142,7 @@
+ 					common.h				\
+ 					esmumps.h
+ 
+-libesmumps$(LIB)		:	graph_graph$(OBJ)			\
++lib$(ESMUMPSLIB)$(LIB)		:	graph_graph$(OBJ)			\
+ 					order$(OBJ)				\
+ 					order_scotch_graph$(OBJ)		\
+ 					dof$(OBJ)				\
+diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
+--- src.orig/libscotch/Makefile	2012-03-12 00:14:14.496108751 +0000
++++ src/libscotch/Makefile	2012-03-12 01:32:28.562403624 +0000
+@@ -43,7 +43,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
++		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -2543,7 +2543,7 @@
+ 					mapping.h				\
+ 					order.h					\
+ 					parser.h
+-			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
++			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<)  $(LDFLAGS) -o $(@)
+ 
+ scotch.h			:	dummysizes$(EXE)			\
+ 					library.h
+diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
+--- src.orig/libscotchmetis/Makefile	2012-03-12 00:14:14.456107691 +0000
++++ src/libscotchmetis/Makefile	2012-03-12 01:35:00.166422784 +0000
+@@ -44,7 +44,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
++		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@) 
+ 
+ ##
+ ##  Project rules.
+diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
+--- src.orig/scotch/Makefile	2012-03-12 00:14:14.536109811 +0000
++++ src/scotch/Makefile	2012-03-12 00:50:22.033571205 +0000
+@@ -41,13 +41,13 @@
+ include ../Makefile.inc
+ 
+ %$(EXE)	:	%$(OBJ)
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ %$(OBJ)	:	%.c
+ 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -205,7 +205,7 @@
+ 					$(libdir)/libptscotch$(LIB)		\
+ 					$(libdir)/libptscotcherrexit$(LIB)	\
+ 					dgmap.h
+-			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ dgscat$(EXE)			:	dgscat.c				\
+ 					../libscotch/module.h			\
+@@ -315,7 +315,7 @@
+ 					gout_o.c				\
+ 					$(includedir)/scotch.h			\
+ 					$(libdir)/libscotch$(LIB)
+-					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
++					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@) 
+ 
+ gpart$(EXE)			:	gmap.c					\
+ 					../libscotch/module.h			\
+@@ -324,7 +324,7 @@
+ 					$(libdir)/libscotch$(LIB)		\
+ 					$(libdir)/libscotcherrexit$(LIB)	\
+ 					gmap.h
+-			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ 
+ gscat$(EXE)			:	gscat.c					\
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index cd485f5a4712..31b6fd4c865e 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -10,6 +10,10 @@
 		<email>oli.borm@web.de</email>
 		<name>Oliver Borm</name>
 	</maintainer>
+	<use>
+		<flag name='int64'>Build the 64 bits integer library (needed for > 2^31 vertices)</flag>
+		<flag name='tools'>Build and install extra exec tools</flag>
+	</use>
 	<longdescription lang="en">
   SCOTCH is a software package and libraries for graph, mesh and
   hypergraph partitioning, static mapping, and sparse matrix block
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
new file mode 100644
index 000000000000..3ae7447a1a8c
--- /dev/null
+++ b/sci-libs/scotch/scotch-5.1.12b.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.12b.ebuild,v 1.1 2012/03/14 07:11:17 patrick Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs versionator flag-o-matic
+
+# use esmumps version to allow linking with mumps
+MYP="${PN}_${PV}_esmumps"
+# download id on gforge changes every goddamn release
+DID=28978
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
+# broken ssl cert, so mirroring
+#SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
+SRC_URI="http://dev.gentooexperimental.org/~patrick/${MYP}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples int64 mpi static-libs tools"
+
+DEPEND="sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MYP/b}"
+
+LIBVER=$(get_major_version)
+make_shared_lib() {
+	local libstatic=${1}
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local dylibname=$(basename "${1%.a}").dylib
+		shift
+		einfo "Making ${dylibname}"
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${dylibname}" \
+			-Wl,-all_load -Wl,"${libstatic}" \
+			"$@" -o $(dirname "${libstatic}")/"${dylibname}" || die
+	else
+		local soname=$(basename "${1%.a}").so.${LIBVER}
+		shift
+		einfo "Making ${soname}"
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname="${soname}" \
+			-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+			"$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
+		ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	sed -e "s/-O3/${CFLAGS}/" \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s/ ar/ $(tc-getAR)/" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
+	use int64 && append-cflags -DIDXSIZE64
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC
+	make_shared_lib lib/libscotcherr.a
+	make_shared_lib lib/libscotcherrexit.a
+	make_shared_lib lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
+	make_shared_lib lib/libesmumps.a -Llib -lscotch
+	make_shared_lib lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch
+		export LINK=mpicc
+		make_shared_lib lib/libptscotcherr.a
+		make_shared_lib lib/libptscotcherrexit.a
+		make_shared_lib lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
+		make_shared_lib lib/libptesmumps.a -Llib -lptscotch
+		make_shared_lib lib/libptscotchparmetis.a -Llib -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_install() {
+	dolib.so lib/*.so*
+	use static-libs && dolib.a lib/*.a
+
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null
+
+		pushd man/man1 > /dev/null
+		for m in *; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null
+	fi
+
+	use doc && dodoc doc/*.pdf
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/* tgt grf
+	fi
+}
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index a3f4ecc8df88..28560f782729 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,2 +1,3 @@
 DIST ipmiutil-2.6.7.tar.gz 1356146 RMD160 17dfe1128e2bd36c1d00f64224b8599ee8782417 SHA1 db9f549b6f5d4e891e3f47c6ac06e1b53e742857 SHA256 dec519abbf4920e3df0e4f56306e2cb14bdc6e8b9859d77c5f089f5cab212fa4
 DIST ipmiutil-2.7.7.tar.gz 1506067 RMD160 16ba56b83d06009ad3f1d839ef8a5604e6dbbedd SHA1 0bb22fcd9e2ef5211f26fc961e3c19d972f91c33 SHA256 f899f04106c6098db3acadbbf19ee9c25a44d5c06b865f3eee3d94c6246075aa
+DIST ipmiutil-2.8.2.tar.gz 1591876 RMD160 c0de2c2d8bff2d90e92222d6a53eddcfa94ae6e2 SHA1 2c24894c0da2e68bb7a27e209e7be344eb7297ea SHA256 16f2181745030ae1e7110bf0c780760d4b2de0a47f9945c9a52314e4ef520988
diff --git a/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild b/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild
index e0a57ef5f0d8..7134011faf4e 100644
--- a/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild,v 1.2 2012/02/24 09:33:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.7.7.ebuild,v 1.4 2012/03/14 07:43:50 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools
 
 DESCRIPTION="IPMI Management Utilities"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/openssl"
+RDEPEND="dev-libs/openssl:0"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
@@ -27,8 +27,8 @@ src_prepare() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		initto="${D}/usr/share/doc/${PF}/examples" \
-		install || die
+		initto="${D}"/usr/share/doc/${PF}/examples \
+		install
 
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/UserGuide
 }
diff --git a/sys-apps/ipmiutil/ipmiutil-2.8.2.ebuild b/sys-apps/ipmiutil/ipmiutil-2.8.2.ebuild
new file mode 100644
index 000000000000..03727bd39534
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-2.8.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-2.8.2.ebuild,v 1.1 2012/03/14 07:43:13 ssuominen Exp $
+
+EAPI=4
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/openssl-1:0"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO doc/UserGuide"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_unitdir)" install
+	rm -rf "${ED}"/etc/init.d # These are only for Fedora
+}
diff --git a/sys-block/tgt/files/tgtd-1.0.24.confd b/sys-block/tgt/files/tgtd-1.0.24.confd
new file mode 100644
index 000000000000..fd4c098eaef2
--- /dev/null
+++ b/sys-block/tgt/files/tgtd-1.0.24.confd
@@ -0,0 +1,4 @@
+# Here you can specify options that are passed directly to tgt daemon
+TGTD_OPTS=""
+
+# vim: ft=gentoo-conf-d
diff --git a/sys-block/tgt/files/tgtd-1.0.24.initd b/sys-block/tgt/files/tgtd-1.0.24.initd
new file mode 100644
index 000000000000..523775eb57f6
--- /dev/null
+++ b/sys-block/tgt/files/tgtd-1.0.24.initd
@@ -0,0 +1,126 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/files/tgtd-1.0.24.initd,v 1.1 2012/03/14 10:07:11 xarthisius Exp $
+
+TGTD_CONFIG=/etc/tgt/targets.conf
+
+TASK=$1
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting target framework daemon"
+	ebegin "Starting ${SVCNAME}"
+	# Start tgtd first.
+	start-stop-daemon --start --quiet \
+		--name tgtd \
+		--exec /usr/sbin/tgtd -- \
+		${TGTD_OPTS}
+	RETVAL=$?
+	if [ "$RETVAL" -ne 0 ] ; then
+	    echo "Could not start tgtd (is tgtd already running?)"
+	    exit 1
+	fi
+	# We need to wait for 1 second before do anything with tgtd
+	sleep 1
+	# Put tgtd into "offline" state until all the targets are configured.
+	# We don't want initiators to (re)connect and fail the connection
+	# if it's not ready
+	tgtadm --op update --mode sys --name State -v offline
+	# Configure the targets.
+	tgt-admin --update ALL -c $TGTD_CONFIG
+	# Put tgtd into "ready" state.
+	tgtadm --op update --mode sys --name State -v ready
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	ebegin "Stopping target framework daemon"
+	# start-stop-daemon --stop --exec /usr/sbin/tgtd --quiet
+	if [ "$RUNLEVEL" == 0 -o "$RUNLEVEL" == 6 ] ; then
+	    forcedstop
+	fi
+	# Remove all targets. It only removes targets which are not in use.
+	tgt-admin --update ALL -c /dev/null &>/dev/null
+	# tgtd will exit if all targets were removed
+	tgtadm --op delete --mode system &>/dev/null
+	RETVAL=$?
+	if [ "$RETVAL" -eq 107 ] ; then
+	    echo "tgtd is not running"
+	    if [ "$TASK" != "restart" ] ; then
+			exit 1
+		fi
+	elif [ "$RETVAL" -ne 0 ] ; then
+	    echo "Some initiators are still connected - could not stop tgtd"
+	    exit 2
+	fi
+	# echo -n
+	eend $?
+}
+
+forcedstop() {
+	# NOTE: Forced shutdown of the iscsi target may cause data corruption
+	# for initiators that are connected.
+	echo "Force-stopping target framework daemon"
+	# Offline everything first. May be needed if we're rebooting, but
+	# expect the initiators to reconnect cleanly when we boot again
+	# (i.e. we don't want them to reconnect to a tgtd which is still
+	# working, but the target is gone).
+	tgtadm --op update --mode sys --name State -v offline &>/dev/null
+	RETVAL=$?
+	if [ "$RETVAL" -eq 107 ] ; then
+	    echo "tgtd is not running"
+	    if [ "$TASK" != "restart" ] ; then
+			exit 1
+		fi
+	else
+	    tgt-admin --offline ALL
+	    # Remove all targets, even if they are still in use.
+	    tgt-admin --update ALL -c /dev/null -f
+	    # It will shut down tgtd only after all targets were removed.
+	    tgtadm --op delete --mode system
+	    RETVAL=$?
+	    if [ "$RETVAL" -ne 0 ] ; then
+			echo "Failed to shutdown tgtd"
+			exit 1
+	    fi
+	fi
+	echo -n
+}
+
+reload() {
+	echo "Updating target framework daemon configuration"
+	# Update configuration for targets. Only targets which
+	# are not in use will be updated.
+	tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null
+	RETVAL=$?
+	if [ "$RETVAL" -eq 107 ] ; then
+	    echo "tgtd is not running"
+	    exit 1
+	fi
+}
+
+forcedreload() {
+	echo "Force-updating target framework daemon configuration"
+	# Update configuration for targets, even those in use.
+	tgt-admin --update ALL -f -c $TGTD_CONFIG &>/dev/null
+	RETVAL=$?
+	if [ "$RETVAL" -eq 107 ] ; then
+	    echo "tgtd is not running"
+	    exit 1
+	fi
+}
+
+status() {
+	# Don't name this script "tgtd"...
+	TGTD_PROC=$(ps -C tgtd | grep -c tgtd)
+	if [ "$TGTD_PROC" -eq 2 ] ; then
+	    echo "tgtd is running. Run 'tgt-admin -s' to see detailed target info."
+	else
+	    echo "tgtd is NOT running."
+	fi
+}
diff --git a/sys-block/tgt/tgt-1.0.24.ebuild b/sys-block/tgt/tgt-1.0.24-r1.ebuild
similarity index 73%
rename from sys-block/tgt/tgt-1.0.24.ebuild
rename to sys-block/tgt/tgt-1.0.24-r1.ebuild
index 7ea934a217bc..6ed63c07c14f 100644
--- a/sys-block/tgt/tgt-1.0.24.ebuild
+++ b/sys-block/tgt/tgt-1.0.24-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/tgt-1.0.24.ebuild,v 1.1 2012/02/04 16:54:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tgt/tgt-1.0.24-r1.ebuild,v 1.1 2012/03/14 10:07:11 xarthisius Exp $
 
 EAPI=4
 
-inherit flag-o-matic linux-info
+inherit flag-o-matic linux-info toolchain-funcs
 
 MY_TREE="e039354"
 
@@ -26,19 +26,20 @@ DEPEND="dev-perl/config-general
 RDEPEND="${DEPEND}
 	sys-apps/sg3_utils"
 
-S="${WORKDIR}"/fujita-tgt-"${MY_TREE}"
+S=${WORKDIR}/fujita-tgt-${MY_TREE}
 
 pkg_setup() {
 	CONFIG_CHECK="~SCSI_TGT"
 	WARNING_SCSI_TGT="Your kernel needs CONFIG_SCSI_TGT"
 	linux-info_pkg_setup
+	tc-export CC
 }
 
 src_prepare() {
-	sed -i -e 's:\($(CC)\):\1 $(LDFLAGS):' usr/Makefile || die "sed failed"
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
 
 	# make sure xml docs are generated before trying to install them
-	sed -i -e "s@install: @install: all @g" doc/Makefile || die
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
 }
 
 src_compile() {
@@ -54,7 +55,8 @@ src_compile() {
 src_install() {
 	emake  install-programs install-scripts install-doc DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF}
-	doinitd "${FILESDIR}/tgtd"
+	newinitd "${FILESDIR}"/tgtd-${PV}.initd tgtd
+	newconfd "${FILESDIR}"/tgtd-${PV}.confd tgtd
 	dodir /etc/tgt
 	keepdir /etc/tgt
 }
diff --git a/sys-fs/lvm2/lvm2-2.02.93.ebuild b/sys-fs/lvm2/lvm2-2.02.93.ebuild
index 1ce53f935d0d..be0c168d2418 100644
--- a/sys-fs/lvm2/lvm2-2.02.93.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild,v 1.2 2012/03/03 07:39:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild,v 1.3 2012/03/14 05:57:35 robbat2 Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -232,7 +232,9 @@ src_install() {
 	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
 
 	# do not rely on /lib -> /libXX link
-	sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
+	sed -i \
+		-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \
+		"${ED}"/etc/init.d/* || die
 
 	elog "USE flag nocman is deprecated and replaced"
 	elog "with the cman USE flag."
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
new file mode 100644
index 000000000000..9519d5b270d0
--- /dev/null
+++ b/www-apps/davical/Manifest
@@ -0,0 +1 @@
+DIST davical-1.0.2.tar.gz 2739740 RMD160 d24ccc16363f30789ec3c0b384f99999405fee7d SHA1 5d8b87018411d6f3995809d959450dd7522a149c SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6
diff --git a/www-apps/davical/davical-1.0.2-r1.ebuild b/www-apps/davical/davical-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f4949b1e4d6d
--- /dev/null
+++ b/www-apps/davical/davical-1.0.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.0.2-r1.ebuild,v 1.1 2012/03/14 06:46:26 patrick Exp $
+
+EAPI=2
+
+inherit depend.php webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="app-admin/pwgen
+	dev-lang/php[calendar,curl,pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/yaml
+	>=dev-php/awl-0.51
+	www-servers/apache"
+
+need_php5
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	if use doc ; then
+		einfo "Generating documentation"
+		phpdoc -q -c "docs/api/phpdoc.ini"\
+			|| die "Documentation failed to build"
+	fi
+	emake built-po || die "emake failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc-php INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog \
+		|| die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess || die "doins failed"
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale || die "doins failed"
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/* || die "doins failed"
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/ || die "dohtml failed"
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example" \
+		|| die "newins failed"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
new file mode 100644
index 000000000000..7eee3d8fcfb8
--- /dev/null
+++ b/www-apps/davical/files/awl_location.patch
@@ -0,0 +1,21 @@
+--- scripts/po/rebuild-translations.sh.orig	2011-09-29 21:23:48.122625252 +0200
++++ scripts/po/rebuild-translations.sh	2011-09-29 21:49:55.642929743 +0200
+@@ -10,7 +10,7 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
++AWL_LOCATION="/usr/share/php/awl/inc"
+ 
+ if [ ! -d "${AWL_LOCATION}" ]; then
+   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+@@ -25,7 +25,8 @@
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+ sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+-sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
++sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
++sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
+ xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
+ sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
+ rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch
new file mode 100644
index 000000000000..2230249df0f9
--- /dev/null
+++ b/www-apps/davical/files/inc_path.patch
@@ -0,0 +1,28 @@
+--- htdocs/always.php.orig	2012-01-05 21:28:16.382878446 +0100
++++ htdocs/always.php	2012-01-05 21:30:06.828431957 +0100
+@@ -48,7 +48,7 @@
+ // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt');  // An array of locales to try, or just a single locale
+ // $c->local_tzid = 'Pacific/Auckland';  // Perhaps we should read from /etc/timezone - I wonder how standard that is?
+ $c->default_locale = 'en';
+-$c->locale_path = '../locale';
++$c->locale_path = '../../davical/locale';
+ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
+ $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
+ $c->default_privileges = array('read-free-busy', 'schedule-deliver');
+@@ -80,6 +80,7 @@
+         '../../awl/inc'
+       , '/usr/share/awl/inc'        // Where it ends up on Debian
+       , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
++      , '/usr/share/php5/awl/inc'   // Gentoo's standard for PHP5 libraries
+       , '/usr/local/share/awl/inc'
+   );
+   foreach( $try_paths AS $awl_include_path ) {
+@@ -95,7 +96,7 @@
+ }
+ 
+ // Ensure that ../inc is in our included paths as early as possible
+-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path());
+ 
+ 
+ /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */
diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt
new file mode 100644
index 000000000000..5a88a2bdf2e4
--- /dev/null
+++ b/www-apps/davical/files/postinstall-en.txt
@@ -0,0 +1,18 @@
+You will need access to postgresql database to use davical.
+
+Read /usr/share/doc/www-apps/davical-${PVR}/INSTALL.gz for installation
+instructions.
+Release notes are available at
+http://wiki.davical.org/w/Release_Notes/${PVR}.
+Full documentation and wiki on http://davical.org
+
+If you are upgrading from a previous version of davical, don't forget to
+upgrade the database structure with
+	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
+	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
+
+You can safely ignore any message about missing time_zone table.
+
+If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
+have been moved away from the htdocs directory and placed into hostroot for
+safety reasons.
diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example
new file mode 100644
index 000000000000..d6f0da2088cf
--- /dev/null
+++ b/www-apps/davical/files/vhost-example
@@ -0,0 +1,16 @@
+<VirtualHost 123.4.56.78 >
+	ServerName davical.example.net
+
+	DocumentRoot /var/www/myvhost/htdocs
+
+	<Directory /var/www/myvhost/htdocs/>
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	php_value magic_quotes_gpc 0
+	php_value register_globals 0
+	php_value error_reporting "E_ALL & ~E_NOTICE"
+	php_value default_charset "utf-8"
+</VirtualHost>
diff --git a/www-apps/davical/metadata.xml b/www-apps/davical/metadata.xml
new file mode 100644
index 000000000000..cc91a0604be2
--- /dev/null
+++ b/www-apps/davical/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer>
+                <email>francois.perichon@univ-lille2.fr</email>
+                <name>Francois Perichon</name>
+        </maintainer>
+        <maintainer>
+                <email>patrick@gentoo.org</email>
+                <name>Patrick Lauer (proxy)</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 149b44f65edb..813c1c6c84d8 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -82,5 +82,91 @@ DIST firefox-10.0.2-vi.xpi 262784 RMD160 779fb82c43a84adeb80dadc0da84f9f55bc25eb
 DIST firefox-10.0.2-zh-CN.xpi 256544 RMD160 c5e4db18405565f5d9605f102b8175b0b554cb7a SHA1 97ae38907beed6edfba2886b3db71ad928b2d915 SHA256 6b8f03e07ad020a9ba0a6935d916ef6c707b72faefd66049da4718d08d0bf0b9
 DIST firefox-10.0.2-zh-TW.xpi 257489 RMD160 311754a70e2f183c521e12c892a68748cc931125 SHA1 d312fb1fbfed7fa488d3b77c68bbf8bdd3908a4f SHA256 b17a795360b8272dfdbcdf4fdd4a67f544405a0c5557fedf31448ad962c66923
 DIST firefox-10.0.2-zu.xpi 246392 RMD160 4b4b6992f5a9ee280cc566ed8ae9771b85ca45d6 SHA1 fc556f6cade7e56b644d80d706f122f6efd71b20 SHA256 74f0dec5c9fa7576445c2d230074218d69b62921211a0cd72c1c0a99394d8e5b
+DIST firefox-11.0-af.xpi 245646 RMD160 9877c64c43067b6f6255b45206f3a1a4ffd4214b SHA1 934e85611730ab3c47bc42499fc0543aa885d40f SHA256 bc70a8b5c0aad23c5f57e7e7ced8dfb5e21d96caac6314bbb58ecc127e068470
+DIST firefox-11.0-ak.xpi 247123 RMD160 2de28f297ea43418afb469cd8aab45b70b60a0ae SHA1 ed148cbc6d6d6b72147d7e395db9386727b4af4b SHA256 b0cf51bfe893c3f17777556d7a9dd87bd8a301a02e5b0d50a5f4ef5c7e2d513c
+DIST firefox-11.0-ar.xpi 270303 RMD160 4974989407e4f166e8418d46247bc374980b6329 SHA1 d9c43300acb42bbaed10434d9feb5472c1343471 SHA256 2b91b288345283d3fb57d9ccfc8a0e4c8dee065af8e73075e2d060a6dc10f9c2
+DIST firefox-11.0-as.xpi 285886 RMD160 898b50b139ef79dc8c59bf867471e5cdfe7cad89 SHA1 ffe3f45faae7cbda33ff0c007e8c76be883cac3a SHA256 1708d5558536bc284cb073f0a5e5d671b9ef7450233a2d5caf578c09831bb7e9
+DIST firefox-11.0-ast.xpi 235064 RMD160 d4918e80219886b19374af86ef7e27faa1b41560 SHA1 adb89747b6d3a691b9568d15e11d1497a52704f0 SHA256 72eef92584d777fd39d757cb0c45d401db1882115a3ef39d998c8ca2d5eb2290
+DIST firefox-11.0-be.xpi 249213 RMD160 d2e45b938f456a08cfd2baaf8bfb6fb3a70e3d8e SHA1 095ae44abca6372a67ea1e38e11b746bf3a258b1 SHA256 bfe12466ef45e20042e9a4bb0710a4c120db46730a2f2ebfb4a495d86dfd1821
+DIST firefox-11.0-bg.xpi 284548 RMD160 da101463fb9999b68dd148c63eba4dc6e4692fbe SHA1 445f6cf5a2494338761a7450c53916dc690924c6 SHA256 c6b1635666fb2720b30840bd45df3813af307ade57fe8ba2634c710064fdbee8
+DIST firefox-11.0-bn-BD.xpi 295383 RMD160 cc4a917d693af166920e907ec5b0c127baefcde6 SHA1 8e1dec7ff06f14958e6915a6cb7a930feedc490c SHA256 9f74e59aa72b46f2985ce3dadae173a0d61c7688bbaac6a7b3b24d1d48e1c1cc
+DIST firefox-11.0-bn-IN.xpi 325638 RMD160 a70a69aa5c1b0ddaa19e4a480f698b584c95b223 SHA1 8d9694cd03409b5fc58921df44a803612a86124f SHA256 8fd7462796f7fb2306a62cc925e38f089a883786fb439bb782876bf7367d983d
+DIST firefox-11.0-br.xpi 253513 RMD160 22589bb39d7a5246976ca4a6893dd1ed0ac8f13b SHA1 c545462181dd5461aa15a37d7a84eda0c39560fc SHA256 18fdbd0a0c56b367a69fc5190ac49c0bf8da87e14a43df59e88d58dab85da2f2
+DIST firefox-11.0-bs.xpi 251042 RMD160 feb7ab0673018d020aaf8b77773e90b744677d76 SHA1 2b301fbb63e9b98531f89c97dc88f6f1d9880bce SHA256 387a2d6f6d10739092084b166b77dcfecd3fb30d02c896a50546fecfff13ef6d
+DIST firefox-11.0-ca.xpi 255218 RMD160 8182369c078735fa5637aaa872f93e39e0801b4c SHA1 d53a7b32df914a437abf6ae1e794c509b4a6c1fa SHA256 872c36ef4da3205a30a2684ef04e2bcd2fa627300bee876dbede19dc2c83cd9d
+DIST firefox-11.0-cs.xpi 255835 RMD160 8d6395f5c6e7fcbc53f3c2540e3d8db035f6bce8 SHA1 4744694be6789034dfdad9a02b956929eab1b049 SHA256 5f32edea94b436b948b8b8cafd64ab6d62da4c8b35a7351691d75853838d7d40
+DIST firefox-11.0-csb.xpi 270189 RMD160 ffb3a9c3fa8b82f7bd7ce873a799709efb432a94 SHA1 c04901dcad964ee770daeff2f69b807a0c66bb82 SHA256 4d3482a76e88d087b42c2eed96e2007c92235914758db7991cb238a051620a5b
+DIST firefox-11.0-cy.xpi 251474 RMD160 2ac1c7e0ced959c6fcee569e0ec08105ad3feffe SHA1 020a940cf25d8c3d39ee96493f53b6654c88152c SHA256 5b6baee87e8595024acf8bf3f19087117197955c7aea398e9336a314b34f5536
+DIST firefox-11.0-da.xpi 245882 RMD160 02c79153a40a3e0dbda51872e9503fbdc217a9a8 SHA1 2cc957954471b684c08ae46e9164d14cd1044b43 SHA256 a844826ec19b0c72f2ae5148ccb539323c50ae860017e96e5fdd6248d35270b6
+DIST firefox-11.0-de.xpi 255074 RMD160 5250a4f616f4f567bac112c41d5a090054cd49b3 SHA1 c2fefb151770b2370786ae755afe16309d41199b SHA256 84dfc30a0aa36130cab0db1b43d1de53b43307325a6df0bf05db3771bbc8dcad
+DIST firefox-11.0-el.xpi 270188 RMD160 d7fdad920e9558a134f1daa1b83a7030fa3c0076 SHA1 c52280cafdd131f8bcef53fdf6deb10747dd8516 SHA256 de85451444f6706d2db56b8fb3dd594f7d28c588511cf531577bd7c955baebaa
+DIST firefox-11.0-en-GB.xpi 236896 RMD160 af9fdcf5921c596efb67d0ad16cd0e338506c7b9 SHA1 c553e11fca424bb2d23af8c1b29e379e34b8c54b SHA256 d83c460b0474f28f3a2822504b4822b41732886daa8d022b0e4244dd86bd6512
+DIST firefox-11.0-en-ZA.xpi 237503 RMD160 e436966c1839de91be68159ab8237aeede785750 SHA1 dbd53c058e329c37d4ccebc35eb466c0eeda18b8 SHA256 0d859b54c2e261b2f66efade96895eaea4319b88b2a347d8aac20755da51f6df
+DIST firefox-11.0-eo.xpi 246750 RMD160 e99dde690cee108980480f3b7f6e1cb6ce2a2acb SHA1 8db871eef004c60319aae3be2298ebf2a5853f73 SHA256 62f6c7f8e97904aeaaf8bcbe901bfb2ffcc08dd071396e92512f5d74b5d91df6
+DIST firefox-11.0-es-AR.xpi 251341 RMD160 e63c5852e2fbc5cacbc4c80bd4853ac0daebc000 SHA1 e9ed5650d7d009123f0e291ce89d76013513ada7 SHA256 022d1f39363b8494beefb2c1b07589e8d7458fdcfcd1a9768e7f0aadb9c22677
+DIST firefox-11.0-es-CL.xpi 257488 RMD160 3c464b6488a139389fb6631d0e58c9fb9a5d5295 SHA1 45adc16f075c81279aca7720f8c06399f65f8b2a SHA256 60050267ff0ecb1ba761adfa8fb1c26c3259d3c11a34ac9e6e3f5c44398901a6
+DIST firefox-11.0-es-ES.xpi 218264 RMD160 1d7e8f8189e958b4c280f9f8a122e5daa8ee15e8 SHA1 3faf9d2140c060837e0b062c1a20f6bdcfbba025 SHA256 a4e097a7f1b446a823af538089803ef452c004a70a8f9279d2f0134589eae11e
+DIST firefox-11.0-es-MX.xpi 218927 RMD160 39e0ef95692ff5d09d63ed3d6c490484be380849 SHA1 963b72d455515e0730c180295fe92a9dcf3e31fe SHA256 da39e8026d928d0dcbcb398d170f89224fa3a01afd552741d872c25c0a549a40
+DIST firefox-11.0-et.xpi 248846 RMD160 b179fb170764c157444b8c2323d8f0f458a58418 SHA1 bff1a388f90aebed2da480b17385cbc3322585a0 SHA256 8b70cca9023e7d37e3f0c9504bbb8a194ee1f9d31c6667f52ff0240033eb0399
+DIST firefox-11.0-eu.xpi 247514 RMD160 7582ed9e0c138c35c68e5a6e1865f4096601751a SHA1 f900d7d79d52dc4217f3bcc4c0f4d0b7c6c0f5a8 SHA256 48bdbbbcf4e74d8e153b414c1cb9b7c6335da0c08aa85836ddba58accfd900ed
+DIST firefox-11.0-fa.xpi 279951 RMD160 564074b94cd11798918f53fd22b2ecfde1585994 SHA1 e756aca35c510a4c8390a200ba3baef34e5e40dd SHA256 25a598a00aa58b9a39a3922deb68aa44a6703fef71a85cac50332ba94bd3a8de
+DIST firefox-11.0-fi.xpi 250230 RMD160 e5bbc60175ebbeb8b8b99f1dd499073b8c0ad994 SHA1 c83d74c5a089020da1580485c07bb79c7770c50b SHA256 c72a126daaee11870fea534d626621f4ff5fdd1abe4bcf1b8df23c5af2fcfc18
+DIST firefox-11.0-fr.xpi 256716 RMD160 962801ab7b2e18796b6881531839e77909bf2b24 SHA1 a5509f6c973688fb0d3349a435ce318438914077 SHA256 16dd0e9c04b2b172e33f92ea4ac4e97d1b10b69f0b90335e7e97a236587c22e6
+DIST firefox-11.0-fy-NL.xpi 252332 RMD160 338b9e0b57176285f95b65381c3c7cc4a6a946c8 SHA1 e609efa651b6cd87234d97aedf1a0fc4317ae13d SHA256 f16804cc4da7c0d4317fc7913b37b95cb870e161f300fdb1c3eeef26a471f354
+DIST firefox-11.0-ga-IE.xpi 259100 RMD160 a7fd503ed7b635476ef158ab540c14431ab92bb9 SHA1 12eb92953268560525889f3d43f628270bd6313e SHA256 e8b4a18f288b1f0cdcb46ff75bb31a4fe60436f273da381b50d3ac928ed6b0ca
+DIST firefox-11.0-gd.xpi 261064 RMD160 a2bbed77648251499ebb562524a9e1eb68aa1821 SHA1 bb62a85084d37ef968b419d25879b87b2e42fb8b SHA256 25a464842135084f7d9d591031b7523a55907485930259acdfc8f950ca11406d
+DIST firefox-11.0-gl.xpi 249656 RMD160 285bb98cbeac5392aaedc4c79dbf14afddc55672 SHA1 5a6ce92853d2da37cc106e2cf7f6efa02d2613a0 SHA256 d94c7837d72e4fc7ca4ba00c1544525a6ab1b992a52dd114d4ecbdf9dfcd63e8
+DIST firefox-11.0-gu-IN.xpi 282529 RMD160 1db9f378c5f079d0b1f2cce52b6230a66215042b SHA1 e83e9969fd5fb2ca4c8da90ffcf4beaf08916276 SHA256 b5ef955feac2a5969cffed2855bd3548f48744dff0417c22d8633de85f38fd09
+DIST firefox-11.0-he.xpi 272488 RMD160 5a289c21a3cefdbf4d7290b5f169b949751caa62 SHA1 97d7ea1762059b0d6e4d90c1e412774679347961 SHA256 7b1f35fcbce0cf9be893d134c5c0b3a6b4fb342f5133f07b749c89474184bfae
+DIST firefox-11.0-hi-IN.xpi 286428 RMD160 59fa316f0081459401e1aa932e3c59b4b5973a05 SHA1 3360940e51b0824e83066006d1b0e89f74520dea SHA256 e3a0401a52973a3fb300c37a57b15ec7737c5a6b93431f3a7977316121780aa6
+DIST firefox-11.0-hr.xpi 250047 RMD160 d063b7d480e09195981af1c1339623dbf406f8c1 SHA1 f8b683eec6a0db7da04ca3db2435449fa16e86c2 SHA256 1e93505da723806fa7722fe08d0284be1f9eda25754842495b5fe2a385a842be
+DIST firefox-11.0-hu.xpi 260966 RMD160 0bfc7c030ab781709751c6756ac52b1855a34903 SHA1 d5aff78beb6327a56281e7f93aa138e16c3bd858 SHA256 2e5c60f98eaf2f73265f60bf096cc920e18f0621a2fa5e572fa5699f20d070ed
+DIST firefox-11.0-hy-AM.xpi 457554 RMD160 05caf9f2ac57882868fdadc41c2a5ef228e3dc90 SHA1 7abf45c18399448e46e580c9c4f949c611ca2562 SHA256 d3d106399fd6f23321290bca9db4a1fee447d8cd4b7b38938aa7538d41ea98ec
+DIST firefox-11.0-id.xpi 242447 RMD160 bfee347e4b87cf0c17fbd26e5fa8a57cc5375e7c SHA1 346a8d7cf7d050d1f02584adb685910ad43c2639 SHA256 2861912f3b942492b302c5f62f5e26b4d8897e4c3426589dbb896b6edbeb126f
+DIST firefox-11.0-is.xpi 250097 RMD160 81147e1cf3f8959975c65034890795debb10d2f4 SHA1 8ab2d255f5105f9ebc73e0c4bf049e466969dd7a SHA256 4be7961b72dfc85e615c4fdcfd7bdc07d8de40a80d1128aaa0c4f774335aca17
+DIST firefox-11.0-it.xpi 215503 RMD160 985c203b82b2580d8d37f7d7509a07b7d4f2750f SHA1 e07a827b4bde4fdf4dc6978d61b516d3c2759d3e SHA256 1304d8b683c6997d4992200b0067d3498cef506d7fb04d6b41db916a1119e31f
+DIST firefox-11.0-ja.xpi 280690 RMD160 e7cca75a7fec06af23319d7dd0b3be43917a0aba SHA1 ef21804c51b37f2431fb73f70ce1541c650d68ef SHA256 bb4e723b48004fe77e10d1f18cf91116c4a72a708174f822d8caae55be850858
+DIST firefox-11.0-kk.xpi 287302 RMD160 e4236043c016394d555a8ce73305c5e9bbbacd20 SHA1 a5160b9fdb85166190f9b4b31371d41f1991774e SHA256 3b2c53b24aed000099f6609d5ffd9b617db1399ae33b6a13359c63a240a965aa
+DIST firefox-11.0-kn.xpi 306333 RMD160 4ae6cccfd91550e282e6838e511c1d89cdbb4c1f SHA1 7a74f0e79bfcb532ea9e1f261005de43885a05ae SHA256 1ac465f4ed86ecbab2099c4fca704df6a6f6af0cc0fbb2ceaa5c42a27edbce7b
+DIST firefox-11.0-ko.xpi 233934 RMD160 67f668b89b4159261b1eb850cf6d2ff5dd681fe5 SHA1 12f37216ffd33cf8336445b447140a76ed9dfb25 SHA256 43f19dadda8e34578af8d107ded231fab220608109f6178010dfee594e04a5d3
+DIST firefox-11.0-ku.xpi 261332 RMD160 7793886502e8cfc10e20337080590a3e331863a3 SHA1 8f2a0cdf9cc22dfeba17d863ff8ada7f7bbbc6d1 SHA256 a9141d267e2dc5c3bcf60025a55d135add1e8581e62f7754724c419bf6fd0a5b
+DIST firefox-11.0-lg.xpi 254729 RMD160 39dfacb67d4425df643c6c6a49695b009b004d16 SHA1 a01ab8cef58cbc81dc09af42c7265ec7e08e2bed SHA256 bcb8a44773efbb6c15900bd7b8023f443fab684f80b93f31f06b208732496f14
+DIST firefox-11.0-lt.xpi 327820 RMD160 dac713989b1cbe6b444fc56e8e1bdb96884c3afa SHA1 bc50a3d06369aa0bb9c24f2fe50785f8466ff6f6 SHA256 fe9ab46524aad9eb2ee5764f6f320e63dd750c177a47bc5c33bcf82a03316ac6
+DIST firefox-11.0-lv.xpi 249900 RMD160 9757811012a57e717ef209dc61d4b88deb367a50 SHA1 38923fc1572a8d05648b1ca88cf9dea2eb62fc11 SHA256 5142ef0ea0091a292d0247881976a929f91d937648010689a4f8e94a48f7299e
+DIST firefox-11.0-mai.xpi 285668 RMD160 3e375ce9a13e23be44482114b3eb9bf4cdc2f4ad SHA1 385f53c1392e906dfb255c773bf78055dc8c9602 SHA256 a5b9f4f5646cf7116d218a100a467ce576642f8afa2b29d862251f1db3704481
+DIST firefox-11.0-mk.xpi 280156 RMD160 37a0f4e704eab01b701fc55b98a0e35473a99698 SHA1 df58a96e0bbdc11b0e0d3f2d53cb1d2e64440730 SHA256 bbcf21ee614f9a2edd66285db9f078e6d96641a874be1b9b602bb8136ef20c1e
+DIST firefox-11.0-ml.xpi 313579 RMD160 894b46b82e60cadf1917cb07caa197f9e3f635b3 SHA1 f8e86f526b1abfe6ab53f8b2dc1ce013538db6c0 SHA256 b91ca508d0b37e37c4d9d9d72770973aa529df21f468b80191ab2da0f0611afc
+DIST firefox-11.0-mr.xpi 288746 RMD160 005ca1559b5c4a6a8342052da823f1db4895ac6b SHA1 ead8315d35bce478f2007a544628eed9520bdccb SHA256 a16bed69b60f15c19bf27fa659eaa27fd8ffe69a8bfd6663a6a9c2b3b1968547
+DIST firefox-11.0-nb-NO.xpi 247435 RMD160 da1dd0ce3803be9f7ba0fa11aa4e6c6a160bde6e SHA1 9c78d2b38816f35daf7e9be65431298b7fe4b219 SHA256 b1a2b9466c4b083ef0c8a98e1bc01fe57c248e16066d6cc5d7828be3ffe50c0b
+DIST firefox-11.0-nl.xpi 249580 RMD160 1d90a40d46e4dd8c33fb730e54b215ddb6c0a6e5 SHA1 b690053cb7b35c1b5bd37348d20a1351d244c84f SHA256 9a7699d48e736d495197848066c6ffc2fe281fee46945f06328e2f53407f6110
+DIST firefox-11.0-nn-NO.xpi 248736 RMD160 c29ae718c2fcc3edb3f671c4ecf1cd5152b297d3 SHA1 8a1b12d4ab6811cab7336bb20d79c57915046e0c SHA256 2db6e345968e0b66b3ff478231954eb0d11b38ff6736f6017558300c5dd92014
+DIST firefox-11.0-nso.xpi 252238 RMD160 946acb004132de3e4286382f6ee8c11c42d1f97b SHA1 a56c92fba28c0596c5e65728b98d7fba3391c52f SHA256 b6ceffec32257a509f7ff6de7934896460729db9d982f0199f477360c2060f27
+DIST firefox-11.0-or.xpi 287375 RMD160 7c872ac3e443a2cd16cf3f4910e5c26736849436 SHA1 92fc985a560f5acca7f48fcc1c1ecd20c36f979f SHA256 1ffb259a82f2095174169d8d11553218aee14304d23ce95d2e509e5e01e71e5d
+DIST firefox-11.0-pa-IN.xpi 288525 RMD160 367716e9976cf980f87626553d31d9ceee5468ac SHA1 42730879432c13783853846f21f0a8c87ebe5ef7 SHA256 020b7a8be1f602ae935b2df7dad3403d6a8d2a94f232ba531484d45e46f91a95
+DIST firefox-11.0-pl.xpi 257895 RMD160 373d8852af406d835817d82022f52cd14ad6fd4b SHA1 9fddab38e625f18d7307c6fe4575500092df56fb SHA256 f473c68a4c994a570ea4056365dffd0ef0f94b8c3ffe8a12022e246784c5c764
+DIST firefox-11.0-pt-BR.xpi 253884 RMD160 3cd90ed1321a7a9977b3f17c147c1aca2ed0565b SHA1 2db82434954089a361a55c7e2b667717fe108c77 SHA256 c740b02c85f365a625b04d536b63c0ebd5b33634768f08b24a5f9d0dc26c6fee
+DIST firefox-11.0-pt-PT.xpi 252568 RMD160 f85dafecf9d9f6c5721083316cea3720c366fe60 SHA1 25a768c3e3fe2be52a99b0ae88c28caec034b87f SHA256 1b9233180b5a66d26122405aab8a16f12e5aba335b76430754d3d26218fcea0d
+DIST firefox-11.0-rm.xpi 251582 RMD160 c45addbec521cf81937fbdb5a4a33f49c6589153 SHA1 fa4664d09709b3eb16efb72115a6cb3ada0b2121 SHA256 c7229921e189e9bd841de334646ae9e9ea376b83481c115e1b3052897b178372
+DIST firefox-11.0-ro.xpi 270785 RMD160 57aa1ea7269c9be96616a3fdf3998afdf2208268 SHA1 13c73b0e30399870591d17af81cc1c1fb7a7b9c7 SHA256 acd68643c41379ab2f6e8d3cb723546491e19fd3eb520e81929d3116896a3c8c
+DIST firefox-11.0-ru.xpi 258419 RMD160 202e43bd18c5a3e24c0ff10be95437f1828431bb SHA1 7dc5e9507360d5268e3ee51804cbca8f04039f74 SHA256 dd823ce79d633fc2d582d37337c69ab1ffa6ee379d1dd2cbc1d674256f07fba2
+DIST firefox-11.0-si.xpi 278533 RMD160 58be9bbc271a97ed9de8b183884d54b65b24084f SHA1 e2b2f4de3e9e14e653c4b2e9d0d8c040ee89058d SHA256 da807378b53b0b152b3bfc6e65e73aeb2b0596a992ab54d7fa95d8cab780a62c
+DIST firefox-11.0-sk.xpi 261711 RMD160 df733dc7658cfac0daecdd0531251f5831da4870 SHA1 9b81c70e8e14729ecfd00542ecfb747270c94d48 SHA256 e1bf0e15c2885079cac25da5003d9e74d6cc9fcfbcf548216ba82867e787bdf4
+DIST firefox-11.0-sl.xpi 247296 RMD160 1bc32589b2098a3cfa226502602965674c0bb29d SHA1 03a6e30272dfe3b0b2e58e84d7481ba92b740326 SHA256 168f633a177a4e8db59875bd0ba3c963003fa610ad54304a3f957b0611e357aa
+DIST firefox-11.0-son.xpi 245884 RMD160 c0fc0818277b68b2502d8575ef33529ffa9535f8 SHA1 1f450ce12c30bc7888c6c8b76ca10ee0a2a1e296 SHA256 86f2be651997df6049692da0f108815e2671703c0917fec1d8155f01c72f8280
+DIST firefox-11.0-sq.xpi 233843 RMD160 8799dbcf79f2833f72b6ea60bbc66782ddfef0f5 SHA1 a789d0ba6243f6e66dc3e1efc76eb3b8c46de6cf SHA256 33950d8d870a55caa792c37dee33520a0690a26085c0db54723fc7aa95221b4b
+DIST firefox-11.0-sr.xpi 284271 RMD160 0cd2f37bffecadaa9bdd258bd4445878d448fd74 SHA1 d239d828707bf18b33bc54b2b9578d8a45e082a2 SHA256 6b62ebc041153e0a1d9aea4cd57025a76d1b37ec4a6b8b68ff123ee18a6c4c6d
+DIST firefox-11.0-sv-SE.xpi 285870 RMD160 f3adc23fc6a993271254cd62ee2fe2def9265e48 SHA1 a5b74dee95d160a33c958e4567e4a81903b5f7ac SHA256 9d7011108e3572ce81f941cb1f1ddfd3737bb4322c3eec0d70ce0a389268ebef
+DIST firefox-11.0-ta-LK.xpi 297745 RMD160 5e0b8a18d77cfde04333b025f7ca03e5885ffccb SHA1 f14f852f56c79f1af73f6ebccede8f435a3462ff SHA256 ad156e230209572524e9a3bd54c0a6ca5e60c32c619b8da050c68d55373a0891
+DIST firefox-11.0-ta.xpi 281101 RMD160 5e12f9d9c6e3ee9e8e16e150fa75c6649f545eda SHA1 e6c6badb6d351cd8a0751506828a1f5f1f413983 SHA256 a4bb0e3703db8cb543360949b3eee2ad7693b51c12266ed8dbf5b907f5f0ed98
+DIST firefox-11.0-te.xpi 296969 RMD160 264f361cecbb916adeac0f95354cea6e7b7452fc SHA1 4c444cfd59a880dfc4cc9b392ec9b3f71e075e09 SHA256 69b64c9801a3e2a2a70d07de557e55d39f9b44a6d7015fdfc8ec92bb83dd0f35
+DIST firefox-11.0-th.xpi 278399 RMD160 5798db60b0209a2f04838b1dff5d7a4610157b09 SHA1 0738ad1a0a5f444d6c517f49be35fb5afb345f55 SHA256 24f5aebf2449e4c58c7979cb2e5e1d4fde169a83f1148ed35eb1969236c011ca
+DIST firefox-11.0-tr.xpi 257090 RMD160 fca7bb688e8d85e51b08d2479137dcd20d84e8d5 SHA1 cce1674f22948066925b3d5038696dcc74d5ebe9 SHA256 07eeff5c4ef546bc6796a022c01022497702472d529289cd9cefd56d7c7245e0
+DIST firefox-11.0-uk.xpi 286263 RMD160 c28e82cccbc50f8c1db6c21ed33030ab68329d0e SHA1 1955514feea687d0fd98b48c94a0539d6c4fba81 SHA256 7e3c1401126a420c9dc33af00b871dfacde87445895b106389da9a131741e685
+DIST firefox-11.0-vi.xpi 270003 RMD160 4063979f9f4e89b1d1e9cadd26082eaae148ad3c SHA1 48ae5778d061ede3686fc140711a1db22208ac8c SHA256 cc0bba45148ec8070ec235b1a4ed057138e1d550e4a24d18de6424fa96031bac
+DIST firefox-11.0-zh-CN.xpi 264047 RMD160 878d012915196794c8b91cbd5ee8651a881fb239 SHA1 44c55123f1017a8062d5e7437c69c9ac0bab113a SHA256 796bedad733422a4491198a452b5015a7fb5fe063c2dec86c79cd4c79b4f97cf
+DIST firefox-11.0-zh-TW.xpi 264951 RMD160 535675398aca6ac380f78367eb16ff9b2f6ad5fc SHA1 91fdc91fe632265ae5f3a88031b293371f3d8c7c SHA256 2e6f4dbf5495c400dd0b8bcb6760ed8d2036b502f082d04ff84c3d4c2264e264
+DIST firefox-11.0-zu.xpi 252923 RMD160 0b5feba4d11edec5edc7c60c3183e41e4ebc49cd SHA1 355a940a85d52481147b11b9b35dd9c09506b6d6 SHA256 425554cc1aa1664446167d6e244722fba4eb87de6cce5fcfb8e2a1c20fa63611
 DIST firefox-bin_i686-10.0.2.tar.bz2 17161122 RMD160 e3fce6dd99291992404cad53eabc4f88e58405a5 SHA1 ac20698ca1152dbde724553652b7ecc1ecfc4c00 SHA256 83b13b3b00bfd146f40c9795112582ebb10db6a75b5e971065283f51d7ea7aeb
+DIST firefox-bin_i686-11.0.tar.bz2 17693756 RMD160 6e8dc0781d963434178abb588f6c297482634842 SHA1 96a44eeb3076b4343b55cb21bfd7cd6fc59f5b05 SHA256 26683b58136972565d05a6891687a5852c0a624f312d36d2e857bb9068549fb2
 DIST firefox-bin_x86_64-10.0.2.tar.bz2 18876985 RMD160 b7884e5f83ab22677f55270fc9122c3e34149043 SHA1 37afae1f49427f3afa2c2a0050a26399c805991f SHA256 5d55d50340e4315915662638fd5ebb9e6b2fc09ff725b668621ed0e46d71cbbe
+DIST firefox-bin_x86_64-11.0.tar.bz2 19435299 RMD160 dc644c60ebcfbf4a2978f9392fc4e8b2ef5c21fc SHA1 299c39757974876a28ed504794f74f865275be01 SHA256 ed1a5a1d6abf4b7a2cb6bb5c4dd77c8364eae46bbc7f65751a9c07998286a046
diff --git a/www-client/firefox-bin/firefox-bin-11.0.ebuild b/www-client/firefox-bin/firefox-bin-11.0.ebuild
new file mode 100644
index 000000000000..8ae1349af915
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-11.0.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-11.0.ebuild,v 1.1 2012/03/14 08:34:40 jdhore Exp $
+
+EAPI="4"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror binchecks"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/dbus-glib
+	virtual/freedesktop-icon-theme
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+
+	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/${PN}-prefs.js || die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${D}"/usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	if has_version 'net-misc/curl[nss]'; then
+		einfo
+		einfo "Crashreporter won't be able to send reports"
+		einfo "if you have curl emerged with the nss USE-flag"
+		einfo
+	fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index 4ee86593d26c..1aae8ba8cbfa 100644
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -21,5 +21,30 @@ DIST seamonkey-2.7.2-sk.xpi 846757 RMD160 63a07468b28fcd9a402de3af3e89bdf8a24a91
 DIST seamonkey-2.7.2-sv-SE.xpi 875472 RMD160 2cbef365076e4f39aabb64da1f221e598a5f67ab SHA1 109283eed84de3cea9e9d60203f8c9e616690cf7 SHA256 363e2a655df903a8d1107be974b1249c6eb7c0d64a69a857bbd24b8607e34237
 DIST seamonkey-2.7.2-tr.xpi 813356 RMD160 1f664f3c05fb87bdf1d392c4986da5b4b397e3c9 SHA1 00fa96f96191243268d56c91784a32974f69ca94 SHA256 13948670c48933b0339973fce0f23510cb88a4814c59084176f32ae723d4ac2d
 DIST seamonkey-2.7.2-zh-CN.xpi 842344 RMD160 1106878510cfaab43dc11a6659c4785f2ec2b09f SHA1 14301697c3ddbffbbefb6500157a23f24c31065b SHA256 8cda45bb143e90514057ea1ac14b7b957f4f70a75927d67c418ba0906e8e8244
+DIST seamonkey-2.8-be.xpi 800574 RMD160 72d2d28d985b09023831aaf7d7151c0ab728c08d SHA1 3189db1a4b41fae2bd839bd870ede56176600416 SHA256 997614855880dd882683483965ad040697cf0ccce976e22ed940827d3d05a0f3
+DIST seamonkey-2.8-ca.xpi 817523 RMD160 14c09552949fade1fa3b2e5ea916d976774d5f63 SHA1 732a00fb55871d219776aa642814335c05e97a7f SHA256 3b659dbacbcf9ba799b28126d4b1597da461a63df2ccb63f016b18972a436436
+DIST seamonkey-2.8-cs.xpi 822824 RMD160 c25f0e640835c803a12f6e1a588d891945d23776 SHA1 8c5f3d683cfa154a78ff6250b3f3e801627d7a12 SHA256 2a2beb99f87eb599c647f3954f88cad206eef38b4fdd32f25fb733e68037c5d0
+DIST seamonkey-2.8-de.xpi 863884 RMD160 6337cc4b12f28d90ea8db94d63215951b7731f09 SHA1 02e851f39079a869120c32d54d03a9cbbb2bc345 SHA256 0e1c995ca6ce7dfdb34cc2296fad5b66745dae62ff1dceb849ed23dc3bfade60
+DIST seamonkey-2.8-en-GB.xpi 792963 RMD160 241df873f46d090d59eaeec6445a3b442ee7f8c5 SHA1 14ec6e0ee4529d9efe0c5cabbe8b2c60590ea87d SHA256 24307d8bf3dfcc2ba83292d4b2539a46be15618ef3afbfef9e119488dd788628
+DIST seamonkey-2.8-es-AR.xpi 863651 RMD160 8a9249bd4c9bc1791373d39e18b37d78d28a98c9 SHA1 e441b2763b1aff9af69d2bc564e8f2bbde368533 SHA256 f6bc81d10f75415b5949c7b390d509ba28d874db754af19d2effe19a24c9b8e2
+DIST seamonkey-2.8-es-ES.xpi 793143 RMD160 65d86bf74762e55bdbb68c22cd4bf29ebb30fbbc SHA1 d407e84566bae538976ccd30481d9219b557e5ed SHA256 65af6104c9727c0dd49188f67690145bcfb8a0b1c90638f2a21bd96b67568922
+DIST seamonkey-2.8-fi.xpi 813054 RMD160 48d0fbfc9416cc76dbd92ee8174f70838abde02a SHA1 a2bf96985f208e54f73ff6a7a11a77dd131100d3 SHA256 a1a00e5dd521a61ec0adb16d39342e2cf2950157fe35e0082e1b0b6c2249c345
+DIST seamonkey-2.8-fr.xpi 818934 RMD160 8b9e0d7dd16afde8eb9854e19f40fc4cb445fcaa SHA1 c8c8904ce68fb0028d621c101bbfdb07f9f9e222 SHA256 26588e288ea0a2256f0e29c7959e4e5ed324025eb5bb714b7cae50e0d0b5702b
+DIST seamonkey-2.8-gl.xpi 812940 RMD160 0db5df8625b157901f3426dae287518f1fa72483 SHA1 18c2689dec4cd3b42ec8ada5a1226d6ba5c6660a SHA256 1aaff3b636039ff6b5b6c19de6aa37fe902d250db5eae5f46b0c0d340ec0af38
+DIST seamonkey-2.8-hu.xpi 837222 RMD160 3481ee01ea3b38040e617a3f37d9fde89677a57c SHA1 20158b4eca18c9f90af55fc70602459a666fe4b7 SHA256 d778a4aeaad236cda0c0d9b9e0bf7776a650123d61015d5bdd070137cbf9d0cc
+DIST seamonkey-2.8-it.xpi 743400 RMD160 027d429fcb08b3903b3c0ae5d8b40d2a53380945 SHA1 fe7447c53861fa0218091bdd9abe9ef2d9c7afdc SHA256 d8256dd2be70661a6e3f0c679617de2d3617e26be9e4e85b569c292c2ee240d2
+DIST seamonkey-2.8-ja.xpi 867984 RMD160 5d7f6cc2166afeb7e3aaf7ca8b747b2fc5200ba8 SHA1 fc5de20fe07f7b11c7b7da5047088d8a41ddb853 SHA256 5b7fac14ecc6d6a227633e4a26758b98d118451f1cb487fcb395a8c918e1bc0c
+DIST seamonkey-2.8-lt.xpi 948289 RMD160 f9582b4084b59ee3fdb6cb578374ab46034423da SHA1 6e68ad03816ea03e48b67461ed8bdc74453d23aa SHA256 866cda0d59811f9093c7a56698eab53e6a905c7af920d73d7107fab0e6293f16
+DIST seamonkey-2.8-nb-NO.xpi 811218 RMD160 8246d0c80646360c310542e5a25126a23c233cdd SHA1 6bad979a2702f636a9bdc1ad772918c3be9ac5e1 SHA256 b71b7cc1feafcde260da47e3ed743d9d14c223eaeffaaa6ddf014982232de907
+DIST seamonkey-2.8-nl.xpi 809835 RMD160 b833df920e3aa494651965a042e4e985bcfdf4cd SHA1 eec10fc90227c333678e6eea8054288ae8ddd2ba SHA256 71649e50883f88f9c1612575fdf67aa8ea19c2957c1e3f9a292f34d4d2445646
+DIST seamonkey-2.8-pl.xpi 832123 RMD160 a320205ff7af79a333959ce965fcc666686dddc3 SHA1 9b4a76b2ed90b118605d5fe1117f85d42568d09a SHA256 9f2c8ce8da5ab24699f6ec0347ddc890b62907cc5aeebaa1a355e2d1a9db2712
+DIST seamonkey-2.8-pt-PT.xpi 848623 RMD160 1cbd7add1fcfe80278a2478b2091d12778b79816 SHA1 77d697b728799ee4a19c11f0f117c1a0392c6756 SHA256 0e11e9a5d6e69df2d01f45c9016609ec8c9dcb99f58e8152f38aed592f67549f
+DIST seamonkey-2.8-ru.xpi 897790 RMD160 165f69b0f929166d4ca8b43f992886922773a74a SHA1 7456f79da88007a507c54849fb372dd34b5a759b SHA256 a146ec50f01fceee0a5a96ea7a86319933286a15920034cce23538a9c8183fb8
+DIST seamonkey-2.8-sk.xpi 846539 RMD160 49f42923b3b7e767d1d140f6e77ef95edf7fe9f9 SHA1 46c5cdce2a80e865ecbecf9cad0781af7e00a1c5 SHA256 1a4fe1979d255169e10db77effed5432b14cfa567a342cc4b15b69e244823e29
+DIST seamonkey-2.8-sv-SE.xpi 874977 RMD160 fa65e1a5119de33908ccc5426c8c4550c10fe39f SHA1 66982b4b8a70d5d63ba6fa4b1a58217cd72b6c30 SHA256 632d188fe2838723fc23a7b816897bb7eebdf94784a38871e6e8a7126458c192
+DIST seamonkey-2.8-tr.xpi 813371 RMD160 2262b1f996ee2082edf62d84c6eae74f9eb5ae6b SHA1 4f502305df8666457d36e00e2f7e642a27aeee26 SHA256 ba3d1dc18d0743cd00c67c102dbc3468d05874bd1f16f3695c7b601d56107f6d
+DIST seamonkey-2.8-zh-CN.xpi 841924 RMD160 52b230f585511922110a28db13c1781556227a74 SHA1 88faaf4f8a77f2839c5394e30aeb32f673efe7b4 SHA256 f5b654657984d34a3710dccf99e19e6d5167c69373ebe49e2899db21f3739290
 DIST seamonkey-bin_i686-2.7.2.tar.bz2 21277328 RMD160 e758413b8f77d623b9cbb5dcc9171b12b6490c69 SHA1 ed57b8c22fd7a78c3ddc07ba78b9a26bfe6c494f SHA256 acdf399ae56c7dc065f1ca59ea57e45858e3a7b73cf5c273e70230ada34e253e
+DIST seamonkey-bin_i686-2.8.tar.bz2 21384254 RMD160 61e899d987b610ddc95d66eca41775aac9d0d500 SHA1 4a71e11e2421813ac438b76ee111c1d64d5a2ea6 SHA256 3a0a576d822a4bac3f3dccf5869bdaeb00cbd47d3679304517a338a8229c7389
 DIST seamonkey-bin_x86_64-2.7.2.tar.bz2 24147835 RMD160 609c17cd0efa515389c8bca8342071c973a1aca4 SHA1 7f8caad2fa4df284e5c55f35e756df384f7803da SHA256 ec6daf51f780f9ea5f79369acede0f409ea6f8bfaef00d46603229643d0b891f
+DIST seamonkey-bin_x86_64-2.8.tar.bz2 24439583 RMD160 69388f84a210e53255ca0ca88bcbf272533a8d31 SHA1 46c2e1622073235ae3d3fa61d023733453308896 SHA256 1a06f0066d59725055f48b043f4abfe7b624a85774dc22703e24fb60cf49f6f9
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.8.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.8.ebuild
new file mode 100644
index 000000000000..e609b53f1eab
--- /dev/null
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.8.ebuild,v 1.1 2012/03/14 08:32:32 jdhore Exp $
+
+EAPI="4"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+pt-PT ru sk sv-SE tr zh-CN)
+
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.seamonkey-project.org/"
+RESTRICT="strip mirror binchecks"
+QA_EXECSTACK="opt/seamonkey/*"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/dbus-glib
+	>=media-libs/alsa-lib-1.0.16
+	virtual/freedesktop-icon-theme
+	>=x11-libs/gtk+-2.10:2
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/seamonkey
+
+	# Install seamonkey in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/seamonkey-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/seamonkey-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/seamonkey/seamonkey "\$@"
+EOF
+	fperms 0755 /usr/bin/seamonkey-bin
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}/icon/${PN}.png"
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	if use startup-notification; then
+	    echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 66a45d192347..fd31d47ac761 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,9 +1,10 @@
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
-DIST enigmail-1.3.4.tar.gz 1369381 RMD160 5691a644368982038352c9da45a633ca72e85c36 SHA1 601ec7e4e8eb1a732d26d650392680b4415b56b9 SHA256 967b1c3ff24d87ab05207aff6f40adaa06b302f9e753c0012896e47f7ef75c39
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
+DIST enigmail-1.4.tar.gz 1323467 RMD160 b3c717e150c826faae1daa09806e07dd16619c51 SHA1 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4 SHA256 c63990dad45d6bce3e691f75aa226a203f6fbbc2397415df72b289230e2c982a
 DIST firefox-10.0-patches-0.5.tar.xz 16708 RMD160 40ccd212e16d4e5dd389db95aa7be0fe68361073 SHA1 3ca7cb54cdc2b704fe468cc26e1818648635b514 SHA256 981f40b1f2f12439d1301a0f7f4171aee4b84b16fe6b926344b63750efb21158
 DIST firefox-10.0-patches-0.6.tar.xz 17400 RMD160 aef02ec0471a0136a0f60ad08874f688afa66d15 SHA1 48d8a41370c052e7efaa9af25c9da95e03d38f2e SHA256 7cd959597a45fdbd6acbb8092c63d1fcf58beb32b99140f6c05109005a0db05d
+DIST firefox-11.0-patches-0.1.tar.xz 12632 RMD160 2e579ed97910225eb42670b299177128374e9493 SHA1 c1a5a8cc3110406e7b1913cc99e7d1b601e88bf6 SHA256 0e073f0394d631346e273592e2c89879f6d47ecd58e7c8a25ff58d8510db4364
 DIST seamonkey-2.0.11-patches-01.tar.bz2 17740 RMD160 00747880b61bab159a48cca01766dd788fdbfcee SHA1 5f3be090d2d65d361b2b337fbd2c30b589cdfa3d SHA256 1d032cdb98a65910b4ec5c64e4649b7a25fc2a8f604b0ae2f7a24199d408e76e
 DIST seamonkey-2.0.14-be.xpi 482603 RMD160 c70bea0d4d877112d9624c20c82445599188b736 SHA1 a3413bdbaaea8032717bbb0e10fee24f1b89e9f9 SHA256 c803810ff7942252519cb89b25665416a11251281f435909626e5fb5a514f6a5
 DIST seamonkey-2.0.14-ca.xpi 488176 RMD160 761a5ce8bc202156f98bd340f26c080614640314 SHA1 24d917d90a066360a9814d74a0e60a4d2037a3c5 SHA256 1fa18a23049110de5d08fa58796dce6fb3d71d6ef4aa73dec480a3b09e73726e
@@ -56,57 +57,7 @@ DIST seamonkey-2.4.1-sv-SE.xpi 868805 RMD160 2690682a12f26ed56ed92c7b5f128f64241
 DIST seamonkey-2.4.1-tr.xpi 804414 RMD160 3badf04a1642e8d993af6d724c947dc491d65107 SHA1 671a1077f66e330d97c88d18bb63e0168253394e SHA256 2c0448405ce91d2b2320ad16015d14dbb112a4942b8b15c49464807cc4b76f89
 DIST seamonkey-2.4.1-zh-CN.xpi 834997 RMD160 5f867a6bc455c647b374f6acabb7352945c371f4 SHA1 5164248e3cf49de8f35d53a5ed426629148c0be3 SHA256 059937312fcb741f8b01743b2e2cab149d325098144d4275d635bda49921bbd4
 DIST seamonkey-2.4.1.source.tar.bz2 87970263 RMD160 88ec6ff8c32a478e95ed792c8bbba316896d6909 SHA1 21e433a407bea5a5b749fd4e86a2eacc9c73e474 SHA256 3e4f289b1d8beae6042868b899fe7424875557cd43135ebbbbd7fb16a632803a
-DIST seamonkey-2.6.1-be.xpi 796446 RMD160 9462901029801664573f52a1adb6fd61c6dd3a7a SHA1 5c0f45561108f8f78e1081398cb84ee241cdeeaf SHA256 1161d880d808e10bbd6f3650d1cd9b596db675b09eddce919efacd7ebcfd534f
-DIST seamonkey-2.6.1-ca.xpi 814467 RMD160 b6b569b57e555193964453f7065b5ec89f4f2db1 SHA1 78489397a17a50e002f9f017fd937dcfa3877a86 SHA256 8901fde4a91e6047c22b775762f9e22f8045a8ff7bc94ec734b88d616587f8d8
-DIST seamonkey-2.6.1-cs.xpi 819663 RMD160 b1d96919f8245fe592a78ef4d69ce63938a35cd5 SHA1 de9b87f341d84e7b6bfce5e33407da634c1d5f65 SHA256 b6d60048f4eb08a2d7a902764827e3e43f070ad46803e04041a0ab5989ca0c5b
-DIST seamonkey-2.6.1-de.xpi 860451 RMD160 80d2ad62e8065fa8ba887169d37e480e84832f0e SHA1 071f3fb89d3a9939f5513a3b930f3009a9bd0f74 SHA256 665aa93223ddab7c2dfd2fbb1e71e318b2399ad17d90f1213c0ce599d7ffe1f9
-DIST seamonkey-2.6.1-en-GB.xpi 790669 RMD160 0219d6ba1437c406ca0f5713f6e5da802b64fa6e SHA1 7fa7439dedd312183dca14e572f78544c3116588 SHA256 20fa5684d1a7a94af4bad8f9072ad874568c3a790b9a7910a43d317699213581
-DIST seamonkey-2.6.1-en-US.xpi 789696 RMD160 54a42f7a380a81803cddd7fc4238f8368649494f SHA1 ac5a88ff5c73e3bd4615ba1100c9e264d1718020 SHA256 4160fecfeacf1af9e18617ed8022185b0c89eeca08c42266b55f05a1abf415ae
-DIST seamonkey-2.6.1-es-AR.xpi 860259 RMD160 f6c1be1e69f0840daf6ab9ba3d9613aab4b18756 SHA1 321c1053bc605512fb45a161e7726a5e54f05fc1 SHA256 f8af8390ca191fbff1883d267da1b873de7ed020c170ff41b03592fbea57ed85
-DIST seamonkey-2.6.1-es-ES.xpi 788486 RMD160 a0dbb9d8a7f60f10e48b581302036dd9589d5c4a SHA1 64723ab703bedba9cbd16eb52ec86fc74a0d37b8 SHA256 1090f2d5b7fe584b61f8c9e5f413c4de6e696427c025eb5cc46a49c7a5163a55
-DIST seamonkey-2.6.1-fi.xpi 809902 RMD160 e00addc210b2c8f501c5e09246891e0227e6f9f1 SHA1 5e892d4f4810a79e0920ac5ec25d6b2988b71b3e SHA256 9a413439b50fea361528792fcbbc75c5daf8b7b83278302484a9926c685e873d
-DIST seamonkey-2.6.1-fr.xpi 815679 RMD160 6d74016b28c385dca896e32d7e2f315ab578757e SHA1 0f3c5d951c2063cde1c4dcb0cfbf9a4a70a4645b SHA256 790e6c4a80ccd8ddf5fd1051a8d9989a17f6e0778f72534a7d3b8800cd58cdec
-DIST seamonkey-2.6.1-gl.xpi 809738 RMD160 a17983218ae53c08a8e06b711b0c2b5617a64420 SHA1 a34765e6c1e0023fb7670d3b83733fcb69e556d9 SHA256 e7aef5c0ed5ebe3c7e2ba9d103e45585d0a31efb2dbe5ef93dc25c5e531386bc
-DIST seamonkey-2.6.1-hu.xpi 832651 RMD160 1a7d7f9c6ba8e7e772f82094c183dfee3a4020e8 SHA1 404e5775aa5b843e3c8c3e0662ed43c9cd26cc1c SHA256 499242f3489875aadd90248e756509142943143abae8979806c959dddb7e7cb2
-DIST seamonkey-2.6.1-it.xpi 738879 RMD160 56298d0526e979888a9165495dca31a92f16f0d5 SHA1 9a6448846d92911773df4a2f6e8c66987d486583 SHA256 c769906b6229538fd4217dd2acfba6b2a0945e8481da7467b97cda5148e523ec
-DIST seamonkey-2.6.1-ja.xpi 864874 RMD160 34f1c329fb50d559dca23aa535de32cd4d0808fb SHA1 80998c9903d0032d4b2298511608d9ee0561fd06 SHA256 6bd6a5b385bc0b89fdfb780883f7db55445322482a36fd7fc687d4cfe65ecb3b
-DIST seamonkey-2.6.1-lt.xpi 962668 RMD160 b7de11d97c2491599975a271530d8c876e7aefc9 SHA1 920623db9e262233e33d35a8fc660bac3fa0fa45 SHA256 c8473fd1509262344d3c5544f35bd756cb08afe4ac52d2c5d1383708b87c442e
-DIST seamonkey-2.6.1-nb-NO.xpi 808226 RMD160 566817462461015731fe15e38de163f0f4f96de0 SHA1 86f4c34fec44da327e17c4c934196198474372ad SHA256 0ac8f8fc7651f76fb9932306610713ad7d7ca5d148afe975309dc117158f1fef
-DIST seamonkey-2.6.1-nl.xpi 806821 RMD160 13f24e9ef32b6278c387e1c60f0af772555d8f58 SHA1 a2896e8283b8561d38527550dc3d6b515f76019b SHA256 d7d940e2f795e84fe1075118d666dfa886bbbcf5b93df201caad3c76acd539c8
-DIST seamonkey-2.6.1-patches-01.tar.xz 14444 RMD160 2ee1e41805cd8488785830fdcf1afba431afaf66 SHA1 cc9f33bf18c9395c05f1ee24154472281975e429 SHA256 9a73d802179417620b45e345e9e8edc24c86d860679fc1708d76a7d761551566
-DIST seamonkey-2.6.1-pl.xpi 829358 RMD160 cb4e848092e99f8984c3f29fa0fb78d6d6e7e857 SHA1 e9b00f7e3fc509389fccddcdb8d71a6b094bee6b SHA256 8b7fe919df85734ce1fc3cc4104796f6e1ba56c19206b7ad8b1cc5822953b2b9
-DIST seamonkey-2.6.1-pt-PT.xpi 845394 RMD160 3fd1892a07391ffce974a49a80cd9964d02a57b4 SHA1 f0e53b3035ee664e36d78fe4f8889466e556f831 SHA256 2e102d96d9eb457afd46c810ec8d30d643ab712e98fdf288941f9a45a4f83a35
-DIST seamonkey-2.6.1-ru.xpi 892796 RMD160 79c045388d2cb11f3056006538ad6ec61231339e SHA1 7823bba47582a02dd428c766df2e6a4cdd25b5fd SHA256 b2647b90c8a433a0473031f35e2b6692dfe530eacf8deef9eb493282aec187aa
-DIST seamonkey-2.6.1-sk.xpi 843101 RMD160 c7a21ae21afc970a9a35a2742040c55cb8d6f31a SHA1 b1adcbdd1e0ff9267a05fd638971095fd1a10689 SHA256 d7d59f1bc495fcf060d985e34e4364472246eade6bc712e37b325c33369bf8cc
-DIST seamonkey-2.6.1-sv-SE.xpi 872020 RMD160 80970d2a40f34177a746f05ad7578852549b205e SHA1 078a1c179726014b43e043d77d09493df941e21f SHA256 6c645239f7364291c6618a761085ac887bedf842f69a6c726583f833ab2fbe73
-DIST seamonkey-2.6.1-tr.xpi 809261 RMD160 a7c42a33320e7676c29b89df9276433fc3c722ff SHA1 2590e4b029032ad27bf3e22235c915ddd2a6ea6a SHA256 9f00b06289d4b0c7aa0f407ad6470fde8853be12995df5fabe00dbf63394dab7
-DIST seamonkey-2.6.1-zh-CN.xpi 838641 RMD160 0a0ca5d40c60bbce11169724d738525c8798f11d SHA1 f4d52291e1d1762648acf1f37eeef7d904d03d06 SHA256 21c08d969422013013798560824f6eb70bb21fc4056d8892e776a60da2158cd9
-DIST seamonkey-2.6.1.source.tar.bz2 96737319 RMD160 06e448d6d17226b209edb089fd59609d32e37ca4 SHA1 8309ddc99db05f61cfa9cf40e6c60ff62ef190ea SHA256 7b73979b94f00532a251377213345dba347774fb881e2c2c74f845b36e26e2ee
-DIST seamonkey-2.7-be.xpi 800745 RMD160 68a1b31fa7624b0decc967b7b362e6858cd49221 SHA1 2c8a5ed8aea053f050e3b96d3113cde703b505ec SHA256 02951e90e36f5f5e37bdaf663dea41b8d50534cc3060902b7479e73b32a05f9e
-DIST seamonkey-2.7-ca.xpi 818013 RMD160 8ac8e44f515454d28c26234b072a5de8bd4d3ed5 SHA1 2273f660a0e66456ec1cc1db6f67c3f52faeed59 SHA256 996a4e3a2c27479664e6b93d2629d6ff0a3db59e77d9e4bf68491b705bd96ade
-DIST seamonkey-2.7-cs.xpi 823251 RMD160 706ec874e59e76a14e6f82a126d730b2d42a9300 SHA1 af967c7ec03e6d0daa00932c71a4f1c0fe3ed55b SHA256 44eb89865c5c6ccbadecefb71656348dcf67714c476b5d766893ba0edfcf6edc
-DIST seamonkey-2.7-de.xpi 864251 RMD160 c3007b16c3d1260ef29d6e788fb568156887594d SHA1 ed56e09257b0eb7a5f589220c137ce02870d6bde SHA256 583e7f35ae091d150d962aa7b966e944e7d49922ce9cbcd6aa5c918930122908
-DIST seamonkey-2.7-en-GB.xpi 793485 RMD160 0928aba47c36f09f3f64e4aa170e8fe1fc8e801c SHA1 66335712c839404cc658d9f968f386249c1bd26b SHA256 2e741dc1d709df3e23bfac40bb8ece7ba19dbc9bb49f4afc12998f4bae455a4e
-DIST seamonkey-2.7-es-AR.xpi 864071 RMD160 2a5c1c05bff14efe513a7625ea9233f982ce364a SHA1 1a882fdae77c259390207e8f87cfc990a7902c7b SHA256 931428884e68fc5f1fb0d4a3b2060c2857e9c9bc16c581b64e05b33190df10ec
-DIST seamonkey-2.7-es-ES.xpi 793320 RMD160 1a25362f9671804be23c9be4b4d1da2efe503344 SHA1 f7c3840b251e1b733b17f7b019f31eb38859e63e SHA256 96a188bc2ef091e9f8acdfa2f2ebe7a6e4f863fbcc9a802fe54fd19ef78b280c
-DIST seamonkey-2.7-fi.xpi 813471 RMD160 8acf8aa57c7f9bfda29745845d60c5845add1f5e SHA1 9f70c89999907c80826c250fa5bc7ab92d1bf8a4 SHA256 90e089a458d5127037cc1a78e96a3fdf45153e4ef6011ac040c8760f44febf4e
-DIST seamonkey-2.7-fr.xpi 819341 RMD160 886fc9634db910e27b525a0c48a3c0761e258a0d SHA1 f9643f887d11c40a712d2a51bf7dc5ac09356719 SHA256 02965964bcc29bc054d0b8f334281e8ad14e701bc9347fdbde627221832ea6ac
-DIST seamonkey-2.7-gl.xpi 813287 RMD160 7482da9161806d40791451a109bcc075c46800df SHA1 f3751e263ae04ce663e9686465ccf291aa270745 SHA256 283df961efe05ca29c687468d98a01c0bdb21d59177cc19717d2d91ed6712d12
-DIST seamonkey-2.7-hu.xpi 837466 RMD160 50400f2913882f16c22244305fa0cf24f0ad7903 SHA1 2fbec4c7e6f8850fc7a74641590d4002e6f1c1f0 SHA256 a003fce813ed94f0c16767a0e9f259d25c77e741df23cef7c8199d8b7b2735d8
-DIST seamonkey-2.7-it.xpi 743648 RMD160 cb2fc834e5015ac943926c1c1cd9760c3724523c SHA1 3d1ad4f770bca837553fe792ba178d93d5fa1599 SHA256 c552fe50c328348d671d0994982ac4065bee447b901d107b77ec2ff54bb7104a
-DIST seamonkey-2.7-ja.xpi 868187 RMD160 7913984fd29dbf511e1393189e28f3589d8175aa SHA1 781d8343d49dd3e1a51d46b2c3d7147224b8e56d SHA256 717041a84bd54aedc3a7e9ef06d3ecbd196100468fdc9e7c17e7cd7682455481
-DIST seamonkey-2.7-lt.xpi 961272 RMD160 9773d9e8c1ff155dd5bda052fd363a1aa3fece59 SHA1 c3296aa87c3f7da308697e19d5943e83e6953f7b SHA256 66bd557ac7e55426f946d3ab28617acae3877d7274aed3f6f690413cfecc198d
-DIST seamonkey-2.7-nb-NO.xpi 811691 RMD160 72cf79b1d7a346b83410c702bc5888a6700c03d3 SHA1 7293d8d72513cb196f21ba5b7ff05aff8ae0a006 SHA256 0fdb4f45b3e46556e89c2a32545cee43b36560b4c40964d07b28a4272da010bf
-DIST seamonkey-2.7-nl.xpi 810216 RMD160 ae6c1287697d459c028f8d38fa1629c89bf0a36c SHA1 8e2516295c3aae8655f3268712e15c9abbce9a95 SHA256 69aa91de5c1d1c6c1c7e9f55833add25538b1df70dd99f0185c982285c528314
-DIST seamonkey-2.7-patches-02.tar.xz 14652 RMD160 960dd419e072912c6c7937ebe29066839b11939b SHA1 1db5994786346f0c6cdd6dcd6f11c0e4e44293c2 SHA256 bed1f10ea00be91650d687368e6b5282cdff2eaabe436463cad3aaf619b9d542
 DIST seamonkey-2.7-patches-03.tar.xz 1080 RMD160 bab03aac9c6bd1d5aacfe87f7c3792a15fd0250b SHA1 6a80c1d6ee057e8f557af59d350543c6ba0cf57f SHA256 eede05439b5555871082652abe01c13b1f859640d8ac5df3001623c1084abec8
-DIST seamonkey-2.7-pl.xpi 832577 RMD160 3e838f2369e129af5822a24282420178ca50f9b5 SHA1 61499be54442a5ba88d8f9f52149022d270789ec SHA256 d8449c3d337f71a07fad7d1d0acc375a473f2ec25b2eb58240a3ee7cb0cc80bd
-DIST seamonkey-2.7-pt-PT.xpi 849093 RMD160 a4858eadf60a3d9f9cdd24534b43f150db443e25 SHA1 2962286bbcfb81d77c17cc7e9126d2dd4a9962ef SHA256 6ab8eca4e7d5dc27bb4702845bb7d7cd493795fec12fb19cfef0c39ad9928a74
-DIST seamonkey-2.7-ru.xpi 897928 RMD160 b8bde901c7858cc0ecb7de219dd3207761ec659d SHA1 f2bead7318712ea2652715bf27171e3a2ca2bf20 SHA256 3173124e390b4a6664dc8e609a31ffdfc6e3cb728bde7a27672a7fb9cb88f6b9
-DIST seamonkey-2.7-sk.xpi 846755 RMD160 d91790de5885cbe7f719e56911f7aa6dc58c99a4 SHA1 bc90cdd397f5b28039a2ecca3b38b3f21e846580 SHA256 809b823c65ac58b9520dd45a2e5be3ed23d7290d73740672e875cd69b695370c
-DIST seamonkey-2.7-sv-SE.xpi 875470 RMD160 6a4451fd6a815460e46f1096f747f630c2bd3088 SHA1 4bed0f5a6a0a82f5945ee6f24e1347ba3b4dd743 SHA256 a9a4a63aa6f34a5bb8a188816faad88af30bc159d8269b2485a595aa0ed373c2
-DIST seamonkey-2.7-tr.xpi 813356 RMD160 de9fb4fd401ba36dd3e09ba7c6e78e4778794d26 SHA1 0babba594aeaec2f01eeb9f9bdf92d1ff4b07b46 SHA256 07a67c6707f7a918d33e2ccebfe15aca6e4123046d4669eb76aedad6225a9780
-DIST seamonkey-2.7-zh-CN.xpi 842340 RMD160 bdadbb97da6536a7d8ff9dfb9363941f4499fba9 SHA1 0c26e89e297c4958900a498c4540a9a1d2a7063a SHA256 dd656ade4233c51cd75c51739a5b770f26d6fe6ee6f5151da5823dd529cac063
 DIST seamonkey-2.7.1-be.xpi 800746 RMD160 8bbeab4c358547c653fe6bfa0c56422c391d5e57 SHA1 9f197da5b1a521da1df02f4aba5dd6da37e8cf90 SHA256 b88db6d126d36b7770f66d5edce765ce46d55b4222730e9ab78f54e1a6359b4c
 DIST seamonkey-2.7.1-ca.xpi 818015 RMD160 b57c0a931c4465e0fc8a8f95d89f7fcbf3f529fd SHA1 315e38517a7818d6c4670b1aab4900c3a30d8400 SHA256 3a0ab33210ef2ae036347969e6e48e5bc37809d2f0b0a0d7332d51143c115093
 DIST seamonkey-2.7.1-cs.xpi 823253 RMD160 ef9be39ecadb81e4ff0edfad838e8284e2ab3b95 SHA1 39877b8a1b53458a986fe35d71cc4f092a9cf172 SHA256 fa45342b3754adf18dd463568bc0ab12a778e32ea8716c35e7681ece12496d7e
@@ -131,4 +82,27 @@ DIST seamonkey-2.7.1-sv-SE.xpi 875472 RMD160 f53fae5d2265d31a39adfce87e6325171f6
 DIST seamonkey-2.7.1-tr.xpi 813356 RMD160 db44fd07fed7ad71e329d0e4a986e307450b6eac SHA1 9ceb0cd915c6ffb7c38a12567025e7159ab57f8a SHA256 cf1ee822f7ae74ef267c53562848033add5f006488aebadd2ebc47ed22b82ced
 DIST seamonkey-2.7.1-zh-CN.xpi 842343 RMD160 fe506ea7ab500c7fbb1949f5e2188d84dd769e52 SHA1 0fac22454bed4feafc71e00ac650abdbc658b418 SHA256 464a707bec0c91587c2131e15d1f40245f04e02a9bdf9bcc7936d8a4339435d1
 DIST seamonkey-2.7.1.source.tar.bz2 98493950 RMD160 a7be15836ce1cc2def1ae93b5dd9d85f34ae77f8 SHA1 ddd93f118d2b47e53bb55646e121f653e80f2e8b SHA256 3d75a1a321cf4c30037b6fc69d3b757060f6aa94b8b329de77db3fe95c31e34b
-DIST seamonkey-2.7.source.tar.bz2 98045633 RMD160 a7c731fd281d8924732d726cb6e4267384e11947 SHA1 72d3e8d928ba29b40b00f735083cbfc48589eb9b SHA256 695c3e4767262fac35bcf80f71dcbdfbc1172cdd323338ea530f6680283aea2f
+DIST seamonkey-2.8-be.xpi 800574 RMD160 72d2d28d985b09023831aaf7d7151c0ab728c08d SHA1 3189db1a4b41fae2bd839bd870ede56176600416 SHA256 997614855880dd882683483965ad040697cf0ccce976e22ed940827d3d05a0f3
+DIST seamonkey-2.8-ca.xpi 817523 RMD160 14c09552949fade1fa3b2e5ea916d976774d5f63 SHA1 732a00fb55871d219776aa642814335c05e97a7f SHA256 3b659dbacbcf9ba799b28126d4b1597da461a63df2ccb63f016b18972a436436
+DIST seamonkey-2.8-cs.xpi 822824 RMD160 c25f0e640835c803a12f6e1a588d891945d23776 SHA1 8c5f3d683cfa154a78ff6250b3f3e801627d7a12 SHA256 2a2beb99f87eb599c647f3954f88cad206eef38b4fdd32f25fb733e68037c5d0
+DIST seamonkey-2.8-de.xpi 863884 RMD160 6337cc4b12f28d90ea8db94d63215951b7731f09 SHA1 02e851f39079a869120c32d54d03a9cbbb2bc345 SHA256 0e1c995ca6ce7dfdb34cc2296fad5b66745dae62ff1dceb849ed23dc3bfade60
+DIST seamonkey-2.8-en-GB.xpi 792963 RMD160 241df873f46d090d59eaeec6445a3b442ee7f8c5 SHA1 14ec6e0ee4529d9efe0c5cabbe8b2c60590ea87d SHA256 24307d8bf3dfcc2ba83292d4b2539a46be15618ef3afbfef9e119488dd788628
+DIST seamonkey-2.8-es-AR.xpi 863651 RMD160 8a9249bd4c9bc1791373d39e18b37d78d28a98c9 SHA1 e441b2763b1aff9af69d2bc564e8f2bbde368533 SHA256 f6bc81d10f75415b5949c7b390d509ba28d874db754af19d2effe19a24c9b8e2
+DIST seamonkey-2.8-es-ES.xpi 793143 RMD160 65d86bf74762e55bdbb68c22cd4bf29ebb30fbbc SHA1 d407e84566bae538976ccd30481d9219b557e5ed SHA256 65af6104c9727c0dd49188f67690145bcfb8a0b1c90638f2a21bd96b67568922
+DIST seamonkey-2.8-fi.xpi 813054 RMD160 48d0fbfc9416cc76dbd92ee8174f70838abde02a SHA1 a2bf96985f208e54f73ff6a7a11a77dd131100d3 SHA256 a1a00e5dd521a61ec0adb16d39342e2cf2950157fe35e0082e1b0b6c2249c345
+DIST seamonkey-2.8-fr.xpi 818934 RMD160 8b9e0d7dd16afde8eb9854e19f40fc4cb445fcaa SHA1 c8c8904ce68fb0028d621c101bbfdb07f9f9e222 SHA256 26588e288ea0a2256f0e29c7959e4e5ed324025eb5bb714b7cae50e0d0b5702b
+DIST seamonkey-2.8-gl.xpi 812940 RMD160 0db5df8625b157901f3426dae287518f1fa72483 SHA1 18c2689dec4cd3b42ec8ada5a1226d6ba5c6660a SHA256 1aaff3b636039ff6b5b6c19de6aa37fe902d250db5eae5f46b0c0d340ec0af38
+DIST seamonkey-2.8-hu.xpi 837222 RMD160 3481ee01ea3b38040e617a3f37d9fde89677a57c SHA1 20158b4eca18c9f90af55fc70602459a666fe4b7 SHA256 d778a4aeaad236cda0c0d9b9e0bf7776a650123d61015d5bdd070137cbf9d0cc
+DIST seamonkey-2.8-it.xpi 743400 RMD160 027d429fcb08b3903b3c0ae5d8b40d2a53380945 SHA1 fe7447c53861fa0218091bdd9abe9ef2d9c7afdc SHA256 d8256dd2be70661a6e3f0c679617de2d3617e26be9e4e85b569c292c2ee240d2
+DIST seamonkey-2.8-ja.xpi 867984 RMD160 5d7f6cc2166afeb7e3aaf7ca8b747b2fc5200ba8 SHA1 fc5de20fe07f7b11c7b7da5047088d8a41ddb853 SHA256 5b7fac14ecc6d6a227633e4a26758b98d118451f1cb487fcb395a8c918e1bc0c
+DIST seamonkey-2.8-lt.xpi 948289 RMD160 f9582b4084b59ee3fdb6cb578374ab46034423da SHA1 6e68ad03816ea03e48b67461ed8bdc74453d23aa SHA256 866cda0d59811f9093c7a56698eab53e6a905c7af920d73d7107fab0e6293f16
+DIST seamonkey-2.8-nb-NO.xpi 811218 RMD160 8246d0c80646360c310542e5a25126a23c233cdd SHA1 6bad979a2702f636a9bdc1ad772918c3be9ac5e1 SHA256 b71b7cc1feafcde260da47e3ed743d9d14c223eaeffaaa6ddf014982232de907
+DIST seamonkey-2.8-nl.xpi 809835 RMD160 b833df920e3aa494651965a042e4e985bcfdf4cd SHA1 eec10fc90227c333678e6eea8054288ae8ddd2ba SHA256 71649e50883f88f9c1612575fdf67aa8ea19c2957c1e3f9a292f34d4d2445646
+DIST seamonkey-2.8-pl.xpi 832123 RMD160 a320205ff7af79a333959ce965fcc666686dddc3 SHA1 9b4a76b2ed90b118605d5fe1117f85d42568d09a SHA256 9f2c8ce8da5ab24699f6ec0347ddc890b62907cc5aeebaa1a355e2d1a9db2712
+DIST seamonkey-2.8-pt-PT.xpi 848623 RMD160 1cbd7add1fcfe80278a2478b2091d12778b79816 SHA1 77d697b728799ee4a19c11f0f117c1a0392c6756 SHA256 0e11e9a5d6e69df2d01f45c9016609ec8c9dcb99f58e8152f38aed592f67549f
+DIST seamonkey-2.8-ru.xpi 897790 RMD160 165f69b0f929166d4ca8b43f992886922773a74a SHA1 7456f79da88007a507c54849fb372dd34b5a759b SHA256 a146ec50f01fceee0a5a96ea7a86319933286a15920034cce23538a9c8183fb8
+DIST seamonkey-2.8-sk.xpi 846539 RMD160 49f42923b3b7e767d1d140f6e77ef95edf7fe9f9 SHA1 46c5cdce2a80e865ecbecf9cad0781af7e00a1c5 SHA256 1a4fe1979d255169e10db77effed5432b14cfa567a342cc4b15b69e244823e29
+DIST seamonkey-2.8-sv-SE.xpi 874977 RMD160 fa65e1a5119de33908ccc5426c8c4550c10fe39f SHA1 66982b4b8a70d5d63ba6fa4b1a58217cd72b6c30 SHA256 632d188fe2838723fc23a7b816897bb7eebdf94784a38871e6e8a7126458c192
+DIST seamonkey-2.8-tr.xpi 813371 RMD160 2262b1f996ee2082edf62d84c6eae74f9eb5ae6b SHA1 4f502305df8666457d36e00e2f7e642a27aeee26 SHA256 ba3d1dc18d0743cd00c67c102dbc3468d05874bd1f16f3695c7b601d56107f6d
+DIST seamonkey-2.8-zh-CN.xpi 841924 RMD160 52b230f585511922110a28db13c1781556227a74 SHA1 88faaf4f8a77f2839c5394e30aeb32f673efe7b4 SHA256 f5b654657984d34a3710dccf99e19e6d5167c69373ebe49e2899db21f3739290
+DIST seamonkey-2.8.source.tar.bz2 101616662 RMD160 7aa190c00585cf9cb2f7bccbdf58e6c980be344c SHA1 8f5ef8cb2a3ac495add99fb3394d8c007a5d91af SHA256 2d4d1789263ce182cb515da1a37b48c0e8a9eb8ebbb03962d730b644b257fe2a
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch b/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
deleted file mode 100644
index 2b8d6d91b693..000000000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.3.3-bug373733.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/mailnews/extensions/enigmail/package/enigmail.js	2011-09-19 10:46:49.000000000 -0500
-+++ b/mailnews/extensions/enigmail/package/enigmail.js	2011-11-11 06:30:21.000000000 -0600
-@@ -924,7 +924,7 @@
-           Components.classes["@mozilla.org/file/directory_service;1"].
-           getService(Components.interfaces.nsIProperties);
- 
--        var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
-+        var extensionLoc = directoryService.get("CurProcD", Components.interfaces.nsIFile);
-         extensionLoc.append("extensions");
-         extensionLoc.append(ENIGMAIL_EXTENSION_ID);
-         extensionLoc.append("wrappers");
-@@ -1460,7 +1460,7 @@
-                 Components.classes["@mozilla.org/file/directory_service;1"].
-                 getService(Components.interfaces.nsIProperties);
-             var extensionLoc =
--                directoryService.get("ProfD", Components.interfaces.nsIFile);
-+                directoryService.get("CurProcD", Components.interfaces.nsIFile);
-             extensionLoc.append("extensions");
-             extensionLoc.append(ENIGMAIL_EXTENSION_ID);
-             extensionLoc.append("wrappers");
diff --git a/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff b/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
deleted file mode 100644
index 2696764974da..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-# This patch reverts the change from
-# https://bugzilla.mozilla.org/show_bug.cgi?id=643294
-
---- comm-2.0/suite/browser/tabbrowser.xml
-+++ comm-2.0/suite/browser/tabbrowser.xml
-@@ -3000,7 +3000,7 @@
- 
-       <destructor>
-         <![CDATA[
--          window.removeEventListener("resize", this, false);
-+          document.removeEventListener("resize", this, false);
-         ]]>
-       </destructor>
- 
-@@ -3123,13 +3123,6 @@
-             this._handleNewTab(event.target);
-         ]]>
-       </handler>
--
--      <handler event="DOMMouseScroll" phase="capturing">
--        <![CDATA[
--          this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
--          event.stopPropagation();
--        ]]>
--      </handler>
-     </handlers>
-   </binding>
- 
diff --git a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild b/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild
index 55aa7bc6327f..03f88be9c531 100644
--- a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.4 2011/12/20 08:22:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.5 2012/03/14 09:17:45 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -25,14 +25,13 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	KEYWORDS=""
 	#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 arm ia64 ppc ppc64 sparc"
+	KEYWORDS="alpha arm ia64 ppc64 sparc"
 	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
 fi
 
diff --git a/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild
index 556c1997cf2b..bd2f675fc511 100644
--- a/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild,v 1.6 2011/12/26 22:56:31 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.4.1-r1.ebuild,v 1.7 2012/03/14 09:17:45 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -31,8 +31,7 @@ if [[ ${PV} == *_pre* ]] ; then
 	LANG_URI="${REL_URI}/linux-i686/xpi"
 	LANGPACK_PREFIX=""
 	LANGPACK_SUFFIX=""
-	#KEYWORDS=""
-	KEYWORDS="~alpha ~amd64 ~arm ppc x86"
+	KEYWORDS=""
 	#HAS_LANGS="false"
 else
 	# This is where arch teams should change the KEYWORDS.
@@ -40,7 +39,7 @@ else
 	#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
 	REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
 	LANG_URI="${REL_URI}/langpack"
-	KEYWORDS="~alpha amd64 ~arm ppc x86"
+	KEYWORDS="ppc"
 	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
 fi
 
diff --git a/www-client/seamonkey/seamonkey-2.6.1.ebuild b/www-client/seamonkey/seamonkey-2.6.1.ebuild
deleted file mode 100644
index cb6cccfc8a16..000000000000
--- a/www-client/seamonkey/seamonkey-2.6.1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.6.1.ebuild,v 1.4 2012/01/12 15:30:12 phajdan.jr Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins
-
-PATCH="${PN}-2.6.1-patches-01"
-EMVER="1.3.4"
-
-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}"
-
-LANGPACK_PREFIX="${MY_P}."
-LANGPACK_SUFFIX=".langpack"
-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}"
-	LANG_URI="${REL_URI}/linux-i686/xpi"
-	LANGPACK_PREFIX=""
-	LANGPACK_SUFFIX=""
-	KEYWORDS=""
-else
-	# This is where arch teams should change the KEYWORDS.
-
-	#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
-	REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
-	LANG_URI="${REL_URI}/langpack"
-	KEYWORDS="~alpha amd64 ~arm ~ppc x86"
-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 +crypt +ipc +methodjit +roaming system-sqlite +webm"
-
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
-
-LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt
-	nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-for X in "${LANGS[@]}" ; do
-	# en is handled internally
-	if [[ ${X} != en ]] ; then
-		SRC_URI+="
-			linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-	fi
-	IUSE+=" linguas_${X/-/_}"
-	# Install all the specific locale xpis if there's no generic locale xpi
-	# Example: there's no pt.xpi, so install all pt-*.xpi
-	if ! has ${X%%-*} "${LANGS[@]}"; then
-		SRC_URI+="
-			linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-		IUSE+=" linguas_${X%%-*}"
-	fi
-done
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
-	>=media-libs/mesa-7.10
-	>=media-libs/libpng-1.4.1[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
-	crypt? ( >=app-crypt/gnupg-1.4 )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( amd64? ( ${ASM_DEPEND} )
-		x86? ( ${ASM_DEPEND} ) )"
-
-if [[ ${PV} == *beta* ]] ; then
-	S="${WORKDIR}/comm-beta"
-else
-	S="${WORKDIR}/comm-release"
-fi
-
-# TODO: Move all the linguas crap to an eclass
-linguas() {
-	# Generate the list of language packs called "linguas"
-	# This list is used to install the xpi language packs
-	local LINGUA
-	for LINGUA in ${LINGUAS}; do
-		if has ${LINGUA} en ; then
-			# For mozilla products, en and en_US are handled internally
-			continue
-		# If this language is supported by ${P},
-		elif has ${LINGUA} "${LANGS[@]//-/_}"; then
-			# Add the language to linguas, if it isn't already there
-			has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
-			continue
-		# For each short LINGUA that isn't in LANGS,
-		# add *all* long LANGS to the linguas list
-		elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
-			for LANG in "${LANGS[@]}"; do
-				if [[ ${LANG} == ${LINGUA}-* ]]; then
-					has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in "${linguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-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
-
-	moz_pkgsetup
-
-	if ! use methodjit ; then
-		einfo
-		ewarn "You are disabling the method-based JIT in JägerMonkey."
-		ewarn "This will greatly slowdown JavaScript in ${PN}!"
-	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_seamonkey"
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mozilla"
-	popd &>/dev/null || die
-
-	# mailnews patches go here
-	pushd "${S}"/mailnews &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mailnews"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		epatch "${FILESDIR}"/enigmail/enigmail-1.3.3-bug373733.patch
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&>/dev/null
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
-	fi
-
-	#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"
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	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+=",-irc"
-	fi
-	if ! use roaming ; then
-		MEXTENSIONS+=",-sroaming"
-	fi
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --enable-jsd
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --enable-system-ffi
-
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable methodjit
-
-	if use crypt ; then
-		mozconfig_annotate "mail crypt" --enable-chrome-format=jar
-	fi
-
-	mozconfig_annotate '' --with-system-png
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	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() {
-	emake || die
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt ; 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"
-	cp -f "${FILESDIR}"/icon/${PN}.desktop "${T}" || die
-
-	if use crypt ; 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
-
-	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
-		-i "${T}"/${PN}.desktop || die
-	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
-		|| die
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
-
-	# Add StartupNotify=true bug 290401
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${T}"/${PN}.desktop
-	fi
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png \
-		|| die
-	domenu "${T}"/${PN}.desktop || die
-
-	# Add our default prefs
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
-		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
-			|| die
-
-	# Handle plugins dir through nsplugins.eclass
-	share_plugins_dir
-
-	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.7.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.7.1-r1.ebuild
index a40454eeea49..1c65c82462c7 100644
--- a/www-client/seamonkey/seamonkey-2.7.1-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.1-r1.ebuild,v 1.2 2012/03/01 15:08:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.1-r1.ebuild,v 1.3 2012/03/14 09:17:45 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -37,7 +37,7 @@ HOMEPAGE="http://www.seamonkey-project.org"
 if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
 
-	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS=""
 else
 	# This is where arch teams should change the KEYWORDS.
 
diff --git a/www-client/seamonkey/seamonkey-2.7.1.ebuild b/www-client/seamonkey/seamonkey-2.7.1.ebuild
index f019bc78e44c..dc1c7c7fbf47 100644
--- a/www-client/seamonkey/seamonkey-2.7.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.1.ebuild,v 1.3 2012/02/20 11:29:35 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.1.ebuild,v 1.4 2012/03/14 09:17:45 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -37,11 +37,11 @@ HOMEPAGE="http://www.seamonkey-project.org"
 if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
 
-	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS=""
 else
 	# This is where arch teams should change the KEYWORDS.
 
-	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS="x86"
 fi
 
 SLOT="0"
diff --git a/www-client/seamonkey/seamonkey-2.7.ebuild b/www-client/seamonkey/seamonkey-2.8.ebuild
similarity index 77%
rename from www-client/seamonkey/seamonkey-2.7.ebuild
rename to www-client/seamonkey/seamonkey-2.8.ebuild
index ea36da239bd2..802365455026 100644
--- a/www-client/seamonkey/seamonkey-2.7.ebuild
+++ b/www-client/seamonkey/seamonkey-2.8.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.7.ebuild,v 1.2 2012/02/07 21:59:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.8.ebuild,v 1.1 2012/03/14 09:17:45 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+	    pt-PT ru sk sv-SE tr zh-CN)
 
 MOZ_PV="${PV/_pre*}"
 MOZ_PV="${MOZ_PV/_alpha/a}"
@@ -15,7 +16,8 @@ MOZ_PV="${MOZ_PV/_rc/rc}"
 MOZ_P="${PN}-${MOZ_PV}"
 
 if [[ ${PV} == *_pre* ]] ; then
-	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/nightly/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
 	# And the langpack stuff stays at eclass defaults
 else
 	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
@@ -25,8 +27,9 @@ fi
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
 
-PATCH="${PN}-2.7-patches-02"
-EMVER="1.3.5"
+PATCHFF="firefox-11.0-patches-0.1"
+PATCH="${PN}-2.7-patches-03"
+EMVER="1.4"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
@@ -38,7 +41,7 @@ if [[ ${PV} == *_pre* ]] ; then
 else
 	# This is where arch teams should change the KEYWORDS.
 
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 SLOT="0"
@@ -47,7 +50,8 @@ IUSE="+alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm"
 
 SRC_URI+="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
@@ -65,7 +69,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	virtual/libffi
 	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
 	crypt? ( >=app-crypt/gnupg-1.4 )
-	webm? ( >=media-libs/libvpx-0.9.7
+	webm? ( >=media-libs/libvpx-1.0.0
 		media-libs/alsa-lib )"
 
 DEPEND="${RDEPEND}
@@ -100,20 +104,14 @@ src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_seamonkey"
+	epatch "${WORKDIR}/seamonkey"
 
 	# browser patches go here
 	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mozilla"
-	popd &>/dev/null || die
-
-	# mailnews patches go here
-	pushd "${S}"/mailnews &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/_mailnews"
+	epatch "${WORKDIR}/firefox"
 	popd &>/dev/null || die
 
 	# Allow user to apply any additional patches without modifing ebuild
@@ -121,11 +119,8 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&>/dev/null
-		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
-			-i Makefile.in || die
-		cd "${S}"
+		#cd "${S}"/mailnews/extensions/enigmail || die
+		#cd "${S}"
 	fi
 
 	#Ensure we disable javaxpcom by default to prevent configure breakage
@@ -137,6 +132,8 @@ src_prepare() {
 		|| die "Failed to remove gnomevfs extension"
 
 	eautoreconf
+	cd "${S}"/mozilla
+	eautoconf
 }
 
 src_configure() {
@@ -164,6 +161,8 @@ src_configure() {
 		MEXTENSIONS+=",-sroaming"
 	fi
 
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --enable-jsd
@@ -176,9 +175,16 @@ src_configure() {
 	mozconfig_use_enable system-sqlite
 	mozconfig_use_enable methodjit
 
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonk" \
+		>> "${S}"/.mozconfig
+
 	# Finalize and report settings
 	mozconfig_final
 
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
 	if [[ $(gcc-major-version) -lt 4 ]] ; then
 		append-cxxflags -fno-stack-protector
 	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
@@ -186,32 +192,33 @@ src_configure() {
 			append-flags -mno-avx
 		fi
 	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() {
-	emake || die
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake -f client.mk || die
 
 	# Only build enigmail extension if conditions are met.
 	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/seamonk/mailnews/extensions/enigmail
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
 	fi
 }
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	declare emid
+	local obj_dir="seamonk"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
 
 	pax-mark m "${S}"/dist/bin/xpcshell
 
@@ -220,12 +227,14 @@ src_install() {
 
 	if use crypt ; then
 		cd "${T}" || die
-		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		unzip "${S}"/${obj_dir}/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
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+
+		cd "${S}" || die
 	fi
 
 	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
@@ -246,18 +255,13 @@ src_install() {
 		|| die
 	domenu "${T}"/${PN}.desktop || die
 
-	# Add our default prefs
-	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js \
-		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js \
-			|| die
-
-	# Required in order to use plugins and even run firefox on hardened.
+	# Required in order to use plugins and even run seamonkey on hardened.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
 
 	# Handle plugins dir through nsplugins.eclass
 	share_plugins_dir
 
-	doman "${S}"/suite/app/${PN}.1 || die
+	doman "${S}"/${obj_dir}/suite/app/${PN}.1 || die
 }
 
 pkg_preinst() {