diff --git a/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild b/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
index e487909c1934..14f2345a1fd7 100644
--- a/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild,v 1.7 2010/06/06 18:12:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild,v 1.8 2012/04/26 16:48:40 aballier Exp $
 
 MY_P="eselect-emacs-${PV}"
 DESCRIPTION="Manages ctags implementations"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-fontconfig/eselect-fontconfig-1.1.ebuild b/app-admin/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
index e1badb50637a..2b5dcf2612e4 100644
--- a/app-admin/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
+++ b/app-admin/eselect-fontconfig/eselect-fontconfig-1.1.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-admin/eselect-fontconfig/eselect-fontconfig-1.1.ebuild,v 1.5 2011/12/02 22:37:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-fontconfig/eselect-fontconfig-1.1.ebuild,v 1.6 2012/04/26 19:20:10 aballier Exp $
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks."
 HOMEPAGE="http://www.gentoo.org"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild b/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
index 51e32e27b9e8..58ffe480b22b 100644
--- a/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild
+++ b/app-admin/eselect-ruby/eselect-ruby-20120106.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-admin/eselect-ruby/eselect-ruby-20120106.ebuild,v 1.1 2012/01/06 22:02:43 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ruby/eselect-ruby-20120106.ebuild,v 1.2 2012/04/26 16:50:02 aballier Exp $
 
 DESCRIPTION="Manages multiple Ruby versions"
 HOMEPAGE="http://www.gentoo.org"
@@ -8,7 +8,7 @@ SRC_URI="http://dev.a3li.li/gentoo/distfiles/ruby.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
index 01e58c3dad30..e8bfe86ea2cc 100644
--- a/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
+++ b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild,v 1.10 2010/10/29 22:14:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild,v 1.11 2012/04/26 16:43:32 aballier Exp $
 
 EAPI="3"
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/vi.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-admin/gam-server/gam-server-0.1.10.ebuild b/app-admin/gam-server/gam-server-0.1.10.ebuild
index 653a479c60ff..1b5f75dce474 100644
--- a/app-admin/gam-server/gam-server-0.1.10.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10.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-admin/gam-server/gam-server-0.1.10.ebuild,v 1.11 2011/09/25 16:17:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.12 2012/04/26 17:33:17 aballier Exp $
 
 EAPI="3"
 GNOME_ORG_MODULE="gamin"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/gamin-0.1.10.ebuild b/app-admin/gamin/gamin-0.1.10.ebuild
index 81d29a400024..75adfdbc158d 100644
--- a/app-admin/gamin/gamin-0.1.10.ebuild
+++ b/app-admin/gamin/gamin-0.1.10.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-admin/gamin/gamin-0.1.10.ebuild,v 1.10 2011/01/06 11:04:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.10.ebuild,v 1.11 2012/04/26 17:34:06 aballier Exp $
 
 DESCRIPTION="Meta package providing the File Alteration Monitor API & Server"
 HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!app-admin/fam
diff --git a/app-arch/gzip/gzip-1.4.ebuild b/app-arch/gzip/gzip-1.4.ebuild
index eb54d8229364..5d0b93f8d116 100644
--- a/app-arch/gzip/gzip-1.4.ebuild
+++ b/app-arch/gzip/gzip-1.4.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-arch/gzip/gzip-1.4.ebuild,v 1.9 2012/04/24 09:03:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.10 2012/04/26 19:25:30 aballier Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="nls pic static"
 
 RDEPEND=""
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild
index 1625e4fd86f2..0e92203854e7 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.4g.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-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild,v 1.8 2011/03/01 00:38:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild,v 1.9 2012/04/26 20:49:30 aballier Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.lzma"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="app-arch/cpio"
diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild
index f29fe6de3ce7..8292d24d45d6 100644
--- a/app-arch/unzip/unzip-6.0-r3.ebuild
+++ b/app-arch/unzip/unzip-6.0-r3.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-arch/unzip/unzip-6.0-r3.ebuild,v 1.1 2012/04/01 21:45:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r3.ebuild,v 1.2 2012/04/26 16:34:58 aballier Exp $
 
 EAPI="2"
 inherit eutils toolchain-funcs flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index d6be063f133e..d4080a06e6e5 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1 +1,2 @@
 DIST dvdisaster-0.72.2.tar.bz2 4145193 RMD160 727586d5e9a7bc0c2b0137786b8cd62a3a3b584e SHA1 f560990e2047ecf0be50c425262046828399fbc3 SHA256 62d00c399c99a3bba493405174aeb96bd8c2d428d01d24b46858a55531b725ae
+DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 RMD160 a134fa0adf04dc2a921acfccf0c10292112a28fa SHA1 2b47fb5a5535d90641f24a599cd8ae8ffd86b972 SHA256 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
new file mode 100644
index 000000000000..9f8bf6ad8c2d
--- /dev/null
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild,v 1.2 2012/04/26 20:21:40 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils
+
+DESCRIPTION="Data-protection and recovery tool for DVDs"
+HOMEPAGE="http://dvdisaster.sourceforge.net/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug nls"
+
+dvdi_langs="cs de it pt_BR ru sv"
+for dvdi_lang in ${dvdi_langs}; do
+	IUSE+=" linguas_${dvdi_lang}"
+done
+unset dvdi_lang
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/glib-2.20
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	virtual/os-headers"
+
+src_configure() {
+	use nls && dvdi_makeopts=( -j1 )
+
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--docsubdir=${PF} \
+		--localedir=/usr/share/locale \
+		--buildroot="${D}" \
+		--with-nls=$(usex nls) \
+		--with-memdebug=$(usex debug) || die
+}
+
+src_compile() {
+	emake "${dvdi_makeopts[@]}"
+}
+
+src_install() {
+	emake install
+	dobin tools/pngpack
+
+	newdoc tools/README README.pngpack
+	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
+
+	newicon contrib/${PN}48.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
+
+	local res
+	for res in 16 32 48 64; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins contrib/${PN}${res}.png ${PN}.png
+	done
+
+	local dest="${ED}"/usr/share
+
+	local dvdi_lang
+	for dvdi_lang in ${dvdi_langs}; do
+		use linguas_${dvdi_lang} || rm -rf \
+			${dest}/doc/${PF}/${dvdi_lang} \
+			${dest}/doc/${PF}/CREDITS.${dvdi_lang} \
+			${dest}/man/${dvdi_lang}
+	done
+
+	rm -f "${ED}"/usr/bin/*-uninstall.sh
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-crypt/p11-kit/p11-kit-0.12.ebuild b/app-crypt/p11-kit/p11-kit-0.12.ebuild
index 998c524ae6b6..b44df5016738 100644
--- a/app-crypt/p11-kit/p11-kit-0.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.12.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-crypt/p11-kit/p11-kit-0.12.ebuild,v 1.7 2012/04/08 15:25:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/p11-kit/p11-kit-0.12.ebuild,v 1.8 2012/04/26 17:52:56 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://p11-glue.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug"
 
 src_configure() {
diff --git a/app-doc/doxygen/doxygen-1.8.0.ebuild b/app-doc/doxygen/doxygen-1.8.0.ebuild
index 2952254929dc..ecc2d19a9514 100644
--- a/app-doc/doxygen/doxygen-1.8.0.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.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/app-doc/doxygen/doxygen-1.8.0.ebuild,v 1.1 2012/02/29 09:12:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.0.ebuild,v 1.3 2012/04/26 21:34:20 aballier Exp $
 
 EAPI=4
 
@@ -13,9 +13,8 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-	~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc dot qt4 latex elibc_FreeBSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU"
 
 #missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
 
@@ -143,6 +142,10 @@ src_configure() {
 
 	use qt4 && my_conf="${my_conf} --with-doxywizard"
 
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
 	export LINK="${QMAKE_LINK}"
 	export LINK_SHLIB="${QMAKE_CXX}"
 
diff --git a/app-editors/vim-core/vim-core-7.3.502.ebuild b/app-editors/vim-core/vim-core-7.3.502.ebuild
index bd672ffd4e98..6763ae980472 100644
--- a/app-editors/vim-core/vim-core-7.3.502.ebuild
+++ b/app-editors/vim-core/vim-core-7.3.502.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-editors/vim-core/vim-core-7.3.502.ebuild,v 1.1 2012/04/23 13:24:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.3.502.ebuild,v 1.2 2012/04/26 16:45:05 aballier Exp $
 
 EAPI=3
 VIM_VERSION="7.3"
@@ -16,5 +16,5 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="vim and gvim shared files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-editors/vim/vim-7.3.502.ebuild b/app-editors/vim/vim-7.3.502.ebuild
index 977672dc5e55..812d7281fe08 100644
--- a/app-editors/vim/vim-7.3.502.ebuild
+++ b/app-editors/vim/vim-7.3.502.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-editors/vim/vim-7.3.502.ebuild,v 1.1 2012/04/23 14:01:40 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.502.ebuild,v 1.2 2012/04/26 16:57:23 aballier Exp $
 
 EAPI=3
 VIM_VERSION="7.3"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 741da2bdf319..2a8f9123f2ed 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -2,8 +2,6 @@ DIST appliance-1.17.14.tar.xz 46644196 RMD160 3d8ad13c5c4daf202cc563145c480b7a95
 DIST libguestfs-1.16.10.tar.gz 6574148 RMD160 1e2dd9a9d8b36f130c01d0c590fe5bf22ba79fec SHA1 c2acbe122180dfc5ab6aab0c2f0a12658d69c526 SHA256 82b314f4f473ac008bafe509165048d775bea35064ce383203c398866d923ba4
 DIST libguestfs-1.16.15.tar.gz 6588084 RMD160 777f64ce733e24efd60c89f06df7a1da233a07e8 SHA1 cbb4f541e260ea3a191196732523923bad3a175b SHA256 6a091bf99c1344905e625e2c5d63051b314d7ca7288e54223a3b86875a47f55e
 DIST libguestfs-1.16.19.tar.gz 6572134 RMD160 e5ba58058c17bd2cc402bd3f388d6967f18d86f9 SHA1 f6ba2230174884c763a694f3c726d16e333ecc34 SHA256 b1e06dfe8d3a657e44642db5a4ee36008dad9724091a09fc40030311a53d5c7d
-DIST libguestfs-1.17.21.tar.gz 6870772 RMD160 f499c6b27fd6968c2c6ee74c0b7369a7e4537151 SHA1 2c90ac4498fff12f655e97fb3a4586994b45ed93 SHA256 7981ab12dc6c2c6ef701051c276a10d3ee81d4d963e6b0b2557e64c96d22092b
-DIST libguestfs-1.17.26.tar.gz 7050951 RMD160 6019fb17a5b2181dbb5a5afce1e13e8b06861774 SHA1 ceb76c3a6e532bc8b21d1e4119b171d65f1b5006 SHA256 e2e9f69c4c819040a38cc8bd303c175ea665e10748c96e69ff1a8171f9b35e4c
 DIST libguestfs-1.17.32.tar.gz 7128010 RMD160 056884d4e43ade6ffb77ba45142e3d6896678008 SHA1 a856c35a88e5d470b7ff55c0b04b0f1e395dfa91 SHA256 bb04d2e5761df796e122ab7d3fff51e5dc635e92c68d8dd2a703c98cd351ce8c
 DIST libguestfs-1.7.18-x86_64.tar.gz 62332840 RMD160 202ac5883d1453d6225b76029290ccebd44c7e84 SHA1 661786c088fad8d2354e8121a2fafb1d598587fc SHA256 07c4f0b4b50df7407327333d9e9b09c310265d056868531c69659659a9f5218d
 DIST libguestfs-1.8.16.tar.gz 5164608 RMD160 eec0d8875f02e007f5dcbce629ddf00c0ee609af SHA1 24a9aa8c2a8226438a6613a9a12a4d467404d1e6 SHA256 7d8fb8529f201d81761bd383ea567d752f54471a1b5b5903fe553440cbe7755f
diff --git a/app-emulation/libguestfs/libguestfs-1.17.21.ebuild b/app-emulation/libguestfs/libguestfs-1.17.21.ebuild
deleted file mode 100644
index 5d1013c1d51a..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.17.21.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.17.21.ebuild,v 1.1 2012/03/23 19:05:38 maksbotan Exp $
-
-EAPI="4"
-
-APLANCE_PV="1.17.14"
-APPL_P="appliance-${APLANCE_PV}"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit check-reqs bash-completion-r1 autotools-utils versionator eutils \
-multilib linux-info perl-module
-
-MY_PV_1="$(get_version_component_range 1-2)"
-MY_PV_2="$(get_version_component_range 2)"
-
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz
-	http://rion-overlay.googlecode.com/files/${APPL_P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-# Upstream NOT supported 32-bit version, keyword in own risk
-KEYWORDS="~amd64"
-IUSE="bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection"
-
-# Failires - doc
-
-COMMON_DEPEND="
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre
-	app-arch/cpio
-	dev-lang/perl
-	app-cdr/cdrkit
-	>=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-0.7.1
-	sys-fs/squashfs-tools
-	dev-libs/libconfig
-	dev-libs/libpcre
-	sys-libs/readline
-	>=sys-libs/db-4.6
-	perl? ( virtual/perl-ExtUtils-MakeMaker
-			>=dev-perl/Sys-Virt-0.2.4
-			virtual/perl-Getopt-Long
-			virtual/perl-Data-Dumper
-			dev-perl/libintl-perl
-			>=app-misc/hivex-1.3.1[perl?]
-			dev-perl/String-ShellQuote
-			)
-	fuse? ( sys-fs/fuse )
-	introspection? (
-		>=dev-libs/gobject-introspection-1.30.0
-		dev-libs/gjs
-		)
-	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(${FILESDIR}/1.17/*.patch)
-
-DOCS=(AUTHORS BUGS HACKING README RELEASE-NOTES ROADMAP TODO)
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="5G"
-	CHECKREQS_DISK_USR="5G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup () {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	local myeconfargs=(
-		--disable-appliance
-		--disable-daemon
-		--with-drive-if=virtio
-		--with-net-if=virtio-net-pci
-		--with-extra="-gentoo"
-		--with-readline
-		--disable-php
-		--disable-python
-		--disable-java
-		$(use_enable nls)
-		$(use_enable perl)
-		$(use_enable fuse)
-		$(use_enable ocaml)
-		$(use_enable ruby)
-		--disable-haskell
-		$(use_enable doc)
-		$(use_enable introspection gobject)
-		$(use_enable erlang)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-}
-
-src_test() {
-	autotools-utils_src_test
-}
-
-src_install() {
-	strip-linguas -i po
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	use bash-completion && dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
-
-	rm -fr "${D}/etc"/bash* || die
-
-	insinto /usr/share/guestfs/
-	doins -r "${WORKDIR}"/appliance
-	newenvd "${FILESDIR}"/env.file 99"${PN}"
-
-	use perl && fixlocalpod
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.17.26.ebuild b/app-emulation/libguestfs/libguestfs-1.17.26.ebuild
deleted file mode 100644
index 612804259f2b..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.17.26.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.17.26.ebuild,v 1.1 2012/04/08 18:24:12 maksbotan Exp $
-
-EAPI="4"
-
-APLANCE_PV="1.17.14"
-APPL_P="appliance-${APLANCE_PV}"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit check-reqs bash-completion-r1 autotools-utils versionator eutils \
-multilib linux-info perl-module
-
-MY_PV_1="$(get_version_component_range 1-2)"
-MY_PV_2="$(get_version_component_range 2)"
-
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz
-	http://rion-overlay.googlecode.com/files/${APPL_P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-# Upstream NOT supported 32-bit version, keyword in own risk
-KEYWORDS="~amd64"
-IUSE="bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection"
-
-# Failires - doc
-
-COMMON_DEPEND="
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre
-	app-arch/cpio
-	dev-lang/perl
-	app-cdr/cdrkit
-	>=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-0.7.1
-	sys-fs/squashfs-tools
-	dev-libs/libconfig
-	dev-libs/libpcre
-	sys-libs/readline
-	>=sys-libs/db-4.6
-	perl? ( virtual/perl-ExtUtils-MakeMaker
-			>=dev-perl/Sys-Virt-0.2.4
-			virtual/perl-Getopt-Long
-			virtual/perl-Data-Dumper
-			dev-perl/libintl-perl
-			>=app-misc/hivex-1.3.1[perl?]
-			dev-perl/String-ShellQuote
-			)
-	fuse? ( sys-fs/fuse )
-	introspection? (
-		>=dev-libs/gobject-introspection-1.30.0
-		dev-libs/gjs
-		)
-	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(${FILESDIR}/1.17/*.patch)
-
-DOCS=(AUTHORS BUGS HACKING README RELEASE-NOTES ROADMAP TODO)
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="5G"
-	CHECKREQS_DISK_USR="5G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup () {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	local myeconfargs=(
-		--disable-appliance
-		--disable-daemon
-		--with-drive-if=virtio
-		--with-net-if=virtio-net-pci
-		--with-extra="-gentoo"
-		--with-readline
-		--disable-php
-		--disable-python
-		--disable-java
-		$(use_enable nls)
-		$(use_enable perl)
-		$(use_enable fuse)
-		$(use_enable ocaml)
-		$(use_enable ruby)
-		--disable-haskell
-		$(use_enable doc)
-		$(use_enable introspection gobject)
-		$(use_enable erlang)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-}
-
-src_test() {
-	autotools-utils_src_test
-}
-
-src_install() {
-	strip-linguas -i po
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	use bash-completion && dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
-
-	rm -fr "${D}/etc"/bash* || die
-
-	insinto /usr/share/guestfs/
-	doins -r "${WORKDIR}"/appliance
-	newenvd "${FILESDIR}"/env.file 99"${PN}"
-
-	use perl && fixlocalpod
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.17.32.ebuild b/app-emulation/libguestfs/libguestfs-1.17.32.ebuild
index 30561b43c65c..a0179cbb221c 100644
--- a/app-emulation/libguestfs/libguestfs-1.17.32.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.17.32.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/libguestfs/libguestfs-1.17.32.ebuild,v 1.1 2012/04/22 14:59:37 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.17.32.ebuild,v 1.2 2012/04/26 18:17:43 maksbotan Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre
 	app-arch/cpio
 	dev-lang/perl
+	dev-util/gtk-doc
 	app-cdr/cdrkit
 	>=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
 	sys-apps/fakeroot
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 58d973b75969..cf2151b2f671 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,2 @@
-DIST VBoxGuestAdditions_4.1.10.iso 50749440 RMD160 dc852aa069789bdbbebd0add984339c4c629c76b SHA1 0a6440b74d9a664c0d23209c07d95ff6593e2b90 SHA256 70e859545cff07ce33c38f8c970856907cb1961ebf15a639505092e205614817
 DIST VBoxGuestAdditions_4.1.12.iso 50776064 RMD160 7f791a153a534568f6c25c43676ab3093fe99fea SHA1 f3918fde23dcf2de9cd8e7eee26135fe7be4efd0 SHA256 7dce13dd99c8b4757d56f5bada19a61a3ad50c69d7e0d9c245c0b88f50c0c245
-DIST VBoxGuestAdditions_4.1.4.iso 44716032 RMD160 af6062dcf625c82ec2184921d91ffdd2e326f1a6 SHA1 5d4b1d0ed5745f54b7aa9f709bc9a129c6e41e38 SHA256 75796a780f35c697c752d754b100d61afed7ee858ee49f34710c2d79ad50dc32
-DIST VBoxGuestAdditions_4.1.8.iso 45471744 RMD160 8730184e30ff856ad09f75ea3e6886f872339ba0 SHA1 92b5bedf25619f976a49391bb1998c3dbc8efca9 SHA256 2265aa350de2d62021e91ae6bbd1438c291a74494778bb443926e9b7b962c63d
+DIST VBoxGuestAdditions_4.1.14.iso 50780160 RMD160 89dde3f04047f5a89fe985c0948ff8122775d2cc SHA1 5f4e8f2c096995c2f6d3a20bc7c3d52101f5dea1 SHA256 a12785fd1f202ff784da27ae75bd3fd43edaa824736b5b30499d9db993c1db64
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild
similarity index 88%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild
index d8e045be945c..ae057f0488bc 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.10.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.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/virtualbox-additions/virtualbox-additions-4.1.10.ebuild,v 1.1 2012/03/15 09:54:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.14.ebuild,v 1.1 2012/04/26 18:19:44 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
deleted file mode 100644
index cd281da51daf..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.4.ebuild,v 1.3 2011/12/07 17:28:33 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
deleted file mode 100644
index b2e61032e467..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.8.ebuild,v 1.3 2012/04/09 12:03:13 maekke Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 2850ac669267..d22e643ebb82 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,8 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz 10047772 RMD160 5891f472b300f203e73da5597257060fa22e5542 SHA1 8ce8369ae74429062abc3e4fd3f2b4bebd5024b4 SHA256 e1ddcbb62de299b67350a4c9f3425b1f71aca490611891fd07e98f15a890d09f
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 RMD160 0a65fb69ad482c655f564a3f63ed958390c26c48 SHA1 28d63bceca076ae65afc3df814d622b630f8d372 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
-DIST VirtualBox-4.1.10-76795-Linux_amd64.run 77250001 RMD160 f0f2b84c9574d18dc66dfba2b02e1faaaa9076fa SHA1 c6c32f43f6c70feaeb746ab66fb94cecdf708de6 SHA256 07a8a28feda96fc54caed1c2c3338473a02c061d7bb564f3b5280cbfad3e24c8
-DIST VirtualBox-4.1.10-76795-Linux_x86.run 76993997 RMD160 01e206dcca898af966af60a87ed762f15d26b52f SHA1 b87b829828bfbcfd8a250fe4c85b6110350f96c4 SHA256 4bd6388f7f3803635de01e77de45957e80bb0e2b75c2d2e4ffd01bc89c99afd7
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz 10063096 RMD160 54e5748ee840376ca0b539e1956d496eb9c8dc9e SHA1 ae0f3f52bd46ab19a1a1c85d3c4381afb5dc19ac SHA256 82c112ab6003a92e6065a277077b2f3e1a9ca6871773ac3f4b1c771b8e699b42
 DIST VirtualBox-4.1.12-77245-Linux_amd64.run 77250001 RMD160 4e40a017d2765305396e646a70dc105bfa558849 SHA1 5ef57d22e31a319f317f1d904e1dcee12478c594 SHA256 006eabe522116abcce7af4b5ea6f32f862d3d95ab565e44e5077ab5ced62ba24
 DIST VirtualBox-4.1.12-77245-Linux_x86.run 77137358 RMD160 b8b4fb917b7beb3e38d650f0f9cae66ea7641aca SHA1 b8c25f59caafd01b9449dd40b62e1fcd0c6dfcbb SHA256 49890bf1077b3649181d1607372d5b92bcf347371e0631a4af6a43193492f047
-DIST VirtualBox-4.1.4-74291-Linux_amd64.run 73235921 RMD160 d9d067ea922a358062b9fe1e8d17216974cff400 SHA1 3d6ee4c217ab936eb6acf175fcc408133f201507 SHA256 b079b311f6aa662332cd5118bbe01d47589595849c4dd53f4b65af25de923a0a
-DIST VirtualBox-4.1.4-74291-Linux_x86.run 73020877 RMD160 1a12db57d13286690a7b2a06d3d09d14a9f9d91e SHA1 87b9536b0d309bb2fdf549ff5d0db3e17945a7b9 SHA256 a907733bf41c32896a211b146b066aadaa1a3e11afb9e9c80ef3ed642cc3c94d
-DIST VirtualBox-4.1.8-75467-Linux_amd64.run 75027920 RMD160 5bc2f47d870be78ec201d77971b4914f4b019c50 SHA1 bb9e80ddfc812d99cd27135c05304e20b6a28535 SHA256 7d0d45dfc8e4ef27a817c017c6589d5204a6515d86f0c874843cb99ccfe319ee
-DIST VirtualBox-4.1.8-75467-Linux_x86.run 75007436 RMD160 58ea91a06f030893676805097f403c0fd0419fb2 SHA1 8833fc8de41f9a3bbaee05b6c27750fffdccf919 SHA256 7780d8fc171ccfa3047a3d6373f9965b8c2896b11137817314f29cf5a3bc514f
-DIST VirtualBoxSDK-4.1.10-76795.zip 8896483 RMD160 99c7160857821c914ad413ec131597c1ed456590 SHA1 b400bc2d4905ec9dd92149e0fe34dc3b161beaff SHA256 bf3a8f5ebc2ee7c8cd107fec627b0d84359b71080a1c19327015703bf43842f1
+DIST VirtualBox-4.1.14-77440-Linux_amd64.run 77321681 RMD160 0a8f01bdfb1b93889cebc4cd80f5924036ca75ad SHA1 fbda0ee72de7a4cfc469707cf2ecebeb9244165c SHA256 3469ec1f6dcd63db652f70d0b608afa2a10eb37e0a493e62ff465999a0fa6a45
+DIST VirtualBox-4.1.14-77440-Linux_x86.run 77096398 RMD160 45a33dce73583cb71889e7443324ac2a02ee22aa SHA1 1f1ca8af782ebef331660e31d7d3bd9249cb0828 SHA256 b4a8eb84bef6b925b4d20a5161561023fdb9aa791ad12bd87c1422c76846d697
 DIST VirtualBoxSDK-4.1.12-77245.zip 8896345 RMD160 a9431c0907e397d77ede4d4de4be962e89dc43ed SHA1 372d6db2dcaeaa8f6855e110babfa5c00375be80 SHA256 a490878e7bc2443c7e4b51115382a6c5b65cda44cfc449af1676778093b307fa
-DIST VirtualBoxSDK-4.1.4-74291.zip 8803983 RMD160 a8a925a3d61c7a6fe03bfcdbfb2ff4c2c8e754f0 SHA1 77436fe0d22d58f371123df7402b556330e82bf9 SHA256 c0a5855a921611ae3264d70cfde64a3c2fb5ff3a1cd564716a1de0b23e7e9d3d
-DIST VirtualBoxSDK-4.1.8-75467.zip 8805659 RMD160 13e73b31cdd452a8c9262aea62afa3fbdf4a6f06 SHA1 f57fb944b1ea143ffc3130671e7c90b4d554957e SHA256 116d855456fa8661c6d7a3178fcd604d6994d1c8365e697368c25f638e588aff
+DIST VirtualBoxSDK-4.1.14-77440.zip 8805465 RMD160 8dab52ee5e1445f9a68213ca514311ca70a2e80e SHA1 6530303be880c89ff2c1149e975bb01fb9792194 SHA256 3690f15c232d6a8642d091756cfd48d1340d418aeb92ac3448a8e4d1137af04e
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild
similarity index 99%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild
index 7453b6914b0d..463cb5a23516 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.10.ebuild,v 1.2 2012/03/16 19:53:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.14.ebuild,v 1.1 2012/04/26 18:19:19 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils unpacker fdo-mime gnome2 pax-utils
 
-MY_PV=${PV}-76795
+MY_PV=${PV}-77440
 SDK_PV=${MY_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
deleted file mode 100644
index 2c554ff89a7c..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.4 2012/02/05 05:25:37 vapier Exp $
-
-EAPI=2
-
-inherit eutils unpacker fdo-mime pax-utils
-
-MY_PV=${PV}-74291
-SDK_PV=${MY_PV}
-EXTP_PV=${MY_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	!headless? (
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext
-		dev-libs/glib
-		chm? ( dev-libs/expat )
-	)
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	python? ( || (
-			dev-lang/python:2.7
-			dev-lang/python:2.6
-			dev-lang/python:2.5
-			dev-lang/python:2.4
-		) )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxGuestControlSvc.so
-	opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxHeadless
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxManage
-	opt/VirtualBox/VBoxNetAdpCtl
-	opt/VirtualBox/VBoxNetDHCP
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VBoxSDL
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxSVC
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxTestOGL
-	opt/VirtualBox/VBoxTunctl
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxXPCOM.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxXPCOMIPCD
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VirtualBox
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/components/VBoxXPCOMIPCC.so
-	opt/VirtualBox/kchmviewer
-	opt/VirtualBox/libQtCoreVBox.so.4
-	opt/VirtualBox/libQtGuiVBox.so.4
-	opt/VirtualBox/libQtNetworkVBox.so.4
-	opt/VirtualBox/libQtOpenGLVBox.so.4
-	opt/VirtualBox/vboxwebsrv"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
-	popd &>/dev/null || die
-
-	if use sdk; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newicon VBox.png ${PN}.png
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use additions; then
-		doins -r additions || die
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp || die
-		doins -r rdesktop-vrdp-keymaps || die
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm || die
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	if use python; then
-		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
-			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
-				doins VBoxPython${pyver/./_}.so || die
-			fi
-		done
-	fi
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
deleted file mode 100644
index 758e61fd63b2..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild,v 1.5 2012/04/09 12:06:47 maekke Exp $
-
-EAPI=2
-
-inherit eutils unpacker fdo-mime gnome2 pax-utils
-
-MY_PV=${PV}-75467
-SDK_PV=${MY_PV}
-EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
-EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${PV}
-	!headless? (
-		x11-libs/libXcursor
-		media-libs/libsdl[X]
-		x11-libs/libXrender
-		x11-libs/libXfixes
-		media-libs/libpng
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXft
-		media-libs/freetype
-		media-libs/fontconfig
-		x11-libs/libXext
-		dev-libs/glib
-		chm? ( dev-libs/expat )
-	)
-	x11-libs/libXt
-	dev-libs/libxml2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	python? ( || (
-			dev-lang/python:2.7
-			dev-lang/python:2.6
-			dev-lang/python:2.5
-			dev-lang/python:2.4
-		) )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxGuestControlSvc.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-	opt/VirtualBox/VBoxDD2.so
-	opt/VirtualBox/VBoxDDU.so
-	opt/VirtualBox/VBoxDbg.so
-	opt/VirtualBox/VBoxGuestControlSvc.so
-	opt/VirtualBox/VBoxGuestPropSvc.so
-	opt/VirtualBox/VBoxHeadless
-	opt/VirtualBox/VBoxHeadless.so
-	opt/VirtualBox/VBoxKeyboard.so
-	opt/VirtualBox/VBoxManage
-	opt/VirtualBox/VBoxNetAdpCtl
-	opt/VirtualBox/VBoxNetDHCP
-	opt/VirtualBox/VBoxNetDHCP.so
-	opt/VirtualBox/VBoxOGLhostcrutil.so
-	opt/VirtualBox/VBoxOGLhosterrorspu.so
-	opt/VirtualBox/VBoxOGLrenderspu.so
-	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
-	opt/VirtualBox/VBoxPython2_5.so
-	opt/VirtualBox/VBoxPython2_6.so
-	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
-	opt/VirtualBox/VBoxREM.so
-	opt/VirtualBox/VBoxREM32.so
-	opt/VirtualBox/VBoxREM64.so
-	opt/VirtualBox/VBoxRT.so
-	opt/VirtualBox/VBoxSDL
-	opt/VirtualBox/VBoxSDL.so
-	opt/VirtualBox/VBoxSVC
-	opt/VirtualBox/VBoxSettings.so
-	opt/VirtualBox/VBoxSharedClipboard.so
-	opt/VirtualBox/VBoxSharedCrOpenGL.so
-	opt/VirtualBox/VBoxSharedFolders.so
-	opt/VirtualBox/VBoxTestOGL
-	opt/VirtualBox/VBoxTunctl
-	opt/VirtualBox/VBoxVMM.so
-	opt/VirtualBox/VBoxVRDP.so
-	opt/VirtualBox/VBoxXPCOM.so
-	opt/VirtualBox/VBoxXPCOMC.so
-	opt/VirtualBox/VBoxXPCOMIPCD
-	opt/VirtualBox/VRDPAuth.so
-	opt/VirtualBox/VirtualBox
-	opt/VirtualBox/VirtualBox.so
-	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-	opt/VirtualBox/components/VBoxC.so
-	opt/VirtualBox/components/VBoxSVCM.so
-	opt/VirtualBox/components/VBoxXPCOMIPCC.so
-	opt/VirtualBox/kchmviewer
-	opt/VirtualBox/libQtCoreVBox.so.4
-	opt/VirtualBox/libQtGuiVBox.so.4
-	opt/VirtualBox/libQtNetworkVBox.so.4
-	opt/VirtualBox/libQtOpenGLVBox.so.4
-	opt/VirtualBox/vboxwebsrv"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
-	popd &>/dev/null || die
-
-	if use sdk; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		pushd "${S}"/icons &>/dev/null || die
-		for size in * ; do
-			if [ -f "${size}/virtualbox.png" ] ; then
-				insinto "/usr/share/icons/hicolor/${size}/apps"
-				newins "${size}/virtualbox.png" ${PN}.png
-			fi
-		done
-		dodir /usr/share/pixmaps
-		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
-			|| die
-		popd &>/dev/null || die
-
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use additions; then
-		doins -r additions || die
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp || die
-		doins -r rdesktop-vrdp-keymaps || die
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm || die
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	if use python; then
-		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
-			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
-				doins VBoxPython${pyver/./_}.so || die
-			fi
-		done
-	fi
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${D}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} VirtualBox; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${D}"/opt/VirtualBox/${each}
-		done
-
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	# move udev scripts into /lib/udev (bug #372491)
-	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	gnome2_icon_cache_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 21e2e14b958e..a7926a982322 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,2 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz 10047772 RMD160 5891f472b300f203e73da5597257060fa22e5542 SHA1 8ce8369ae74429062abc3e4fd3f2b4bebd5024b4 SHA256 e1ddcbb62de299b67350a4c9f3425b1f71aca490611891fd07e98f15a890d09f
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 RMD160 0a65fb69ad482c655f564a3f63ed958390c26c48 SHA1 28d63bceca076ae65afc3df814d622b630f8d372 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz 10063096 RMD160 54e5748ee840376ca0b539e1956d496eb9c8dc9e SHA1 ae0f3f52bd46ab19a1a1c85d3c4381afb5dc19ac SHA256 82c112ab6003a92e6065a277077b2f3e1a9ca6871773ac3f4b1c771b8e699b42
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild
similarity index 86%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild
index d12680817cb2..bcbc39436ee1 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.10.ebuild,v 1.1 2012/03/15 09:55:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.14.ebuild,v 1.1 2012/04/26 18:20:52 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils
 
-MY_BUILD="76795"
+MY_BUILD="77440"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
 MY_P="${MY_PN}-${PV}-${MY_BUILD}"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
deleted file mode 100644
index 78a23a600d58..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.4.ebuild,v 1.3 2011/12/07 17:28:48 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_BUILD="74291"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${PV}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
deleted file mode 100644
index d1ac69c35542..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.8.ebuild,v 1.3 2012/04/09 12:08:03 maekke Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_BUILD="75467"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${PV}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 27073d119e3e..d2908ca68bb0 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,2 @@
-DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
 DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
-DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+DIST VirtualBox-4.1.14.tar.bz2 73260319 RMD160 68bb81486dad190a1bd74251ad32ee16d47be625 SHA1 126e61d5f7187d62b2b213b658912c83f49e6de6 SHA256 034cfd19d5dd701cd1375b994ad6f2d41c207b6760c6b8c5fe3005e53134dff8
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild
similarity index 98%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild
index e240a06f6155..18c1448bca00 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.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/virtualbox-guest-additions/virtualbox-guest-additions-4.1.10.ebuild,v 1.2 2012/03/15 16:52:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.14.ebuild,v 1.1 2012/04/26 18:22:41 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
deleted file mode 100644
index 9889bb15d4d1..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.4-r1.ebuild,v 1.3 2011/12/07 17:29:29 phajdan.jr Exp $
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE )
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-libs/pam
-		sys-power/iasl
-		X? ( x11-proto/renderproto )
-		!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-}
-
-src_compile() {
-		source ./env.sh
-
-		for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /lib/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-
-		# VBoxClient autostart file
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}"/vboxclient.desktop
-
-		# sample xorg.conf
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! use X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog ""
-		elog "Please add users to the \"vboxguest\" group so they can"
-		elog "benefit from seamless mode, auto-resize and clipboard."
-		elog ""
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to start"
-		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
-		elog ""
-		elog "Also make sure you use the Mesa library for OpenGL:"
-		elog "    eselect opengl set xorg-x11"
-		elog ""
-		elog "An autostart .desktop file has been installed to start"
-		elog "VBoxClient in desktop sessions."
-		elog ""
-		elog "You can mount shared folders with:"
-		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
deleted file mode 100644
index 6cec4e059743..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.8.ebuild,v 1.3 2012/04/09 12:06:08 maekke Exp $
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE )
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-libs/pam
-		sys-power/iasl
-		X? ( x11-proto/renderproto )
-		!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-}
-
-src_compile() {
-		source ./env.sh
-
-		for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-
-		# Now creating the kernel modules. We must do this _after_
-		# we compiled the user-space tools as we need two of the
-		# automatically generated header files. (>=3.2.0)
-		linux-mod_src_compile
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins 98vboxadd-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /lib/udev/rules.d
-		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
-			|| die
-
-		# VBoxClient autostart file
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}"/vboxclient.desktop
-
-		# sample xorg.conf
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/xorg.conf.vbox
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! use X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog ""
-		elog "Please add users to the \"vboxguest\" group so they can"
-		elog "benefit from seamless mode, auto-resize and clipboard."
-		elog ""
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to start"
-		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
-		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
-		elog ""
-		elog "Also make sure you use the Mesa library for OpenGL:"
-		elog "    eselect opengl set xorg-x11"
-		elog ""
-		elog "An autostart .desktop file has been installed to start"
-		elog "VBoxClient in desktop sessions."
-		elog ""
-		elog "You can mount shared folders with:"
-		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index fe4df67a13ea..0724dd934358 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,2 @@
-DIST vbox-kernel-module-src-4.1.10.tar.xz 458956 RMD160 cc367f577348bec9aac13c6753cb70c1b7834683 SHA1 d88db3022d31b36da83a50a93a36081695e2bb3a SHA256 a5659cb71e9e22857c3f4e2b132a3c99323a33685eeb129af87ba87d549d219d
 DIST vbox-kernel-module-src-4.1.12.tar.xz 459148 RMD160 3cc0d80f0cd50259bd63b2b4353c4160f414d50c SHA1 f4cd83788dde4f735d10593f2676345a0ef3b91e SHA256 70707451b9dab6128005410f515f0c2c5d8c295b319243d9e623ae68c5acff1f
-DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
-DIST vbox-kernel-module-src-4.1.8.tar.xz 457648 RMD160 2451d2c23e5ab14b70b9b6da79c164499a864eec SHA1 ac97198d3275a338905bb04efffde467bbeff9dc SHA256 565c9d9b193e88679549995d63c5796e19f881f9f95215f8cc6a11d13e749a9f
+DIST vbox-kernel-module-src-4.1.14.tar.xz 459068 RMD160 e952de92ef5bdfe66ee86e7ffa196e38c9f01481 SHA1 1be94e95110c9adf8d2fb18b139b826bebaac281 SHA256 9ae9caa701e3fcdc9d5139c203cb0a6801e4ccb3478491a5b614ae0e5cab3439
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild
similarity index 95%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild
index ad55197755d6..f60c28dffe56 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.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/virtualbox-modules/virtualbox-modules-4.1.10.ebuild,v 1.1 2012/03/15 09:52:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.14.ebuild,v 1.1 2012/04/26 18:18:43 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
deleted file mode 100644
index e9f0fedbed48..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.4.ebuild,v 1.5 2011/12/07 17:26:06 phajdan.jr Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=2
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Starting with the 3.x release new kernel modules were added,"
-	elog "be sure to load all the needed modules."
-	elog ""
-	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-	elog "/etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
deleted file mode 100644
index e5102f7cbd3b..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.8.ebuild,v 1.3 2012/04/09 12:04:48 maekke Exp $
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=4
-
-inherit eutils linux-mod
-
-MY_P=vbox-kernel-module-src-${PV}
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S=${WORKDIR}
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxusers
-}
-
-src_prepare() {
-	if kernel_is -ge 2 6 33 ; then
-		# evil patch for new kernels - header moved
-		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-	fi
-
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	elog "Starting with the 3.x release new kernel modules were added,"
-	elog "be sure to load all the needed modules."
-	elog ""
-	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
-	elog "/etc/conf.d/modules"
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 27073d119e3e..d2908ca68bb0 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,4 +1,2 @@
-DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
 DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
-DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+DIST VirtualBox-4.1.14.tar.bz2 73260319 RMD160 68bb81486dad190a1bd74251ad32ee16d47be625 SHA1 126e61d5f7187d62b2b213b658912c83f49e6de6 SHA256 034cfd19d5dd701cd1375b994ad6f2d41c207b6760c6b8c5fe3005e53134dff8
diff --git a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild b/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
deleted file mode 100644
index d7e6c1f4b6b2..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.3 2012/04/05 07:44:41 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-if [[ ${PV} == "9999" ]] ; then
-	# XXX: should finish merging the -9999 ebuild into this one ...
-	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-	inherit linux-mod subversion
-else
-	MY_P=VirtualBox-${PV}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( virtual/jre:1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.6 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Fix compile error on hardened bug 339914 (disable PIE)
-	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox_nopie.patch
-	fi
-
-	# Link to correct gsoap library. Bug #408569
-	# This has been fixed upstream and should be removed when virtualbox is
-	# bumped
-	epatch "${FILESDIR}"/${P}-libgsoapssl.patch
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components || die
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins $each || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
-		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	else
-		doins VBoxHeadless || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.14.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-4.1.14.ebuild
index c5750c476124..a64fa6f69436 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.8-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.14.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/virtualbox/virtualbox-4.1.8-r1.ebuild,v 1.2 2012/02/25 13:13:32 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.14.ebuild,v 1.2 2012/04/26 18:24:57 polynomial-c Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=VirtualBox-${PV}
 	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 		media-libs/libsdl[X,video]
 	)
 	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( virtual/jre:1.6 )"
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.999
 	>=dev-lang/yasm-0.6.2
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
-	java? ( virtual/jdk:1.6 )
+	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
@@ -213,7 +213,7 @@ src_compile() {
 	# strip-flags
 
 	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
+		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
 		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
 		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
 		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
diff --git a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild b/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
deleted file mode 100644
index 857a10b1aefb..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.4.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.4.ebuild,v 1.6 2011/12/27 21:53:21 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-if [[ ${PV} == "9999" ]] ; then
-	# XXX: should finish merging the -9999 ebuild into this one ...
-	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-	inherit linux-mod subversion
-else
-	MY_P=VirtualBox-${PV}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.5 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-pkg_setup() {
-	if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
-		eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
-		eerror "You must use gcc-config to select a profile without this feature.  You may"
-		eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
-		eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
-		eerror "Remember to run \"source /etc/profile\" before continuing.  See bug #339914."
-		die
-	fi
-
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Fixed compilation with yasm-1.2.0 (bug #391189)
-	epatch "${FILESDIR}"/${PN}-4.1.6-yasm120-fix.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components || die
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins $each || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-	else
-		doins VBoxHeadless || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-	fi
-
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild b/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
deleted file mode 100644
index 95ff8614a362..000000000000
--- a/app-emulation/virtualbox/virtualbox-4.1.8.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.8.ebuild,v 1.5 2012/04/09 12:07:27 maekke Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils python qt4-r2 toolchain-funcs java-pkg-opt-2
-
-if [[ ${PV} == "9999" ]] ; then
-	# XXX: should finish merging the -9999 ebuild into this one ...
-	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-	inherit linux-mod subversion
-else
-	MY_P=VirtualBox-${PV}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
-fi
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl
-	dev-libs/libxml2
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-core:4
-			opengl? ( x11-libs/qt-opengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl[X,video]
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( virtual/jre:1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	media-libs/libpng
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.6 )
-	dev-util/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
-	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-"
-
-pkg_setup() {
-	if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
-		eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
-		eerror "You must use gcc-config to select a profile without this feature.  You may"
-		eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
-		eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
-		eerror "Remember to run \"source /etc/profile\" before continuing.  See bug #339914."
-		die
-	fi
-
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
-
-	# unset useless/problematic checks in configure
-	epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch" \
-		"${FILESDIR}/${PN}-4-makeself-check.patch" \
-		"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-	# fix build with --as-needed (bug #249295 and bug #350907)
-	epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
-
-	# Respect LDFLAGS
-	sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
-	epatch "${FILESDIR}/${PN}-4.0.2-restore_old_machines_dir.patch"
-
-	# Don't build vboxpci.ko module (D'oh!)
-	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
-		sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use java       || myconf+=" --disable-java"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	use doc        || myconf+=" --disable-docs"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s/MY_LIBDIR/$(get_libdir)/" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components || die
-
-	if use sdk ; then
-		doins -r sdk || die
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
-		doins $each || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins $each || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox || die
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 20 32 40 48 64 128 ; do
-			insinto /usr/share/icons/hicolor/${size}x${size}/apps
-			newins ${PN}-${size}px.png ${PN}.png
-		done
-		insinto /usr/share/pixmaps
-		newins ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	else
-		doins VBoxHeadless || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile} || die
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile} || die
-	done
-	popd &>/dev/null || die
-
-	# New way of handling USB device nodes for VBox (bug #356215)
-	insinto /lib/udev
-	doins VBoxCreateUSBNode.sh
-	fowners root:vboxusers /lib/udev/VBoxCreateUSBNode.sh
-	fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-i18n/unicode-data/unicode-data-6.0.0.ebuild b/app-i18n/unicode-data/unicode-data-6.0.0.ebuild
index 0e428e4e4a5f..97616e2ad888 100644
--- a/app-i18n/unicode-data/unicode-data-6.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-6.0.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/app-i18n/unicode-data/unicode-data-6.0.0.ebuild,v 1.7 2012/04/01 16:54:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/unicode-data/unicode-data-6.0.0.ebuild,v 1.8 2012/04/26 20:01:40 aballier Exp $
 
 DESCRIPTION="Unicode data from unicode.org"
 HOMEPAGE="http://unicode.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://debian/pool/main/u/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-misc/getopt/getopt-1.1.4.ebuild b/app-misc/getopt/getopt-1.1.4.ebuild
index d19ccde5169a..fc2243913ecc 100644
--- a/app-misc/getopt/getopt-1.1.4.ebuild
+++ b/app-misc/getopt/getopt-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/getopt/getopt-1.1.4.ebuild,v 1.6 2010/08/18 16:02:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v 1.7 2012/04/26 17:13:54 aballier Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://software.frodo.looijaard.name/getopt/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-office/calligra-l10n/Manifest b/app-office/calligra-l10n/Manifest
index ca26bc662e37..8df864b2920f 100644
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@@ -1,49 +1,52 @@
-DIST calligra-l10n-ca-2.3.92.tar.bz2 567109 RMD160 0bc66eafbbc31ddaf89b7a8827a38a90e5dd16a2 SHA1 257a2ef3f207e90d6df88300c2655d5f3eb0ead4 SHA256 2f952674f851ca6e4f419359e2e0156bc0041989aa87b641139e3ae0e2ea974b
 DIST calligra-l10n-ca-2.4.0.tar.bz2 570736 RMD160 15588839f08061bfee2ab53d2da36de9e3779263 SHA1 81915385c3cfe91822e0795573f06fce696570a5 SHA256 3ae4f0a5b04e1b30c995d14f8f96fac9bc1b775e675c1523df2591b2d0a773b5
-DIST calligra-l10n-ca@valencia-2.3.92.tar.bz2 373574 RMD160 e03ce276f4058e260ffbf1fa655665847ab1a021 SHA1 89d5bcb42cf6cf1b9f352d33e25e9f6ccb5245d4 SHA256 97f830a47a6e58184033e066b49724204ac559026d01697417c72ea976c9ee57
+DIST calligra-l10n-ca-2.4.1.tar.bz2 445839 RMD160 6808ee093919f2775d8fa67a7573d9a3a84a0c05 SHA1 c80dd3ab66288af837d751aea295fad6b79173fd SHA256 e91358b9c7370a252fc17aca8c04d5aae1e21949eecdf11b29ce099f7a0e15fa
 DIST calligra-l10n-ca@valencia-2.4.0.tar.bz2 373669 RMD160 f1eae3daefdc2d6f606ea492a39b8460051f7242 SHA1 fd5e2a7ac5202d6197624237af3aa29718380fd6 SHA256 2333d508b098cfeafa5f92e0ea858a0a6798361f408d8476e23f759eb0998843
-DIST calligra-l10n-cs-2.3.92.tar.bz2 348586 RMD160 3338f8b94fa468b2a92fc7e95cb184e5a6d5b259 SHA1 0339902d94876d857ecedcc0c2b190b1bda33af2 SHA256 0baeb9d21e25fa0fab9c40387978b460861d491e0e34a9f32973b6de75f7ddd7
+DIST calligra-l10n-ca@valencia-2.4.1.tar.bz2 272051 RMD160 8bf42feb86db2f2f66ac382c877bc20ad52987e2 SHA1 6da2ec3b13c5c76ec3779029298eed4c1d5dbc04 SHA256 47ffb1182e24f103d5ea2d458c247abe7e717e6d3030a2ec659766ef4338d55d
 DIST calligra-l10n-cs-2.4.0.tar.bz2 348422 RMD160 8cc4ee8160c44483b95b0b5ebab80567affc1f8c SHA1 33a09a399dbaa5d64c8e15935efafeca4dbef25f SHA256 47368486d0f91c6f14429fba929c55367476dbbd8878a4bd663cad4743302836
-DIST calligra-l10n-da-2.3.92.tar.bz2 545424 RMD160 25339953012d36253d5ac946d9c55390b17ec999 SHA1 c705ff36ded75bba8daf9919bb293984e4f87ac7 SHA256 e6f958d3bc1790a79299bc51de2b368b6675cdd5c44de8a8305ffc67d1e97d7d
+DIST calligra-l10n-cs-2.4.1.tar.bz2 348465 RMD160 c1c87dfc56156ce1e3e33c119a1394e8a44cd386 SHA1 6ad3988a7b5ad42afffbb7b3e6754a2a15593c61 SHA256 66b39dba1035791ca3f384a345917a1a75c1f3d18d05f9e1418c31f4583f7df5
 DIST calligra-l10n-da-2.4.0.tar.bz2 547503 RMD160 180b651a8141a023f9547b6cd43b27dd77e4e5e8 SHA1 896775fe6869bfcce1565af5c4bba7cb52486aed SHA256 7f3707dad31d4d916da00231149a8b28198ebdafd53a2b9cdc5d8881c1095433
-DIST calligra-l10n-de-2.3.92.tar.bz2 700457 RMD160 72c3b81444a825a443de17aa823733359f1c4394 SHA1 914b91ec679510677a15179f0fd79650aafd32d5 SHA256 1777ef19ff488bb78128d662fb713be36dc9c9d537f77d094d6c6c2006f5c77b
+DIST calligra-l10n-da-2.4.1.tar.bz2 547245 RMD160 4f0b8b00bed56d9293d729ff66ea2792919d4569 SHA1 925a0e32c9298abecb8518afd139674365d2b5b5 SHA256 7ff2f6120bd8ac686495ef9471cd212a0ff02b5bc96fe8d2b3323a3c1d75b096
 DIST calligra-l10n-de-2.4.0.tar.bz2 708479 RMD160 ae9b20a583384fe9d66559b81410b6cba7055d98 SHA1 c02c798576c0e100cf675ae612aca62090e71e88 SHA256 97cb0cc2c21e271a82434e26ddaea5a2762c755657cf6e1e76309119bcd9bfa1
-DIST calligra-l10n-el-2.3.92.tar.bz2 417001 RMD160 6977b58f3c6f3a853d2ba57cf0330265559e348f SHA1 c5ef8b63d5eae9422731ece3a5f1eabac6a05e88 SHA256 f4e3266572ed454783b040abce75785e37a4db1a9fe0a506294b3eb08d53c63f
+DIST calligra-l10n-de-2.4.1.tar.bz2 717222 RMD160 3d1f191669894b90b53e02330ed0deae6db9b5a7 SHA1 28fac826898d1af82e89c1312bfc4f6b7b7134c1 SHA256 1bdbe3886f907edf1bd590baef5d38f4bf35a6d07b687c078cd5e8156c8fe773
 DIST calligra-l10n-el-2.4.0.tar.bz2 418604 RMD160 d9f1f29c72f8f77a10928c81547686651deaa198 SHA1 1a067e1a37f713e1909fd4b7870fc43d3b754c3f SHA256 20ee3e5e3ec5f469427052fc0ab15c4196c62cfe1cba99876ede3fa975e09d94
-DIST calligra-l10n-en_GB-2.3.92.tar.bz2 391742 RMD160 112c4fd160447384c36876c5305983e6ccd17b74 SHA1 925325e37942941ff61b7325b49cc82c96c35c02 SHA256 45a3136d7609fdedbde063c02326aa906c9dd35ab6fea22efc81f8408deb8ebe
+DIST calligra-l10n-el-2.4.1.tar.bz2 418084 RMD160 bde144c28c695d4e79ecfd3d3724b5a03cb442ca SHA1 b3af9583ad89413b40757875b608c960975084ad SHA256 0d8632a70cee7c4b4772662862edca9bc031c2e9dddce834d6cfc3ef1af8c000
 DIST calligra-l10n-en_GB-2.4.0.tar.bz2 391663 RMD160 d24b10e221b560ceec88dec236fcf574220a8f78 SHA1 ddfa151543755099fb9377245ce85a9d1627a534 SHA256 932922410d573e1df184114029ceeb23582390c427146fda60017c414644b656
-DIST calligra-l10n-es-2.3.92.tar.bz2 4383361 RMD160 1d186b8cd5ca47f7036855207376426342a0e39f SHA1 3ca2828ad0b897af655773947ca046cd621889c0 SHA256 d6cf9979f1f8132419bcc91fbaf1e5955adf9e05ef552c9e2230ad5f3a1c3b98
+DIST calligra-l10n-en_GB-2.4.1.tar.bz2 391616 RMD160 52d7318df610c5bbc1d4046e2ce8ed13ce2ec890 SHA1 a6a17ea973fdcf8c7b97cb9746c94c956e1b5f77 SHA256 c6ff94d764e2e8d25e2e82eb2238f53f010009a4372af7e6c71d73d0b68d08f9
 DIST calligra-l10n-es-2.4.0.tar.bz2 4387963 RMD160 a1a3c83c6dc4bcedab661c0a9178c5f8333a08b4 SHA1 8a5c0cbf79a9f516e832c206c120aceddc407091 SHA256 46de265b932e739c213a4bf8da41f97d17a0a2d487953d700981adea88168704
-DIST calligra-l10n-et-2.3.92.tar.bz2 683273 RMD160 febb59f8d399640dffddf55e544be2b66261202f SHA1 a5ca218740524231240ade7afe079a040d74f242 SHA256 c5baeda71bf9b35f3f730f97e36a2a49112b959b64c585c216cde56bfd390f76
+DIST calligra-l10n-es-2.4.1.tar.bz2 4379808 RMD160 ec77d4422d6d824221a6bcd28aae121651bc7ebf SHA1 889ac2aa840615872bf55d069f7e617704872a5f SHA256 d7bf511c489a1c5295550d596a180e57528bfef24d4ee5da976b53971ee58055
 DIST calligra-l10n-et-2.4.0.tar.bz2 687791 RMD160 da6d98d00ae2e613831ef31727e29466fe9f17f7 SHA1 019d43b9d6507fd40c5bca45d66adc99a46a9ae7 SHA256 59631532e5d3db624f4c77ccf3cd341d68fdb0e7bb5df26858d6ed72d2f8f7db
+DIST calligra-l10n-et-2.4.1.tar.bz2 686462 RMD160 4ffb7ad12c2172c2a6b6e259aa89190687fbc910 SHA1 45a05296ce9bf067430b0cfb48efb64f9c093cd9 SHA256 9ae5f5a72448043ec5531abad4b62e5e7debcc79ae11649b73fede4653c500a4
 DIST calligra-l10n-fi-2.4.0.tar.bz2 395525 RMD160 966cbc0ffffc89e03e1589b187c16f6136bed690 SHA1 2e6c2820ef06fc498b579075a903699ad8721c63 SHA256 4d38cfbfb4954082efe27cd26454d86f73093983f9803c369e2173d81436d78f
-DIST calligra-l10n-fr-2.3.92.tar.bz2 5608805 RMD160 235fb7758ae001412588e2d486ab7cd84d6137c9 SHA1 55c25df105fe9788b172bc6302512c8b5f6f3ef8 SHA256 944ded0209083237bb8a9981e8c32bba12147b3c370a4ec614a7ef4730008777
+DIST calligra-l10n-fi-2.4.1.tar.bz2 404655 RMD160 357f95edec3a302338346ebd55502342d49a424b SHA1 bf6e9daed60c81e89681741cea131c6d2bde9467 SHA256 be8938bbea19794e55ba2d980084780a69fc7d3aa8a62a68af6a9257fbb865c9
 DIST calligra-l10n-fr-2.4.0.tar.bz2 5612643 RMD160 2e565893310671fa094514cef67460434d044092 SHA1 085d1fa841e93fee0daf938988c5a0f4441d0540 SHA256 5e79438727b5711ba5b6a3936a24b2a4c88aaf9f6110f1cc7c4b794b2bb127be
+DIST calligra-l10n-fr-2.4.1.tar.bz2 5612296 RMD160 39afbdcd2d59d0e98c795a0a975bc965f6398a4e SHA1 b5549206def719a2d7afd4d4332c62b33dc88913 SHA256 6c86b8e69f4bec22e27e50b23f68459715138d922d850ccbff7cd0dca09a692d
 DIST calligra-l10n-hu-2.4.0.tar.bz2 447663 RMD160 cac1b2975166cb98153395f0f595b1cb8c1d6de5 SHA1 7d0d828e46939c1138c04ea44cdf0208f6b3ab51 SHA256 177a37f2cb1e8946f5c009746b2d62f40590dd56bccecae5d9a9c53c8a88a01a
-DIST calligra-l10n-it-2.3.92.tar.bz2 548597 RMD160 ed1c1164c4c27a1a1c9848fab5b938bc52476b9d SHA1 88668a2d4de03f7def382eba6c07987ad4e0c43a SHA256 706aa2f4f435e42e6e5623b96cc6b94acc19fc2848e4eb39bb61f1b151b749b8
+DIST calligra-l10n-hu-2.4.1.tar.bz2 447794 RMD160 e4bf3f907496fa4f9df924523ef9a7a4d1c78e37 SHA1 f0c865d090d0ad0a1e36bc6cdb19496d2872371b SHA256 c9825c7068eff7576ec90ebd3ef2a6c658c00d0f97a7e0e18db28db0b488087b
 DIST calligra-l10n-it-2.4.0.tar.bz2 626216 RMD160 97f3abdacbec18b27b155968207891bfb96a1412 SHA1 9d2c7506bad8b700285f695a7a2f836d07d0f253 SHA256 602675c88175f3b1f2a47e5c6d1871d222a60c302e776e7375024cdfbe859975
-DIST calligra-l10n-kk-2.3.92.tar.bz2 405599 RMD160 3dcaba9735cad204ce3175983cabc8ae36809af6 SHA1 d3748cd802567c620a2c36002725cdb79a351130 SHA256 d2a93a16135a01942d1ba8ecb1984863d2be0af2dad539e04c8741d4874e05e3
+DIST calligra-l10n-it-2.4.1.tar.bz2 626451 RMD160 2b8790361f9791d2919535447bb80deac7ee5652 SHA1 70bed20680b80d99acddf68c91ce5772c450517d SHA256 d19e62093c887c099de85abaa867b62efeef7fe4b02eb241ce2c7f5d8cdb24cb
 DIST calligra-l10n-kk-2.4.0.tar.bz2 405417 RMD160 0f83c6eaf4916319b9f7b80df70dc3c22df9cb00 SHA1 882e7b381d12fd89803a872656f8b4afaaf40f19 SHA256 522c553c9c20abc45f2120316f4e1ac48fec50c591928e911ab31d395cb9ab4f
-DIST calligra-l10n-nb-2.3.92.tar.bz2 368199 RMD160 9e7457582bab7561bc7cb205b899c15eb57acc99 SHA1 196b00d2196dce9a88298c3c9b72f838b08a746c SHA256 aefd7610de51b49466e7cb577044c03d71e49a5b92dc57a8519f3c9d9097bf56
+DIST calligra-l10n-kk-2.4.1.tar.bz2 405347 RMD160 f3052b520d644e7da0de16e7f92eb9f5a0a01495 SHA1 08f8e5a6d977278a27367ef306d47508774ff4b2 SHA256 11c9635ea1cb1c02dbb914d713df965252da78d6eb213d266293a51eee52e31a
 DIST calligra-l10n-nb-2.4.0.tar.bz2 367160 RMD160 85e66407ad5c2e1a35384a404c8e3c7341fa1c93 SHA1 c4bf514b578038b613cf509bb566d1789e76f07e SHA256 5331d0ecc220bfbe2eb2059b3cea09721be8705d839e2c9f42e67bf7ee335f20
-DIST calligra-l10n-nds-2.3.92.tar.bz2 413573 RMD160 b68c4ff471c200789295a7bb5f68b9c33f886a68 SHA1 267954e5792e2bbff635d6bf0282c6bd1f5fae3f SHA256 486c67e8ce96eac83f3000f565afc93120b58175d7b769fb0cd07f8307688ce8
+DIST calligra-l10n-nb-2.4.1.tar.bz2 367089 RMD160 5842220708fd2c0f81406697f185291a50447658 SHA1 064d2b8be1d551dd62197d64ab006cbbc6b0b563 SHA256 c7ec9e41c3f0bcef23dcf38dc5d6ee6ff796f91eaf7c466a61f68a84d262cfc5
 DIST calligra-l10n-nds-2.4.0.tar.bz2 413495 RMD160 6778fa40522883999edfcd48986a87b858f7ffaa SHA1 9e3dfe58619a112d3df5066bf105da3b02503721 SHA256 edb1c067a9f1cde256523197aad1ec52adbd79fd9a3ae58921b693307ca4d1f9
-DIST calligra-l10n-nl-2.3.92.tar.bz2 3080793 RMD160 fb7f33cdb9273226ed00e72a62e18fdf716b88a0 SHA1 6c3040a16584f2ef718cac45e0f1e69af69a2b26 SHA256 9d4862bf11a7a860435cb5742027a714848230970e32d3c58a7117c075579e68
+DIST calligra-l10n-nds-2.4.1.tar.bz2 413675 RMD160 ccaa5f4d5ed395e71e3407dec87b4c50daf1f1f9 SHA1 69c38219b76e24370f01c3138518708be0d2333e SHA256 a870724d97992877c32b98f56a31f0d6d504affd8668f61eb78ecf1e1c80280d
 DIST calligra-l10n-nl-2.4.0.tar.bz2 3101104 RMD160 8749eea191d7cba73dd7bd4ac86572ba786976f7 SHA1 2f0349f3d78906cce50e54e6fdf907d2c633bbc5 SHA256 b97f23ce76bc969db909db5351ac0c0e798bf0e910c4f9dafb7bd98777481384
-DIST calligra-l10n-pl-2.3.92.tar.bz2 431630 RMD160 f591f5c5e8d6b0ad34211f15ac74c73360456372 SHA1 ea1dcb134fea6cd757d1171c6f4cbaa2c6b43434 SHA256 dc39a6080c181eb8bed79671ff0525f552e322f2e641497cc56c467edb0c5738
+DIST calligra-l10n-nl-2.4.1.tar.bz2 3101210 RMD160 4381586f0bcd13230c300178cf4d1c59e371a72b SHA1 785d393e2159090e43f4d446971f5ca35fa98ead SHA256 0925debb77f789fda3cdbf3f5eecbc5a9fd7bef5a1d820bc12d190f6a3f6a751
 DIST calligra-l10n-pl-2.4.0.tar.bz2 430415 RMD160 5acb0f2957a8d632ab033a01dce0ae7e49ebdc95 SHA1 f3856e8e4ec45d97ef806e3e017443522437b7d4 SHA256 0c587e82cdd77af168de70a5d687f7e4e87d778a814ab7aca70195e5860909be
-DIST calligra-l10n-pt-2.3.92.tar.bz2 653858 RMD160 fc3e58dcbbcda8079029f9ce51f0e48d6d167ed4 SHA1 2d9b5a2c85a724ffe0457cc112a5e30f5d1f0238 SHA256 fd8e5479ac31303da4d46ced97563cdd09ea70f4e63784a4ad90786f07d2f838
+DIST calligra-l10n-pl-2.4.1.tar.bz2 430451 RMD160 e66040cc785568b38be1b2c8a21e6735f7ccb63b SHA1 34fe40f2cca6a607755cdf4aeae67c7cf67ff5cc SHA256 4c6994bbca6741c039960a388a2ae1ae491f02430b5b4d84dfff47997b9d6fe8
 DIST calligra-l10n-pt-2.4.0.tar.bz2 661740 RMD160 462f9b1f7627ad8aaec98f60d7a59cb592195788 SHA1 97d4175e00244627544f2c7c9ff705ed4c2f4cb6 SHA256 f3e3a6b9810632424a1f8ecb3210151ea4cef1f1a056c47d3f786856ae7238d4
-DIST calligra-l10n-pt_BR-2.3.92.tar.bz2 653828 RMD160 9d6d0df57659d6b7639893bd547b8b2aa480740b SHA1 387839b139ec09e931402a02f6c088726f1c12ab SHA256 d5ee254b534aef25aee0d00692cab9b5b5c26a3b815569444c7003cc0c5f03cb
+DIST calligra-l10n-pt-2.4.1.tar.bz2 661702 RMD160 e7393b6c305fc01ffb58857fb8ee3c35fa33bd5e SHA1 692fe295df06b7d35baac97b51c9edaa7a47a6a2 SHA256 b86800b4775943d8e8c55874bb54f956ecdbe7932871ff12c8788a33cb61529f
 DIST calligra-l10n-pt_BR-2.4.0.tar.bz2 732893 RMD160 e99370510590a9f5f756aaada00cc158061d727e SHA1 2f95778abd0d3cc9b7e57b31078630a5e6f7d996 SHA256 048ec11b6264fb18f73ba8ce21fee767be0969a94dd7e0053689d3c74e04a398
-DIST calligra-l10n-ru-2.3.92.tar.bz2 578211 RMD160 5408a4fb5a001fe14a24ca7c382a35bd9b58460f SHA1 746cb22bf2867cb7efadacfbde25b6f3fbcb099d SHA256 a57248b6665f51fd7ab67017752595cdfd4926216f630d366df54d3d85925411
+DIST calligra-l10n-pt_BR-2.4.1.tar.bz2 740021 RMD160 7da5bc5803c23632578cbe97272f2d75eab04688 SHA1 e036fc7d5cf6f872200fdd32b1699ef99cb436ed SHA256 9f9886a2af809e1cd19a89d806e78e241341565b78c25e874d61b2198c9c4fc5
 DIST calligra-l10n-ru-2.4.0.tar.bz2 581891 RMD160 490512a54f3b4eb0247f57128cdbb38770ff7ab7 SHA1 344279b09f6652ccf6a4d60f794787d275f5b423 SHA256 1d8fd66c6db513a5b060eff1834cb39f7c450a90886a124042e19f8b54d19721
+DIST calligra-l10n-ru-2.4.1.tar.bz2 582180 RMD160 fdc249e2ad8735dfb3c0f73585340e79123f7c31 SHA1 6ed334c95bae2bafbe197348ffec33a6368612d2 SHA256 8bcb3589cb47c39d723f3403d178ab408ebf07572f58f96d9e917293aa09fb91
 DIST calligra-l10n-sk-2.4.0.tar.bz2 367283 RMD160 dd4850a638372faddaeeee65b103ec4e450ff065 SHA1 f6e1af056e00fe0b4030d30195aa2816340615e3 SHA256 f4838375a9f00b054637a3b51521d35d70c2929de62d3ca775f0d1fb6d3abb19
-DIST calligra-l10n-sv-2.3.92.tar.bz2 2031629 RMD160 60080c5550ddaef4d07a01ea4939134f73fa7a4a SHA1 4d1aefa644c3451900dad209e8115eace904173f SHA256 455acfe9321641d34dba7abd30fe74003c582fccf923684c361cc064b59fbc04
+DIST calligra-l10n-sk-2.4.1.tar.bz2 367375 RMD160 7a81f6b2cc57db0c66b2754d8bb788b620e2edeb SHA1 04a24876644e9064515fbc7648dc2cb58a743de0 SHA256 c50c19c00a30e8105fcf3664ebeb8873c16dad078ed2272589040801f07db5eb
 DIST calligra-l10n-sv-2.4.0.tar.bz2 2047224 RMD160 16297c4403a308cf456ef4c378dce2f0d3a47050 SHA1 8151a48f8b1cb4c0c86754b36b90d624121a2886 SHA256 cd648e8c81ff7de17c770416735f5e3a36b54ba526d6c6a34caa16db395fc388
-DIST calligra-l10n-uk-2.3.92.tar.bz2 2111898 RMD160 6eadd2353106ed5e7d76dc6f0ba748663facbf3c SHA1 6c1ad467e2654e76dc4b51f73b09b709b07f8bab SHA256 c95cf52a3c9bb54664b4b55a4bde96bb83e7db483240350039c9523a61de0879
+DIST calligra-l10n-sv-2.4.1.tar.bz2 2047139 RMD160 5aa92135df6b6839fbcb4b2581eab03c97fe5159 SHA1 349ffc026eaa91804b38f07b485c697e70d98ae6 SHA256 90cda0ea4b307009d33ea1a69e3c31a47fc597b226d0a405d3021f025258d3ac
 DIST calligra-l10n-uk-2.4.0.tar.bz2 2126376 RMD160 548b09578d4d8fd4136e3e3a966a0a635072f27d SHA1 ebb1a885a15ad040bce4a7cc52fb1801d5410886 SHA256 8470becd0dcb97f6f81ef88a0be9aec43b8cd3bd53002a3cc0e2f61e5baf9fd9
-DIST calligra-l10n-zh_CN-2.3.92.tar.bz2 346337 RMD160 de5e104a055ff248dc8c8e03491164a0d0a3dda7 SHA1 ba9196fcf5477e430f7bcc1e7a3fc9e7a6d364c1 SHA256 21be114f123e9f9ac2cd773d61d36b250e4bde51deebca3c4624ece2f08d8556
+DIST calligra-l10n-uk-2.4.1.tar.bz2 2126067 RMD160 c13c86e901bf9aa995ff9d43862b0918373498a9 SHA1 a4e04b541dfc0645dc158e60156b42aa60b29716 SHA256 f8d0641484383cca74180862e8ea87f173d2b2a930f3a389d4676bf4f15460bd
 DIST calligra-l10n-zh_CN-2.4.0.tar.bz2 346212 RMD160 bf50948c022ce2804f7278918c37f02c4abea632 SHA1 da1d143196c02650548508381ff535b705140a98 SHA256 d0d023bf2811c0f45d40489f56d7cd774b8dcf241d7196ad0f8f120214841134
-DIST calligra-l10n-zh_TW-2.3.92.tar.bz2 387267 RMD160 ea38ab970060929bd7bf35bf13d4546f0335ef8e SHA1 d638af08639dd84db74888da7da13af65fbf48e3 SHA256 ee7621b2b4e79f06bd37db07f3685b125f271911a37ac8af39bb6a26660ae396
+DIST calligra-l10n-zh_CN-2.4.1.tar.bz2 346321 RMD160 6b55670d5469c284a4f8b35b0f56cb8d6dfca86d SHA1 2635cc9cad771e550a55f54da1fc3c34cc94c652 SHA256 a64c051bf3388eb6c7b863d6dbe0a40c3ae0934acd8b9bd10519fe2e4fa8f49d
 DIST calligra-l10n-zh_TW-2.4.0.tar.bz2 386218 RMD160 899d2daf02fcdecef9f6d9a86cf6163dec5ae90a SHA1 5e217abb640555e89929b7922d61abc2ba9e90b3 SHA256 b637b490c1d917f5d325806d92000def98d434c5d902b51babfc09fe4af17026
+DIST calligra-l10n-zh_TW-2.4.1.tar.bz2 386393 RMD160 839342417ff79bcda503ed048e2e956fa1dab929 SHA1 c4386d1fc6a35be3b41d4e49b37cec7a2c27c8e4 SHA256 f5763e13aac69659f1379a2e51f565791ee07d32a2df30c724415e4be0704ecd
diff --git a/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild b/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
similarity index 86%
rename from app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild
rename to app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
index 041d8bbd7461..f05000ac71a2 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.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/app-office/calligra-l10n/calligra-l10n-2.3.92.ebuild,v 1.1 2012/03/22 07:27:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild,v 1.1 2012/04/26 22:36:02 dilfridge Exp $
 
 EAPI=4
 
@@ -16,8 +16,8 @@ RDEPEND=""
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/unstable/${PN/-l10n/}-${PV}/${PN}/"
+MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
+URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
 SRC_URI=""
 SLOT="4"
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 6f858a0de538..77a8a162cb13 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
 DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
+DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
diff --git a/app-office/calligra/calligra-2.4.1.ebuild b/app-office/calligra/calligra-2.4.1.ebuild
new file mode 100644
index 000000000000..acdfa3a49564
--- /dev/null
+++ b/app-office/calligra/calligra-2.4.1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.1 2012/04/26 22:35:26 dilfridge Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+EGIT_BRANCH="calligra/2.4"
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_sheets? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=x11-libs/qt-gui-4.8.1-r1
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		=dev-libs/libpqxx-3*
+	)
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild
index 7bc6f20b8f2e..d3b2728b12c3 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6.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-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild,v 1.1 2012/04/11 21:41:28 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6.ebuild,v 1.2 2012/04/26 22:19:18 aballier Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
 # Note: dev-lang/python dependencies are so emerge will print a blocker if any
diff --git a/app-text/asciidoc/asciidoc-8.6.7.ebuild b/app-text/asciidoc/asciidoc-8.6.7.ebuild
index d3f918d56319..043d6cb30b70 100644
--- a/app-text/asciidoc/asciidoc-8.6.7.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.7.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-text/asciidoc/asciidoc-8.6.7.ebuild,v 1.2 2012/03/23 14:24:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.7.ebuild,v 1.3 2012/04/26 18:29:53 aballier Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ if [ "$PV" == "9999" ]; then
 	S=${WORKDIR}/hg
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 61ef92e85af4..4f3a94b2cb30 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.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-text/asciidoc/asciidoc-9999.ebuild,v 1.7 2012/03/23 14:24:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.8 2012/04/26 18:29:53 aballier Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ if [ "$PV" == "9999" ]; then
 	S=${WORKDIR}/hg
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.ebuild
index 2705036ba1b5..6ac61fa4ecbe 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.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-text/build-docbook-catalog/build-docbook-catalog-1.19.ebuild,v 1.1 2012/03/28 19:39:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.19.ebuild,v 1.2 2012/04/26 17:20:54 aballier Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/djvu/djvu-3.5.24-r1.ebuild b/app-text/djvu/djvu-3.5.24-r1.ebuild
index 9ab1056ab2f7..bd3bf9f222ca 100644
--- a/app-text/djvu/djvu-3.5.24-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.24-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/app-text/djvu/djvu-3.5.24-r1.ebuild,v 1.2 2012/04/21 17:27:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.24-r1.ebuild,v 1.3 2012/04/26 21:02:42 aballier Exp $
 
 EAPI=4
 inherit eutils fdo-mime autotools flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc jpeg nls tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index ce7c2193ac10..c17f4792daf2 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild,v 1.9 2010/02/11 14:50:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild,v 1.10 2012/04/26 22:43:25 aballier Exp $
 
 inherit sgml-catalog eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 0b16e33a8b47..443dbe226a93 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild,v 1.9 2010/02/11 14:50:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild,v 1.10 2012/04/26 19:17:43 aballier Exp $
 
 inherit sgml-catalog eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="3.1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index 189e39bc4cfc..1915a6335b88 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.21 2010/02/11 14:51:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.22 2012/04/26 18:27:47 aballier Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index 5ec989cebebe..c0883997bb69 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.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-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.16 2011/05/03 06:44:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.17 2012/04/26 17:22:28 aballier Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index aa133818f6bf..a14378e96c5f 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-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/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.18 2011/05/03 06:44:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.19 2012/04/26 18:27:47 aballier Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
index b66bede3684f..8828b9ef2ac3 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.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-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild,v 1.10 2011/05/03 06:44:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild,v 1.11 2012/04/26 17:24:19 aballier Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
index 8f295514761e..8dfd5ff85a40 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-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/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild,v 1.11 2011/05/03 06:44:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild,v 1.12 2012/04/26 17:25:47 aballier Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
index 1c71f8365559..ac32508d6f7f 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.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/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.7 2012/02/02 16:14:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.8 2012/04/26 17:21:45 aballier Exp $
 
 DESCRIPTION="XSL Stylesheets for Docbook"
 HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/docbook/docbook-xsl-${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
index e9d181ebe3ca..9584aee38feb 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.05.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-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild,v 1.3 2012/04/05 19:47:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild,v 1.4 2012/04/26 21:11:46 aballier Exp $
 
 EAPI=3
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
 
 COMMON_DEPEND="
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
index 80c151d6a6f5..967e052684bd 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.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-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.4 2012/04/25 19:30:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.5 2012/04/26 22:56:52 aballier Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.6.12[python]
diff --git a/app-text/libpaper/libpaper-1.1.24-r1.ebuild b/app-text/libpaper/libpaper-1.1.24-r1.ebuild
index e1ea1d484edd..e542e37f4de7 100644
--- a/app-text/libpaper/libpaper-1.1.24-r1.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-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/app-text/libpaper/libpaper-1.1.24-r1.ebuild,v 1.8 2012/03/18 18:58:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.24-r1.ebuild,v 1.9 2012/04/26 20:47:07 aballier Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/openjade/openjade-1.3.2-r4.ebuild b/app-text/openjade/openjade-1.3.2-r4.ebuild
index a8c53e235b06..f7b869f05db7 100644
--- a/app-text/openjade/openjade-1.3.2-r4.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r4.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-text/openjade/openjade-1.3.2-r4.ebuild,v 1.2 2012/04/20 04:46:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r4.ebuild,v 1.3 2012/04/26 22:37:01 aballier Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 554e2c883a4e..c8d1dbd13219 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.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-text/opensp/opensp-1.5.2-r3.ebuild,v 1.3 2012/04/01 17:08:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/opensp/opensp-1.5.2-r3.ebuild,v 1.4 2012/04/26 22:37:06 aballier Exp $
 
 EAPI=2
 inherit eutils flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="JamesClark"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc nls static-libs test"
 
 DEPEND="nls? ( >=sys-devel/gettext-0.14.5 )
diff --git a/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild b/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild
index 544aedcab935..b7aa4184389f 100644
--- a/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.5-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/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild,v 1.2 2012/03/29 04:13:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-data/poppler-data-0.4.5-r1.ebuild,v 1.3 2012/04/26 20:27:59 aballier Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/poppler-0.18.4-r1.ebuild b/app-text/poppler/poppler-0.18.4-r1.ebuild
index d3ec91dedd20..e7e9b61ce28a 100644
--- a/app-text/poppler/poppler-0.18.4-r1.ebuild
+++ b/app-text/poppler/poppler-0.18.4-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/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.6 2012/04/25 00:40:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.7 2012/04/26 20:43:30 aballier Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
 
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
index a62e7a4d0bb7..fd006dadb721 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.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/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild,v 1.4 2011/02/06 07:39:55 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild,v 1.5 2012/04/26 22:42:46 aballier Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
index cce2bc97a076..e2da59c5034b 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.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-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.24 2012/03/27 22:35:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.25 2012/04/26 17:13:10 aballier Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/xmlto/xmlto-0.0.25.ebuild b/app-text/xmlto/xmlto-0.0.25.ebuild
index b90a628b4b4c..4a9ddc6a9c2d 100644
--- a/app-text/xmlto/xmlto-0.0.25.ebuild
+++ b/app-text/xmlto/xmlto-0.0.25.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-text/xmlto/xmlto-0.0.25.ebuild,v 1.1 2012/01/12 17:11:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.2 2012/04/26 17:23:43 aballier Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
index e826b6aff50b..67252fb12f7e 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20120109.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-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.7 2012/04/17 21:58:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.8 2012/04/26 16:44:31 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/pam-syntax/pam-syntax-20060424.ebuild b/app-vim/pam-syntax/pam-syntax-20060424.ebuild
index 5f683c3a8ab4..c899b4bd2892 100644
--- a/app-vim/pam-syntax/pam-syntax-20060424.ebuild
+++ b/app-vim/pam-syntax/pam-syntax-20060424.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/pam-syntax/pam-syntax-20060424.ebuild,v 1.11 2010/10/07 03:28:02 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/pam-syntax/pam-syntax-20060424.ebuild,v 1.12 2012/04/26 16:58:23 aballier Exp $
 
 inherit vim-plugin
 
@@ -8,7 +8,7 @@ DESCRIPTION="vim plugin: PAM configuration syntax highlighting"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=735"
 
 LICENSE="as-is"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/dev-db/sqlite/sqlite-3.7.11.ebuild b/dev-db/sqlite/sqlite-3.7.11.ebuild
index ed94b4deb6cc..4b8d94c19100 100644
--- a/dev-db/sqlite/sqlite-3.7.11.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.11.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/dev-db/sqlite/sqlite-3.7.11.ebuild,v 1.1 2012/03/20 19:48:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.11.ebuild,v 1.2 2012/04/26 17:06:41 aballier Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
 
 RDEPEND="icu? ( dev-libs/icu )
diff --git a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
index 6390992e52e4..67ebb643e504 100644
--- a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
+++ b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.17 2012/04/22 20:39:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.18 2012/04/26 21:55:55 mr_bones_ Exp $
 
 EAPI=4
-
 inherit base autotools games-ggz
 
 DESCRIPTION="The client libraries for GGZ Gaming Zone"
@@ -20,8 +19,7 @@ RDEPEND="~dev-games/libggz-${PV}
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}"/${P}-destdir.patch
-	"${FILESDIR}"/${P}-linguas.patch )
+PATCHES=( "${FILESDIR}"/${P}-destdir.patch )
 
 src_prepare() {
 	base_src_prepare
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 97a413a4c312..68f9582ffc34 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,4 +1,5 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild
new file mode 100644
index 000000000000..b0e5572326e6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild,v 1.1 2012/04/26 21:45:41 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index a7ad4a15fc65..d515cdbc05a9 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -7,4 +7,5 @@ DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 RMD1
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild
new file mode 100644
index 000000000000..b6a5844b3168
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild,v 1.1 2012/04/26 21:46:01 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar
+	http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar libs.antlr3.devel/external/antlr-3.3.jar || die
+	ln -s "${DISTDIR}"/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6718a577b69e..09d63c8b88cf 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -4,4 +4,5 @@ DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild
new file mode 100644
index 000000000000..40f449e418dc
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild,v 1.1 2012/04/26 21:46:21 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5854c7b3e92c..e0bde728ae83 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -5,6 +5,7 @@ DIST 1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar 4023
 DIST 1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar 88394 RMD160 d165754c4d5599bd6af5ddfbe2185a59b2fd0135 SHA1 1c6e6c4b3dc659e5720ab08e2972c7c0459e5387 SHA256 f8dc91a801462381ae026ceb161e6e6d43467edf239170d2e3023fba26eb1ca5
 DIST 1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip 2375126 RMD160 3df682860ebf98b2292ba09f51555174bedc8b29 SHA1 1d74da79dc71c52d1b7916853bdd51f346a85359 SHA256 3b545ca0865d5e18be96bc863aa1f1dab9e2fb6047aa96486d8a525090c900c8
 DIST 2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar 22852 RMD160 fbebd2d652ff1089ce53ef7ef450aa2e4cb6c136 SHA1 2503b5fde71d6be1ce44bada3257a6f310e3bb67 SHA256 2fc49f57aad57967be0143e2adbcc18473117f55696268985012a1204c750a66
+DIST 275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar 402348 RMD160 3d3cc4a0c913f41a1bde025f99d216f1a9928ed1 SHA1 275c5ac6ade12819f49e984c8e06b114a4e23458 SHA256 45e483472cc07052039c8370aef36771b21a3572df0f39d6bd463a415cc8316c
 DIST 2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar 111719 RMD160 c3db8ce1835efe49fb0a7f432ff88286a945d584 SHA1 2ea8e5bdc70e1b1d738140e52e4793385b2567a3 SHA256 61b1c254f1529632d98a9261e0fd50c77e5c2a1c4c53e43cee65cedb279c7703
 DIST 3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar 60500 RMD160 52a50d5e1dc2d11f9cb12b44d91b8d9933dca7fd SHA1 3e5011972cede87e5adcf9a90351a106daee2fc2 SHA256 9d2cd70d9e75271462ebff7e97332e300e1bc978352eaa236b6bce3c0a365dbf
 DIST 454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar 57058 RMD160 5d94e75f4b086a12047cba70a29ecca6f29d28f2 SHA1 454f67445e0740c3414476812f2dfd17da2af0a3 SHA256 b1b4ec78c584974973103320da4be5579b8a24a106eb52dd098ece6f9138bac7
@@ -43,4 +44,5 @@ DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 30411
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild
new file mode 100644
index 000000000000..5d31f2b97ce0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild,v 1.1 2012/04/26 21:46:40 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar
+	http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip
+	http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar
+	http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
+	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar
+	http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar
+	http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-fileupload:0
+	dev-java/glassfish-deployment-api:1.2
+	dev-java/jakarta-jstl:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/asm:3
+	dev-java/bsf:2.3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	dev-java/commons-validator:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jettison:0
+	dev-java/jsr311-api:0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar web.jspparser/external/glassfish-jspparser-3.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip j2ee.platform/external/javaee6-doc-api.zip || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip websvc.restlib/external/jersey-1.8.zip || die
+	ln -s "${DISTDIR}"/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar websvc.restlib/external/jersey-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar websvc.restlib/external/jersey-apache-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar websvc.restlib/external/jersey-atom-abdera-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar websvc.restlib/external/jersey-client-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar websvc.restlib/external/jersey-core-1.1.5.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar websvc.restlib/external/jersey-guice-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar websvc.restlib/external/jersey-multipart-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar websvc.restlib/external/jersey-simple-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar websvc.restlib/external/jersey-spring-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip web.jsf20/external/jsf-2.1.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar websvc.restlib/external/jsr311-api-1.1.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar web.primefaces/external/primefaces-2.2.1.jar || die
+	ln -s "${DISTDIR}"/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
+	ln -s "${DISTDIR}"/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl jstl.jar jstl-1.1.2.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl standard.jar standard-1.1.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
+	# el-impl.jar
+	# glassfish-jspparser-3.0.jar
+	# glassfish-logging-2.0.jar
+	# javaee-api-6.0.jar
+	# javaee-api-6.0-license.txt
+	# javaee-web-api-6.0.jar
+	# javaee-web-api-6.0-license.txt
+	# jsp-parser-ext.jar
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
+	# org-netbeans-modules-web-httpmonitor.jar
+	# servlet3.0-jsp2.2-api.jar
+	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	# javax.annotation.jar
+	# javax.annotation-license.txt
+	# jaxb-api-osgi.jar
+	# jaxb-api-osgi-license.txt
+	# webservices-api-osgi.jar
+	# webservices-api-osgi-license.txt
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/metro
+	pushd "${D}"/${instdir} >/dev/null || die
+	# webservices-api.jar
+	# webservices-extra-api.jar
+	# webservices-extra.jar
+	# webservices-rt.jar
+	# webservices-tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/primefaces
+	pushd "${D}"/${instdir} >/dev/null || die
+	# primefaces-2.1.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/rest
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
+	# jackson-core-asl-1.1.1.jar
+	# jersey-client-1.3.jar
+	# jersey-core-1.3.jar
+	# jersey-json-1.3.jar
+	# jersey-multipart-1.3.jar
+	# jersey-server-1.3.jar
+	# jersey-spring-1.3.jar
+	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
+	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
+	# mimepull-1.4.jar
+	# oauth-client-1.3.jar
+	# oauth-signature-1.3.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-webmvc-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
+	# struts-core-1.3.8.jar
+	# struts-el-1.3.8.jar
+	# struts-extras-1.3.8.jar
+	# struts-faces-1.3.8.jar
+	# struts-mailreader-dao-1.3.8.jar
+	# struts-scripting-1.3.8.jar
+	# struts-taglib-1.3.8.jar
+	# struts-tiles-1.3.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 97a413a4c312..68f9582ffc34 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,4 +1,5 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild
new file mode 100644
index 000000000000..33c7a9e8b4cf
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild,v 1.1 2012/04/26 21:47:00 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index a582012a5b17..81f0ccfc791d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -2,4 +2,5 @@ DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD16
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild
new file mode 100644
index 000000000000..96a799c11fb4
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild,v 1.1 2012/04/26 21:47:20 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar groovy.editor/external/groovy-all-1.6.4.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# groovy-all.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 2d35947be6e1..bc598c5d502e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -3,4 +3,5 @@ DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild
new file mode 100644
index 000000000000..16d6d8d371ca
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild,v 1.1 2012/04/26 21:47:39 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	# bindex-2.2.jar
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jemmy-2.3.0.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 4d1df3db1515..fa4739ccf963 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -68,4 +68,5 @@ DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild
new file mode 100644
index 000000000000..6f10049f9201
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild,v 1.1 2012/04/26 21:47:59 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+	http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+	http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+	http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+	http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+	http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+	http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+	http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+	http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+	http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+	http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar
+	http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar
+	http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+	http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+	http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
+	http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
+	http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
+	http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar
+	http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar
+	http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar
+	http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar
+	http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar
+	http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+	http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar
+	http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/freemarker:2.3
+	dev-java/icu4j:4.4
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.0
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2
+	dev-vcs/subversion:0[java]"
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	app-text/jing:0 our version is probably too old
+#	dev-java/ini4j:0 our version is too old
+#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/jsch:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
+	# system commons-io fails with following error:
+	# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+	ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+	ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+	ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+	ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+	ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+	ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+	ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+	ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+	ln -s "${DISTDIR}"/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+	ln -s "${DISTDIR}"/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.0.0.201106090707-r.jar || die
+	ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+	ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+	ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip javascript.editing/external/preindexed.zip || die
+	ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.destroy/external/processtreekiller-1.0.1.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip o.mozilla.rhino.patched/external/rhino1_7R2rc1.zip || die
+	ln -s "${DISTDIR}"/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip javascript.editing/external/sdocs.zip || die
+	ln -s "${DISTDIR}"/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar libs.svnClientAdapter.svnkit/external/sqljet-1.0.3.jar || die
+	ln -s "${DISTDIR}"/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.6.13.jar || die
+	ln -s "${DISTDIR}"/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.6.13.jar || die
+	ln -s "${DISTDIR}"/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.6.13.jar || die
+	ln -s "${DISTDIR}"/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar libs.svnClientAdapter.svnkit/external/svnkit-1.3.4.jar || die
+	ln -s "${DISTDIR}"/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl.jar || die
+	ln -s "${DISTDIR}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar libs.svnClientAdapter.svnkit/external/trilead.jar || die
+	ln -s "${DISTDIR}"/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.44.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.13-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-8.3-603.jdbc3.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
+	# java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
+	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
+	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
+	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.6.0.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	# java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
+	# bytelist-0.1.jar
+	rm commons-logging-api-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging-api.jar ${instdir}/commons-logging-api-1.1.1.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	# rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
+	# ddl.jar
+	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+	# html5-datatypes.jar
+	# html5-parser.jar
+	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
+	# io-xml-util.jar
+	# iri.jar
+	# isorelax20041111.jar
+	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+	# js.jar
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	# libpam4j-1.1.jar
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
+	rm mysql-connector-java-5.1.13-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.13-bin.jar || die
+	# non-schema.jar
+	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.net_3.3.0.jar
+	# org.eclipse.mylyn.tasks.core_3.3.1.jar
+	# org-netbeans-tax.jar
+	rm postgresql-8.3-603.jdbc3.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-8.3-603.jdbc3.jar || die
+	# processtreekiller-1.0.1.jar
+	# resolver-1.2.jar
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# sqljet-1.0.3.jar
+	# svnClientAdapter-javahl-1.6.13.jar
+	# svnClientAdapter-main-1.6.13.jar
+	# svnClientAdapter-svnkit-1.6.13.jar
+	rm svnjavahl-1.6.0.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.6.0.jar || die
+	# svnkit-javahl.jar
+	# svnkit-1.3.4.jar
+	# swingx-0.9.5.jar
+	# [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
+	# ValidationAPI.jar
+	# validator.jar
+	# webserver.jar
+	# winp-1.14-patched.jar
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	# [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
+	# jaxb-xjc.jar
+	# jaxb1-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
+	rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 091827a01078..0ed135fbf85c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,3 +1,4 @@
+DIST 1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip 2266616 RMD160 3c9400b92cc8a6442c871a932b128d8d5fa43f0c SHA1 1a78676e734c72549ee6d9f166bafe22f7cba8cd SHA256 0a3cff406a0146bba304253003dd8bfa5ce1ab10b115e7789f410a61e4e5294f
 DIST 204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar 24791 RMD160 ec452663b6d8591776ff44340fcd838600a65a09 SHA1 204680c59c7d8a4a1a26b9a2ed46d0daa6dc10b3 SHA256 65b2b43e50058f8fbdbc8459167abc4af65b502b6b44737a2bc71fd94d13abff
 DIST 23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip 73250 RMD160 184ee3c12bf4d7af85dbc2a2467207253a680c9e SHA1 23e69f0f17757673c573ebd9899727b82ef7db7f SHA256 5682250c4b676401aac7434fb402fc740a41932dd8f85b5b4a68fb8b02d620c9
 DIST 263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar 11516 RMD160 2798263ff681085fa9abd96e48e6c9209f35782a SHA1 263d76eeb2fa35ae240de31cfde83c04096ae19e SHA256 b0423ec165cd14f378fb1a929dc671d1360eb1183a596de583b5c3366b772b8e
@@ -23,6 +24,7 @@ DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845
 DIST BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar 6503498 RMD160 dd40d7b00141fe3c3f2f23925683de2cb1837cd9 SHA1 bc0919190add3a7fb764c8412d10a2b026cd9563 SHA256 ddd722c70d74201e7f06463e6b59fd2563d2b043a36825cb47ede8f9bf03c213
 DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 RMD160 546dd5f8c9039925e89e76655265e6105658951d SHA1 c8a5e0d558ea7e7349f9d32b838553d5e7dd214f SHA256 7492417ca97835935912d931f9c2a1c9d98fc35fab455d086fd11f7ff663acb8
 DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 RMD160 6d0afc9ec328e3b3c2901d0941b29feca57350ee SHA1 caf99efbb25e9183609d6fba4f63d85e7606903f SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f
+DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 RMD160 996dc03464a1bbb4b65062dd438956d4581c9261 SHA1 cb686a65b6c4516a32173cb60385d02027440620 SHA256 7865677c19d1373c7126751c30bf9719bbe7431f9b8a160e78cd53d74534f4f1
 DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 RMD160 8d410595e912d2a8d30a0bdfbdf83413692a4269 SHA1 d88a41174c5f85d1b791d6a8e0f8b8a1c459d6c0 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e
 DIST E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar 130251 RMD160 bc5cbedbc2ae6ca85f2abd5718d946273ca0b356 SHA1 e90f4b2f8972aa5ef58139f16b78d5f6acfc6ef9 SHA256 cc025405fbfb86113b6f0c2f80c6d34babc59be0ef2c8778043ad108296faa21
 DIST EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar 231058 RMD160 798a4028230bb087efd5ee133f01b08a11e99452 SHA1 ea1f2b2504fc5abcb06146d858f74a97b85a2998 SHA256 7dbbee8f9000b1a157b75425f54495dd90c63621f5a8a88f40e5780712c12a5e
@@ -31,4 +33,5 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
new file mode 100644
index 000000000000..1a3f167a607a
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild,v 1.1 2012/04/26 21:49:18 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
+	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+		eerror "Please remove following symlinks and run emerge again:"
+		find /usr/share/netbeans-java-${SLOT}/ant -type l
+		die_now="1"
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
+	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
+	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
+	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	#insinto ${INSTALL_DIR}/ant
+	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	#doins -r ant/extra
+	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	#doins -r ant/nblib
+	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 87199ca6b712..01792604457b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -4,4 +4,5 @@ DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild
new file mode 100644
index 000000000000..5d710e374e16
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild,v 1.1 2012/04/26 21:48:18 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	# api_classic.jar
+	# api_connected.jar
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	# jcapt.jar
+	# jctasks.jar
+	# nbtasks.jar
+	# nbutils.jar
+	# tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# apduio.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index b53d6b0dd662..2bd99ff4a044 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -2,4 +2,5 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild
new file mode 100644
index 000000000000..6b0e5c6127f3
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild,v 1.1 2012/04/26 21:48:38 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-javafx-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index cacb4b05d00b..3e1774ea189b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -1,4 +1,5 @@
 DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 RMD160 f668bba808f22b28f6dcb70d5a1d6e98a166da8d SHA1 418fc62c8a6ef5311987b01fe389b1f88efddca2 SHA256 7676709cfadc97da5056cb90f35b57850259444ef97f03905b83bd08e39fa0db
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e5b1d3508c6bbf43c03476967e665b9cbe79 SHA1 a806d99716c5e9441bfd8b401176fddefc673022 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild
new file mode 100644
index 000000000000..c4b092613e0e
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild,v 1.1 2012/04/26 21:48:58 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index f4332de4bf25..98ffa98c7ae6 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -10,4 +10,5 @@ DIST D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar 18043 RMD1
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild
new file mode 100644
index 000000000000..8ddc30bed896
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild,v 1.1 2012/04/26 21:49:38 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	# cdc-agui-swing-layout.jar
+	# cdc-pp-awt-layout.jar
+	rm commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || die
+	# jakarta-slide-ant-webdav-2.1.jar
+	# jakarta-slide-webdavlib-2.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# jmunit4cldc10-1.2.1.jar
+	# jmunit4cldc11-1.2.1.jar
+	# nbactivesync-5.0.jar
+	# nb_svg_midp_components.jar
+	# netbeans_databindingme.jar
+	# netbeans_databindingme_pim.jar
+	# netbeans_databindingme_svg.jar
+	# netbeans_midp_components_basic.jar
+	# netbeans_midp_components_pda.jar
+	# netbeans_midp_components_wma.jar
+	# org-netbeans-modules-deployment-deviceanywhere.jar
+	# org-netbeans-modules-j2me-cdc-platform-nsicom-probe.jar
+	# org-netbeans-modules-j2me-cdc-project.jar
+	# org-netbeans-modules-j2me-cdc-project-nokiaS80.jar
+	# org-netbeans-modules-j2me-cdc-project-ojec.jar
+	# org-netbeans-modules-j2me-cdc-project-ricoh.jar
+	# org-netbeans-modules-j2me-cdc-project-savaje.jar
+	# org-netbeans-modules-j2me-cdc-project-semc.jar
+	# org-netbeans-modules-j2me-cdc-project-sjmc.jar
+	# perseus-nb-1.0.1.jar
+	# RicohAntTasks-2.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index b4b9b372ee63..d9ebb4f5e99a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -2,4 +2,5 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild
new file mode 100644
index 000000000000..e2d5fd8cd734
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild,v 1.1 2012/04/26 21:49:58 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 39076e1a53c7..9c0cc088142f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -6,4 +6,5 @@ DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a73
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild b/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild
new file mode 100644
index 000000000000..7d364f678b46
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild,v 1.1 2012/04/26 21:50:18 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index a0c9ac4e182a..79c2425443b3 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -8,4 +8,5 @@ DIST F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar 416668 RMD160 de31
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild
new file mode 100644
index 000000000000..0219078edfba
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.1 2012/04/26 21:50:38 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar
+	http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.2.7:0
+	dev-java/swing-layout:1[source]"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die
+	ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# felix-main-2.0.2.jar
+	# felix-2.0.3.jar
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
+	# osgi.cmpn-4.2.jar
+	# osgi.core-4.2.jar
+	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	# updater.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 97a413a4c312..68f9582ffc34 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,4 +1,5 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild
new file mode 100644
index 000000000000..187206b1e93f
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild,v 1.1 2012/04/26 21:50:57 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 97a413a4c312..68f9582ffc34 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,4 +1,5 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild
new file mode 100644
index 000000000000..454a22114d9a
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild,v 1.1 2012/04/26 21:51:17 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}
diff --git a/dev-lang/nasm/nasm-2.10.ebuild b/dev-lang/nasm/nasm-2.10.ebuild
index 53cfc7b5386e..c895024cd368 100644
--- a/dev-lang/nasm/nasm-2.10.ebuild
+++ b/dev-lang/nasm/nasm-2.10.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/dev-lang/nasm/nasm-2.10.ebuild,v 1.1 2012/03/20 21:33:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.ebuild,v 1.2 2012/04/26 20:34:45 aballier Exp $
 
 EAPI=2
 inherit flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-lang/perl
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 3cbdb46dbe27..89d9fba5d1e3 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,14 +1,21 @@
 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110
 DIST Python-2.6.6.tar.bz2 11080872 RMD160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 SHA1 a1daf2c2c7cffe0939c015260447572fe75c7e50 SHA256 134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83
 DIST Python-2.6.7.tar.bz2 11084667 RMD160 513e84a7cb76ca876e3803bb03ed558bd0378063 SHA1 5d35eb746e85fb3deaff8518448137c9b9fb6daa SHA256 4502c1a064ce68416188005662c0269d31175b855502f64c6dfa8f51226a0e5c
+DIST Python-2.6.8.tar.bz2 11127915 RMD160 fcfa3554af415cbddd3e8d68aead46f1e7b8e616 SHA1 348b727a9818146a57aa43203f37d8c6b462fe79 SHA256 c34036718ee1f091736677f543bc7960861cf9fcbea77d49572b59f7f1ab3c3f
 DIST Python-2.7.2.tar.bz2 11754834 RMD160 c3bf4f09b7c429a4d9f4cc251c795304cd5232c5 SHA1 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 SHA256 5057eb067eb5b5a6040dbd0e889e06550bde9ec041dadaa855ee9490034cbdab
 DIST Python-2.7.3.tar.bz2 11793433 RMD160 bfc511d54080898d7008d4b84d49f957859d66c3 SHA1 842c4e2aff3f016feea3c6e992c7fa96e49c9aa0 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c
 DIST Python-3.1.4.tar.xz 8184052 RMD160 beb24a2a1227aa2bc036263b4c808daa72fa3e02 SHA1 e5767a4fc92433816451de75c8721f2e1a81f6ea SHA256 21aa936b3989a8e32ba17799fcf235e0979a2e1c95e70bcd3bc066185a559afc
+DIST Python-3.1.5.tar.xz 8189536 RMD160 021362658310f9ea5f6825bf0919f160304f4833 SHA1 3fa78edeefd892a50b5f41bab018b51ecad0b56f SHA256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7
 DIST Python-3.2.2.tar.xz 8923224 RMD160 f28dc7a6b8a6ed1cc359791b1c70367d36ae0af3 SHA1 5e654dbd48476193ccdef4d604ed4f45b48c6769 SHA256 1072d13d846373e7eaa4f94c21f0985d2965e916ff1096abe72d1af67c5f55f9
+DIST Python-3.2.3.tar.xz 8970368 RMD160 8e34a4dd2544a9b6a691557a0ab0e69b21e5ee0e SHA1 3d607dbcfdf100dd659978195ccf3ade9d221823 SHA256 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754
 DIST python-gentoo-patches-2.5.4-r3.tar.bz2 19473 RMD160 c3a807693103f9e26c3cce4add5a1f3d975ef216 SHA1 c6170894865ee8aac8c813916c21a0d0458691bc SHA256 03f5bdb0a4ac8eb498a90c5cd444a5c76ed7e79bff5e8dca00efe77cf80c6391
 DIST python-gentoo-patches-2.6.6-r2.tar.bz2 16277 RMD160 432a63f7313e98a99cd300ee3c1f905d343c401e SHA1 30f5ba4e5eb25833331f193966c3e00be4470cf9 SHA256 2754d2aa27086efccc2de73442cf0022f3f9768431b10ff72c9181c4ddd95428
 DIST python-gentoo-patches-2.6.7.tar.bz2 15173 RMD160 0ffb5eb49d463f54e3398973603dd9ead0ab2f9a SHA1 7590bc2dc31ee2c1f6cd04968393137fa43c59f4 SHA256 dcaca7d0a5f266c41c72a3047db24d23e675ce4a0ac9196dae42d7892d5edb33
+DIST python-gentoo-patches-2.6.8-0.tar.bz2 17608 RMD160 a819e233a25ef63a0f730dd077d126fa165c7b0e SHA1 07b8bdb07ecd88e53bcbfc7048a5b7f981ec0eb8 SHA256 277dbeb19107d3244e58aee98f130ce98d03775e7d4074ff9e1577125c999c06
 DIST python-gentoo-patches-2.7.2.tar.bz2 14485 RMD160 6b66705d61b525d0089326ddb700ad3c5ad6e23e SHA1 94fc9b00cc7e7c60cce41640dc09fd2395a5c5d9 SHA256 29616ce50244c0f7c85b903dcb939d656bfd9d5e8a930d90bff6cf878f3ac5a5
+DIST python-gentoo-patches-2.7.3-0.tar.bz2 15173 RMD160 a402c7f7514a195a19993beec36594cefed1e7a8 SHA1 8bc09024ed8494d4f3b7492f4854157081205131 SHA256 04dd97ace76e69e78708e7886c8d2ed03dca450996ab6367c07091a073028a13
 DIST python-gentoo-patches-2.7.3.tar.bz2 13759 RMD160 3002476cffcba288d5bd80ab3b33795a08808c8d SHA1 5ea4025ffd9e92a08bd2ab74c12329c21a567b7b SHA256 f2f5b3c7785cbbbb5f2b404b177d56a4ec21e1a1415c5b9b153f7e1f598d0a8b
 DIST python-gentoo-patches-3.1.4.tar.bz2 12930 RMD160 5ba5d20e065e6c346848d0c3ed12d65cd6b089be SHA1 b6bb595e03a78a87e3164874a9a12711bee4b9f8 SHA256 9800f3a9989c8aac4c96a7e6411baf96af0c18c041627a330681783a84cb4316
+DIST python-gentoo-patches-3.1.5-0.tar.bz2 16939 RMD160 d4069224df17323055d12438d481bcfa694c70e3 SHA1 263769f0ddaed5bbd91d4e5781f48476d19cbc1e SHA256 ceacc96a370dfaa232d0a62336af37b809dd7d55adacf5f8befe17e2f72981ff
 DIST python-gentoo-patches-3.2.2.tar.bz2 10834 RMD160 f1ca3bec5705b72ee488a37ea71dc7110b4495f1 SHA1 c5daaea3c52a564228c84be741da6cf039b10e19 SHA256 521c1bd7c360fb66788e7c5e191497e014bb104f2ef2272d99a40b764082d7cb
+DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 RMD160 90d2d94efbbbdf2d4018f97bd25083464131f36d SHA1 f4ddb5e1f6873634d22444599736a5aff931a7a5 SHA256 2ad8829aa6594edc405afd0ed148a2b4b608d7c6f09ea90bfb90d87580a4784b
diff --git a/dev-lang/python/python-2.6.8.ebuild b/dev-lang/python/python-2.6.8.ebuild
new file mode 100644
index 000000000000..5c5d52bd75c3
--- /dev/null
+++ b/dev-lang/python/python-2.6.8.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
+	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="2.6"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND="app-arch/bzip2
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			berkdb? ( || (
+				sys-libs/db:4.7
+				sys-libs/db:4.6
+				sys-libs/db:4.5
+				sys-libs/db:4.4
+				sys-libs/db:4.3
+				sys-libs/db:4.2
+			) )
+			gdbm? ( sys-libs/gdbm[berkdb] )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.3:3 )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2.1 )
+		)
+		!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		sys-apps/paxctl
+		>=sys-devel/autoconf-2.61
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+
+	if use berkdb; then
+		ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python."
+		ewarn "\"bsddb\" and \"dbhash\" modules have been additionally removed in Python 3."
+		ewarn "You should use external, still maintained \"bsddb3\" module provided by dev-python/bsddb3,"
+		ewarn "which supports both Python 2 and Python 3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb] to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython2.6 correctly.
+	# Needed on FreeBSD unless Python 2.6 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-libc="" \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake EPYTHON="python${PV%%.*}" || die "emake failed"
+
+	pax-mark m python
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skipped_tests="distutils tcl"
+
+	for test in ${skipped_tests}; do
+		mv Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
+
+	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	python_clean_installation_image -q
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
+		use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*}
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+	use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r Tools || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	[[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
+
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-lang/python/python-2.7.3-r1.ebuild b/dev-lang/python/python-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..1ed50b2a1c20
--- /dev/null
+++ b/dev-lang/python/python-2.7.3-r1.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r1.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
+	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND="app-arch/bzip2
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			berkdb? ( || (
+				sys-libs/db:4.8
+				sys-libs/db:4.7
+				sys-libs/db:4.6
+				sys-libs/db:4.5
+				sys-libs/db:4.4
+				sys-libs/db:4.3
+				sys-libs/db:4.2
+			) )
+			gdbm? ( sys-libs/gdbm[berkdb] )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2.1 )
+		)
+		!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		sys-apps/paxctl
+		>=sys-devel/autoconf-2.65
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+
+	if use berkdb; then
+		ewarn "\"bsddb\" module is out-of-date and no longer maintained inside dev-lang/python."
+		ewarn "\"bsddb\" and \"dbhash\" modules have been additionally removed in Python 3."
+		ewarn "You should use external, still maintained \"bsddb3\" module provided by dev-python/bsddb3,"
+		ewarn "which supports both Python 2 and Python 3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb] to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake EPYTHON="python${PV%%.*}" || die "emake failed"
+
+	pax-mark m python
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skipped_tests="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
+
+	emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
+	python_clean_installation_image -q
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${ED}$(python_get_libdir)/config/Makefile" || die "sed failed"
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
+		use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*}
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+	use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r Tools || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	[[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/"
+
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-lang/python/python-3.1.5.ebuild b/dev-lang/python/python-3.1.5.ebuild
new file mode 100644
index 000000000000..e2cf84025435
--- /dev/null
+++ b/dev-lang/python/python-3.1.5.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
+
+EAPI="3"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.1"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND="app-arch/bzip2
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			gdbm? ( sys-libs/gdbm[berkdb] )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.3:3 )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2.1 )
+		)"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		sys-apps/paxctl
+		>=sys-devel/autoconf-2.61
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.1 correctly.
+	# Needed on FreeBSD unless Python 3.1 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use_with wide-unicode) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	pax-mark m python
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	if ! use threads; then
+		ewarn "Disabling tests due to USE=\"-threads\""
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skipped_tests="distutils"
+
+	for test in ${skipped_tests}; do
+		mv Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
+	python_clean_installation_image -q
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc3" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle3" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test"
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+	use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r Tools || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-lang/python/python-3.2.3.ebuild b/dev-lang/python/python-3.2.3.ebuild
new file mode 100644
index 000000000000..f8ee6f97702b
--- /dev/null
+++ b/dev-lang/python/python-3.2.3.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3.ebuild,v 1.4 2012/04/26 23:29:48 floppym Exp $
+
+EAPI="3"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.2"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND="app-arch/bzip2
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			gdbm? ( sys-libs/gdbm[berkdb] )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2.1 )
+		)"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		sys-apps/paxctl
+		>=sys-devel/autoconf-2.65
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+
+	if [[ "${PV}" =~ ^3\.2(\.[1234])?(_pre)? ]]; then
+		rm -f "${EROOT}usr/$(get_libdir)/llibpython3.so"
+	else
+		die "Deprecated code not deleted"
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# Disable ABI flags.
+	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.in || die "sed failed"
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use_with wide-unicode) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"
+
+	pax-mark m python
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" CPPFLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
+	python_clean_installation_image -q
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${ED}$(python_get_libdir)/config-${SLOT}/Makefile" || die "sed failed"
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test"
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+	use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r Tools || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-lang/ruby/ruby-1.8.7_p358.ebuild b/dev-lang/ruby/ruby-1.8.7_p358.ebuild
index dc59573ce03f..31ef929c3193 100644
--- a/dev-lang/ruby/ruby-1.8.7_p358.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p358.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/dev-lang/ruby/ruby-1.8.7_p358.ebuild,v 1.1 2012/04/20 10:42:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p358.ebuild,v 1.2 2012/04/26 16:55:14 aballier Exp $
 
 EAPI=2
 
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
 
 RDEPEND="
diff --git a/dev-lang/swig/swig-2.0.4-r1.ebuild b/dev-lang/swig/swig-2.0.4-r1.ebuild
index 20f84bd4deb9..73eec0f138d6 100644
--- a/dev-lang/swig/swig-2.0.4-r1.ebuild
+++ b/dev-lang/swig/swig-2.0.4-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/dev-lang/swig/swig-2.0.4-r1.ebuild,v 1.9 2012/02/03 17:16:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.4-r1.ebuild,v 1.10 2012/04/26 20:39:51 aballier Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch
new file mode 100644
index 000000000000..022d81d3e261
--- /dev/null
+++ b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index fdd9d44..31bfca8 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1601,7 +1601,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # Version numbers are dot-stripped by system policy.
+ 	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
diff --git a/dev-lang/tk/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild
index b41086913984..5c97f5e7c68e 100644
--- a/dev-lang/tk/tk-8.5.11.ebuild
+++ b/dev-lang/tk/tk-8.5.11.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/dev-lang/tk/tk-8.5.11.ebuild,v 1.3 2012/03/19 08:10:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.5 2012/04/26 19:49:06 aballier Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug threads truetype aqua xscreensaver"
 
 RDEPEND="
@@ -39,6 +39,10 @@ src_prepare() {
 	# Bug 125971
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
 
+	# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just
+	# copy the tcl patch
+	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
+
 	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
 
 	cd "${S}"/unix
diff --git a/dev-libs/check/check-0.9.8-r1.ebuild b/dev-libs/check/check-0.9.8-r1.ebuild
index 1e24839b2ecb..22741562bdc2 100644
--- a/dev-libs/check/check-0.9.8-r1.ebuild
+++ b/dev-libs/check/check-0.9.8-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/dev-libs/check/check-0.9.8-r1.ebuild,v 1.9 2012/03/02 20:41:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.8-r1.ebuild,v 1.10 2012/04/26 22:22:04 aballier Exp $
 
 EAPI=4
 inherit autotools autotools-utils eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/cloog-ppl/cloog-ppl-0.15.10.ebuild b/dev-libs/cloog-ppl/cloog-ppl-0.15.10.ebuild
index 695a1e43ba10..6fe07fa09535 100644
--- a/dev-libs/cloog-ppl/cloog-ppl-0.15.10.ebuild
+++ b/dev-libs/cloog-ppl/cloog-ppl-0.15.10.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/dev-libs/cloog-ppl/cloog-ppl-0.15.10.ebuild,v 1.10 2012/01/07 20:21:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog-ppl/cloog-ppl-0.15.10.ebuild,v 1.11 2012/04/26 19:00:33 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/infrastructure/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/ppl
diff --git a/dev-libs/gmime/gmime-2.2.27-r1.ebuild b/dev-libs/gmime/gmime-2.2.27-r1.ebuild
index a0e9ccea35d8..e153c9b676cb 100644
--- a/dev-libs/gmime/gmime-2.2.27-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.2.27-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/dev-libs/gmime/gmime-2.2.27-r1.ebuild,v 1.3 2012/04/25 21:37:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.27-r1.ebuild,v 1.4 2012/04/26 17:46:29 jer Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gmime-sharp.snk"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc mono"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/dev-libs/gmime/gmime-2.4.32.ebuild b/dev-libs/gmime/gmime-2.4.32.ebuild
index c673fdb4bdfa..0b97ce1a3d71 100644
--- a/dev-libs/gmime/gmime-2.4.32.ebuild
+++ b/dev-libs/gmime/gmime-2.4.32.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/dev-libs/gmime/gmime-2.4.32.ebuild,v 1.4 2012/04/25 19:56:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.32.ebuild,v 1.5 2012/04/26 17:46:29 jer Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
 SLOT="2.4"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mono static-libs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-libs/gmime/gmime-2.6.7.ebuild b/dev-libs/gmime/gmime-2.6.7.ebuild
index ca428fe317c1..e398a2c2f329 100644
--- a/dev-libs/gmime/gmime-2.6.7.ebuild
+++ b/dev-libs/gmime/gmime-2.6.7.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/dev-libs/gmime/gmime-2.6.7.ebuild,v 1.4 2012/04/25 19:54:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.6.7.ebuild,v 1.5 2012/04/26 17:46:29 jer Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/"
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mono static-libs"
 
 RDEPEND=">=dev-libs/glib-2.18.0:2
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild
index a651a014e138..dc404fd082bd 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.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/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild,v 1.1 2012/04/20 06:23:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection-common/gobject-introspection-common-1.32.1.ebuild,v 1.2 2012/04/26 22:28:15 aballier Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="gobject-introspection"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
index e45882f74027..05269bd2fbeb 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.32.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/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.1 2012/04/20 06:23:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.32.1.ebuild,v 1.2 2012/04/26 22:41:08 aballier Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc doctool test"
 
diff --git a/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.ebuild b/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.ebuild
index 074ecc362fd3..81ac9f121706 100644
--- a/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.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/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.ebuild,v 1.7 2012/01/31 14:40:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/kpathsea/kpathsea-6.0.1_p20110705.ebuild,v 1.8 2012/04/26 20:44:37 aballier Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 DEPEND="!<app-text/texlive-core-2010
diff --git a/dev-libs/libbegemot/libbegemot-1.11.ebuild b/dev-libs/libbegemot/libbegemot-1.11.ebuild
index 5f111da20cc0..593df3a6748b 100644
--- a/dev-libs/libbegemot/libbegemot-1.11.ebuild
+++ b/dev-libs/libbegemot/libbegemot-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbegemot/libbegemot-1.11.ebuild,v 1.3 2007/07/12 02:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbegemot/libbegemot-1.11.ebuild,v 1.4 2012/04/26 17:41:19 aballier Exp $
 
 inherit libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.freebsd.org/~harti/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
+KEYWORDS="~amd64 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
index 380ea81b1767..b4de266bdf97 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r2.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/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.16 2012/02/22 01:07:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.17 2012/04/26 17:30:26 aballier Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="debug kernel_linux python static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
index 423152468d0f..7cff4c68bc36 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6.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-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.9 2011/12/18 11:14:43 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.10 2012/04/26 16:34:32 aballier Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc python"
 
 RDEPEND="python? ( >=dev-lang/python-2.3 )
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.ebuild
index a830d21d3147..3d3a73bde64c 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.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/dev-libs/libpthread-stubs/libpthread-stubs-0.3.ebuild,v 1.9 2011/08/20 15:44:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpthread-stubs/libpthread-stubs-0.3.ebuild,v 1.10 2012/04/26 18:46:12 aballier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="Pthread functions stubs for platforms missing them"
 SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild b/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild
index 0fc7d06ab863..3fac07c20ee4 100644
--- a/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26-r3.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/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild,v 1.7 2012/03/02 20:05:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild,v 1.8 2012/04/26 17:11:48 aballier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="crypt debug python static-libs"
 
 DEPEND=">=dev-libs/libxml2-2.6.27:2
diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.ebuild
index 10023b59a0a5..eb06890bf4c7 100644
--- a/dev-libs/nspr/nspr-4.9.ebuild
+++ b/dev-libs/nspr/nspr-4.9.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/dev-libs/nspr/nspr-4.9.ebuild,v 1.4 2012/03/30 13:32:26 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.5 2012/04/26 17:58:01 aballier Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_prepare() {
diff --git a/dev-libs/nss/nss-3.13.3.ebuild b/dev-libs/nss/nss-3.13.3.ebuild
index adf3c53ec13b..ad5f0ce5d246 100644
--- a/dev-libs/nss/nss-3.13.3.ebuild
+++ b/dev-libs/nss/nss-3.13.3.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/dev-libs/nss/nss-3.13.3.ebuild,v 1.3 2012/03/25 15:33:40 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.3.ebuild,v 1.4 2012/04/26 18:00:17 aballier Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="dev-util/pkgconfig"
diff --git a/dev-libs/ppl/ppl-0.12.ebuild b/dev-libs/ppl/ppl-0.12.ebuild
index 92d9efd34daf..667560673e39 100644
--- a/dev-libs/ppl/ppl-0.12.ebuild
+++ b/dev-libs/ppl/ppl-0.12.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/dev-libs/ppl/ppl-0.12.ebuild,v 1.2 2012/04/13 05:16:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ppl/ppl-0.12.ebuild,v 1.3 2012/04/26 18:59:40 aballier Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.bz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-4.1.3[cxx]
diff --git a/dev-perl/Font-TTF/Font-TTF-0.480.0.ebuild b/dev-perl/Font-TTF/Font-TTF-0.480.0.ebuild
index e7493f52c4f0..184711006229 100644
--- a/dev-perl/Font-TTF/Font-TTF-0.480.0.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-0.480.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/dev-perl/Font-TTF/Font-TTF-0.480.0.ebuild,v 1.9 2012/03/25 15:05:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Font-TTF/Font-TTF-0.480.0.ebuild,v 1.10 2012/04/26 20:00:16 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="module for compiling and altering fonts"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/perl-IO-Compress
diff --git a/dev-perl/PPI/PPI-1.215.0.ebuild b/dev-perl/PPI/PPI-1.215.0.ebuild
index 8518f0a13b6a..15a76294175e 100644
--- a/dev-perl/PPI/PPI-1.215.0.ebuild
+++ b/dev-perl/PPI/PPI-1.215.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/dev-perl/PPI/PPI-1.215.0.ebuild,v 1.2 2012/03/25 15:38:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PPI/PPI-1.215.0.ebuild,v 1.3 2012/04/26 19:27:39 ago Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.0.ebuild
index 321b6a808591..b455a87436fa 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.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/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.0.ebuild,v 1.2 2012/03/25 15:36:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PPIx-Regexp/PPIx-Regexp-0.26.0.ebuild,v 1.3 2012/04/26 19:26:59 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/List-MoreUtils
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.117.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.117.0.ebuild
index b1f3909e29df..933237929076 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.117.0.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.117.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/dev-perl/Perl-Critic/Perl-Critic-1.117.0.ebuild,v 1.2 2012/03/24 19:53:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Perl-Critic/Perl-Critic-1.117.0.ebuild,v 1.3 2012/04/26 19:26:41 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-Module-Pluggable-3.1
diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.10.0.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.10.0.ebuild
index 5c3365467cf0..2bb8033b4c50 100644
--- a/dev-perl/Pod-Spell/Pod-Spell-1.10.0.ebuild
+++ b/dev-perl/Pod-Spell/Pod-Spell-1.10.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/Pod-Spell/Pod-Spell-1.10.0.ebuild,v 1.3 2011/11/06 18:24:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-Spell/Pod-Spell-1.10.0.ebuild,v 1.4 2012/04/26 19:27:18 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="A formatter for spellchecking Pod"
 SRC_URI+=" mirror://gentoo/podspell.1.gz http://dev.gentoo.org/~tove/files/podspell.1.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-Pod-Escapes
diff --git a/dev-perl/gtk2-perl/gtk2-perl-1.242.0.ebuild b/dev-perl/gtk2-perl/gtk2-perl-1.242.0.ebuild
index 52cd770743f1..a41c8845d74b 100644
--- a/dev-perl/gtk2-perl/gtk2-perl-1.242.0.ebuild
+++ b/dev-perl/gtk2-perl/gtk2-perl-1.242.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/dev-perl/gtk2-perl/gtk2-perl-1.242.0.ebuild,v 1.4 2012/04/26 08:03:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-perl/gtk2-perl-1.242.0.ebuild,v 1.5 2012/04/26 19:28:14 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-php/securimage/securimage-3.0.1.ebuild b/dev-php/securimage/securimage-3.0.1.ebuild
index 9126bcd8e5bf..56046e4a5d3b 100644
--- a/dev-php/securimage/securimage-3.0.1.ebuild
+++ b/dev-php/securimage/securimage-3.0.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/dev-php/securimage/securimage-3.0.1.ebuild,v 1.1 2012/01/26 22:00:46 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/securimage/securimage-3.0.1.ebuild,v 1.3 2012/04/27 03:35:28 binki Exp $
 
 EAPI=4
 
@@ -11,10 +11,11 @@ SRC_URI="http://phpcaptcha.org/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/httpd-php"
+RDEPEND="dev-lang/php[gd,truetype]
+	virtual/httpd-php"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-python/argparse/argparse-1.2.1.ebuild b/dev-python/argparse/argparse-1.2.1.ebuild
index f5d5b673492f..facc1db6e519 100644
--- a/dev-python/argparse/argparse-1.2.1.ebuild
+++ b/dev-python/argparse/argparse-1.2.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/dev-python/argparse/argparse-1.2.1.ebuild,v 1.13 2012/03/01 10:29:43 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1.ebuild,v 1.14 2012/04/26 22:17:24 aballier Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="http://argparse.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/certifi/certifi-0.0.8.ebuild b/dev-python/certifi/certifi-0.0.8.ebuild
index 07b395c40ffc..00aad0e7b8f6 100644
--- a/dev-python/certifi/certifi-0.0.8.ebuild
+++ b/dev-python/certifi/certifi-0.0.8.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/dev-python/certifi/certifi-0.0.8.ebuild,v 1.2 2012/03/31 19:39:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/certifi/certifi-0.0.8.ebuild,v 1.3 2012/04/26 21:11:11 vapier Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/docutils/docutils-0.8.1.ebuild b/dev-python/docutils/docutils-0.8.1.ebuild
index b5ec77817c7b..a7751a4d564b 100644
--- a/dev-python/docutils/docutils-0.8.1.ebuild
+++ b/dev-python/docutils/docutils-0.8.1.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-python/docutils/docutils-0.8.1.ebuild,v 1.8 2011/10/31 19:55:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.8.1.ebuild,v 1.9 2012/04/26 17:34:24 aballier Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,7 +19,7 @@ SRC_URI+=" glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )"
 
 LICENSE="BSD-2 GPL-3 PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="glep"
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/epydoc/epydoc-3.0.1-r1.ebuild b/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
index 9704c717c3c1..b7c040021e16 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.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/dev-python/epydoc/epydoc-3.0.1-r1.ebuild,v 1.13 2012/02/22 07:45:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r1.ebuild,v 1.14 2012/04/26 17:38:39 aballier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex X"
 
 DEPEND=""
diff --git a/dev-python/requests/requests-0.10.6.ebuild b/dev-python/requests/requests-0.10.6.ebuild
index 2d4499171a24..369bb95d1074 100644
--- a/dev-python/requests/requests-0.10.6.ebuild
+++ b/dev-python/requests/requests-0.10.6.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/dev-python/requests/requests-0.10.6.ebuild,v 1.2 2012/02/27 05:06:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.10.6.ebuild,v 1.3 2012/04/26 21:12:34 vapier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/requests/requests-0.11.1.ebuild b/dev-python/requests/requests-0.11.1.ebuild
index 6139c8638424..a728789a5e18 100644
--- a/dev-python/requests/requests-0.11.1.ebuild
+++ b/dev-python/requests/requests-0.11.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/dev-python/requests/requests-0.11.1.ebuild,v 1.1 2012/03/31 15:58:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.11.1.ebuild,v 1.2 2012/04/26 21:12:34 vapier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/setuptools/setuptools-0.6.25.ebuild b/dev-python/setuptools/setuptools-0.6.25.ebuild
index c6de4732d809..ce2bede86b16 100644
--- a/dev-python/setuptools/setuptools-0.6.25.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.25.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/dev-python/setuptools/setuptools-0.6.25.ebuild,v 1.1 2012/03/14 04:00:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.25.ebuild,v 1.2 2012/04/26 17:33:45 aballier Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/subunit/subunit-0.0.7.ebuild b/dev-python/subunit/subunit-0.0.7.ebuild
index 4c090a52da2f..8e6224b1e46e 100644
--- a/dev-python/subunit/subunit-0.0.7.ebuild
+++ b/dev-python/subunit/subunit-0.0.7.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/dev-python/subunit/subunit-0.0.7.ebuild,v 1.1 2012/02/08 06:57:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.7.ebuild,v 1.2 2012/04/26 22:21:30 aballier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-python/testtools-0.9.4"
diff --git a/dev-python/testtools/testtools-0.9.14.ebuild b/dev-python/testtools/testtools-0.9.14.ebuild
index 569a7299de56..055aa234fdec 100644
--- a/dev-python/testtools/testtools-0.9.14.ebuild
+++ b/dev-python/testtools/testtools-0.9.14.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/dev-python/testtools/testtools-0.9.14.ebuild,v 1.1 2012/03/02 09:37:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.14.ebuild,v 1.2 2012/04/26 22:14:30 aballier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-scheme/guile/guile-1.8.8-r1.ebuild b/dev-scheme/guile/guile-1.8.8-r1.ebuild
index fe9b403fea71..209cd468df75 100644
--- a/dev-scheme/guile/guile-1.8.8-r1.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-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/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.10 2011/07/09 11:18:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.11 2012/04/26 16:37:12 aballier Exp $
 
 EAPI=3
 inherit eutils autotools flag-o-matic elisp-common
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
 RESTRICT="!regex? ( test )"
 
diff --git a/dev-util/cmake/cmake-2.8.7-r5.ebuild b/dev-util/cmake/cmake-2.8.7-r5.ebuild
index e8bea5aa83c2..6e709e6c04c4 100644
--- a/dev-util/cmake/cmake-2.8.7-r5.ebuild
+++ b/dev-util/cmake/cmake-2.8.7-r5.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/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.1 2012/03/09 01:22:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.2 2012/04/26 20:17:42 aballier Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
diff --git a/dev-util/cppunit/cppunit-1.12.1-r1.ebuild b/dev-util/cppunit/cppunit-1.12.1-r1.ebuild
index 72c19a008641..2c68d59ab899 100644
--- a/dev-util/cppunit/cppunit-1.12.1-r1.ebuild
+++ b/dev-util/cppunit/cppunit-1.12.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/dev-util/cppunit/cppunit-1.12.1-r1.ebuild,v 1.9 2012/03/31 18:04:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1-r1.ebuild,v 1.10 2012/04/26 22:19:58 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cscope/cscope-15.7a-r1.ebuild b/dev-util/cscope/cscope-15.7a-r1.ebuild
index b931b7a24464..840e5d40c3d1 100644
--- a/dev-util/cscope/cscope-15.7a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.7a-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/dev-util/cscope/cscope-15.7a-r1.ebuild,v 1.10 2012/03/02 20:42:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.7a-r1.ebuild,v 1.11 2012/04/26 16:47:01 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/dev-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild
index c7cb997838a3..9221def32955 100644
--- a/dev-util/ctags/ctags-5.8.ebuild
+++ b/dev-util/ctags/ctags-5.8.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/dev-util/ctags/ctags-5.8.ebuild,v 1.9 2012/02/12 01:16:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8.ebuild,v 1.10 2012/04/26 16:49:19 aballier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada"
 
 DEPEND="app-admin/eselect-ctags"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
index 79c02c581122..1252b09b62bf 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.20-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/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild,v 1.5 2012/04/25 18:44:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild,v 1.6 2012/04/26 17:50:33 jer Exp $
 
 EAPI=4
 inherit elisp-common eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index ca0f8d4d5a5e..e90cc29fa4ad 100644
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.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-util/gperf/gperf-3.0.4.ebuild,v 1.13 2011/05/03 06:58:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/gperf-3.0.4.ebuild,v 1.14 2012/04/26 22:06:49 aballier Exp $
 
 EAPI="3"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index af1246f3031c..4a5bd36167dd 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -3,6 +3,7 @@ DIST netbeans-6.8-l10n-20091209164706.tar.bz2 11453127 RMD160 2cff6a0d78aa57d8b4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
+DIST netbeans-7.1.2-201204101705-src.zip 172346251 RMD160 483068b4dceff3a82abd6b183c6675bf21ce7f00 SHA1 5bfb0ef3cc8ef08c2b20bddfcff91f59417f7478 SHA256 95df26a2eafdc88887a835b3abcf930fd0e72c1639c3e0bfceb9489e44c5865c
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-l10n-7.0.1-20110930.tar.bz2 13491185 RMD160 1db97d282a59bbee490fa06046e12c5bc8fb3437 SHA1 fcbe2052e0ee4c9e85ec4819e3c723c53dd0a01d SHA256 ba1b83dd4a543918b7147304d8bba6e35d39fe4e567432766e4749b100c9b2a3
 DIST netbeans-l10n-7.1.1-20120214091350.tar.bz2 12586999 RMD160 c9eb2ad1c262b94479b511563b4ffd743445ffb2 SHA1 5df1523cddbe1bb2b7114b2c4ec00e28c3269721 SHA256 3f104bffac464143f2efe96824a1e1c796e16d568fb39c9719152f84248e236c
diff --git a/dev-util/netbeans/netbeans-7.1.2.ebuild b/dev-util/netbeans/netbeans-7.1.2.ebuild
new file mode 100644
index 000000000000..8430e6130734
--- /dev/null
+++ b/dev-util/netbeans/netbeans-7.1.2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.1.2.ebuild,v 1.1 2012/04/26 21:51:37 fordfrog Exp $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl? ( ${ALL_URLS} )
+	linguas_pl? ( ${ALL_URLS} )
+	linguas_pt_BR? ( ${ALL_URLS} )
+	linguas_pt_PT? ( ${ALL_URLS} )
+	linguas_ro? ( ${ALL_URLS} )
+	linguas_ru? ( ${ALL_URLS} )
+	linguas_si? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_ta_IN? ( ${ALL_URLS} )
+	linguas_tl? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	+netbeans_modules_websvccommon"
+IUSE_LINGUAS="
+	linguas_af
+	linguas_ar
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl
+	linguas_pl
+	linguas_pt_BR
+	linguas_pt_PT
+	linguas_ro
+	linguas_ru
+	linguas_si
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_ta_IN
+	linguas_tl
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND="virtual/jdk:1.6
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r1-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-r1-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 04ca0665bb00..0856e68a96a5 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,16 +7,19 @@ DIST git-1.7.4.5.tar.bz2 2711452 RMD160 5e9a0ccbaa913bf42507c2ebdbcf35fb9f7476f9
 DIST git-1.7.5.3.tar.bz2 2766856 RMD160 99a8f69690dc75c37b5141c6984dc5b499fcd8d4 SHA1 762d0985af37c9dda4e22c84e09c6e4efb46a22a SHA256 8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292
 DIST git-1.7.6.4.tar.gz 3399093 RMD160 80d226e77b8b9ad6d0bba86773e26257e5b3d734 SHA1 df91e2c32d6097ab1c9d0edc56dd8cecb4e9b686 SHA256 c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6
 DIST git-1.7.7.6.tar.gz 3485668 RMD160 6453d81893f2a32d7d9e93ff1b683b8464d6e6a8 SHA1 483dc95de0e26f0154fb23444589266b59848cfe SHA256 086eaca9d629bd9997f73763131dd194b62ae269a56ad71011263870b9263a56
+DIST git-1.7.7.7.tar.gz 3485439 RMD160 99ae1b7595b171a8027a69dddf589d0be799775c SHA1 6fbb215ab20afaf4cca6b1e5a7e4ff4b3b62303c SHA256 328b7b59be167c14305176f81435c77033f8cffd7dc25d08adaccaf2f0bede0b
 DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831 SHA1 198e23e6e50245331590a6159ccdbdbe1792422c SHA256 e393aad2286f85f23e859ad64ddcc20b74bfa7788c85c56645757cb201c9006a
 DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3
 DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d
 DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3
 DIST git-1.7.8.5.tar.gz 3544390 RMD160 900f57e121f0aa0a312128983c030d21400aec7a SHA1 bb3d715437a4751f7de0c89156bf97dae7c6049a SHA256 b235fd332525c22eeb6f4f5e0b44b21f1ff1c35a7c76e6729a7a560b2fbed622
+DIST git-1.7.8.6.tar.gz 3546112 RMD160 00bf5c301a86486ee67fe93fdcf3ac07d17c0985 SHA1 b204ae56e511c541425c5db757132fcd35f64117 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9
 DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713
 DIST git-1.7.9.1.tar.gz 3608449 RMD160 acff1b02a507220e51a86b63d38a5ae4ec01f70f SHA1 bd85327627f96c4e98071a4d1d32c30f210aa54a SHA256 b689a0ddbc99f9a69aef7c81c569289a28ba0787cd27e5e188112e1c3f0e8152
 DIST git-1.7.9.2.tar.gz 3611846 RMD160 af5a35d1630c2ea2472665f461953baaf3a42dfc SHA1 7aff1048480a8637de94e8d82744d312c0b5e060 SHA256 bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75
 DIST git-1.7.9.3.tar.gz 3615900 RMD160 3f45d8262526dfbc576004b8f50a92a6c33cf4d6 SHA1 6216153da1139c25cb96cfb4441eff327013ec4f SHA256 fe1d27649d9e8a31bdb768e9f9cdfeca3b383bb10354c6dcf0629bd669d8d76f
 DIST git-1.7.9.4.tar.gz 3616756 RMD160 2932d258de1fcebc8e83151f016fe963672b7d42 SHA1 05d2ff75ffd3356516d096f992b4fb3b8b6c0079 SHA256 c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39
+DIST git-1.7.9.7.tar.gz 3618222 RMD160 60d8fc7257ecf4e3c0b76dd118d6a919247eb920 SHA1 97f6006daccf916078896f8b24aadd882d941cf7 SHA256 c3bfc9379a98ba28bd70feef8b386738619a49d659bbe2a90422480a8b20b1fb
 DIST git-1.7.9.rc2.tar.gz 3606493 RMD160 9e5104dba8babc594a9da8fcdad8d47e7722a93b SHA1 4eeaaf8a73006f797e6c23455097684664bf256e SHA256 1d417ceaead73b4a2baaef3e26e204abcf476896046674291527e2a372636c62
 DIST git-1.7.9.tar.gz 3606326 RMD160 60aa60c076d0e398f7bc07d6cfab3c5ed28fdadc SHA1 ed51ef5ef250daaa6e98515cf2641820cd268d4c SHA256 dd9dfcf1da59f09c4b66b53836b56fcb2208d0be9edf1f8b9079c7e980435086
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2
@@ -28,16 +31,19 @@ DIST git-htmldocs-1.7.4.5.tar.bz2 945737 RMD160 d0e45908b397fd46e2eca46beeac2928
 DIST git-htmldocs-1.7.5.3.tar.bz2 956542 RMD160 777b354e18522bebd4ebfed070179e632998b5da SHA1 f0a66b8b21fab39acf466cea5c14416c718334c4 SHA256 a08cc349b53271cf1b1c23d68033105bee25b1cb1884c8ecaa12271737baff52
 DIST git-htmldocs-1.7.6.4.tar.gz 1606389 RMD160 931da8cc615cd1f52024a07f53ebc14e3fcc03ff SHA1 6abd985e24b6585284cef7fae2e3046ba9201356 SHA256 b73ded7089bb253efe45ef3a444022500df012a4bd596249ac999135ca76e240
 DIST git-htmldocs-1.7.7.6.tar.gz 1635617 RMD160 f151c86c48add564d75caa348bc8ccd48714f38c SHA1 8bcbd0a53fd3b937a9991aa096220a1a0eb2f771 SHA256 7046fab9bc9dc237bc25c700840bbfec2c79171fc61957889583444ea5d8783c
+DIST git-htmldocs-1.7.7.7.tar.gz 1627651 RMD160 9db00c5492b53f604a6785d96e21d06ef253ad8d SHA1 bb4552ccde7d8b7fdb98c113ce4373dbfb9672b6 SHA256 6edd544c6e8f0a2bf718adf8463e25b0c2cf067bcc620eb7154f3258b9656759
 DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f143b9ed4b SHA1 8f674dba39d9ae78928abfe9d924b0855e283e98 SHA256 6f68f05b76cb07fb9a671a2e59c79aac26deffd2ae3a46027520ef6f2fab404d
 DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800
 DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9
 DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd
 DIST git-htmldocs-1.7.8.5.tar.gz 1699204 RMD160 6313e769957f94a5b120656ed1b6419709a8aa8a SHA1 71cf25158ae3499e33327fa9469279771429f9f7 SHA256 64eb6ebac332cd23eb9f0ae1aec26c7f03da9e73b32dbb32bb84ec8c6efd19a7
+DIST git-htmldocs-1.7.8.6.tar.gz 1688622 RMD160 3997a1a54e5e446547ab43fb45b817a2a8720415 SHA1 0618da00f11a6bb91da7d639f348bb806b153650 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf
 DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862
 DIST git-htmldocs-1.7.9.1.tar.gz 1743893 RMD160 ba3b1b5eeeeb00ca0050c670ad3bddea5c19ffcb SHA1 de5ad73499cfdb08e261bc481c84a75f11b7ff0f SHA256 df21e008501ca0825d153d1746cf0f7742a87b15a98c6881d4fb9611897226df
 DIST git-htmldocs-1.7.9.2.tar.gz 1745003 RMD160 296cd29ff0a3f464760c8c30efa1123f17174222 SHA1 3cf13b03b2f64d0458212232cc18983231f8251e SHA256 da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b
 DIST git-htmldocs-1.7.9.3.tar.gz 1746314 RMD160 7d826cdd1bf3fc797ff077db8598a6b798462b96 SHA1 2d488c3975da1c2ea90965b82233a986c498a8c2 SHA256 855db3ff9fedec21e37e8e9679eca14c15c4cacc05e0175be1761dfa61e593e0
 DIST git-htmldocs-1.7.9.4.tar.gz 1746828 RMD160 c1f43162c41d481cb8c62cb6fe183bd70a0a8b90 SHA1 4d8b27a244969a707e83f6699fd00c322ff0ad5e SHA256 018e6222dd5d9c480009d0b1a8c5d63d9a97c90c623ca912745a19f8b2923461
+DIST git-htmldocs-1.7.9.7.tar.gz 1744067 RMD160 cb6dd0a52e6f314531e5c0b354c51a391dfae18a SHA1 9a1575a4de8074b4034ae5baaf87b5ae615d635c SHA256 0f84453df2c0f4b61caa524ac482940f819c637f6f63f3a60e076e8718413f1b
 DIST git-htmldocs-1.7.9.rc2.tar.gz 1742598 RMD160 e0413e2d89de34c631e5ea0a2f312f2f47b832d2 SHA1 22aad76c146abe04e8f9bd89b2fbf4b575f434ce SHA256 1aa639e9447afbcfb90eeade0d1791cc76e939fc9d88f1a33301348ca3185781
 DIST git-htmldocs-1.7.9.tar.gz 1742462 RMD160 dcaaa218bc63208b96fc7100add518bac94e8255 SHA1 c7b1fa20dc501beb2cb5091dd24dbfd2a0013a0c SHA256 a43234a0288e34ba826c3e77b7a9e9b2b3f30fbd63c847806ee5437e883f1699
 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447
@@ -49,15 +55,18 @@ DIST git-manpages-1.7.4.5.tar.bz2 301080 RMD160 f363285195421dea67d70d978d235d8b
 DIST git-manpages-1.7.5.3.tar.bz2 304065 RMD160 02919cf1db61717f6f3ad298c31d6eae3c01b48a SHA1 2b6f770b0314d12d7abd4fe2274a46c29ac64f50 SHA256 018f5c16b9a3c4e4942ae318d1faea0b6092287228069a718efd267b9f98b8c8
 DIST git-manpages-1.7.6.4.tar.gz 468334 RMD160 91d0df4b4182bead27149dbf03481d3e139cc730 SHA1 c6f6d92f4005a7eccaf89e851c45768c18f7e65a SHA256 c1ae86f0bfd80ec819535a64825a141aeef950dfebf9a3f82bef6752b586f63f
 DIST git-manpages-1.7.7.6.tar.gz 474628 RMD160 2cb26c04de36d84dd6fd9fc51d83b2660211d4dc SHA1 0fd7452c88d0b3ccb08d9b2b91b552680b0209e0 SHA256 3e94c718530ce7343ca5cc13a5583c01d8806d465e657f970c28b43420906dd3
+DIST git-manpages-1.7.7.7.tar.gz 478713 RMD160 46c19855b25af66f1706db7b52baf899ae2e017e SHA1 a8341f8887abef23aacb3c56d75b8f87d73b22ff SHA256 e00e9be4b1017038875c6402a3a59b53c7f261a7ff752122edac5ec3fc339843
 DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c82390eb3b56 SHA1 b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809 SHA256 1575acc41beb05ee4939508325a65ea01746982f2eeb77ed55bf1ffc673f54ef
 DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9
 DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a
 DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76
 DIST git-manpages-1.7.8.5.tar.gz 497426 RMD160 b4d902d69d0b983fa9ed6c014eb3a7a02ac263df SHA1 ce327331973b6e100b6a69ab8f9c526690260e92 SHA256 1a890f2cd2a875d2716ebc83413c08750ce15194297f3aabd66014f4f8f511d2
+DIST git-manpages-1.7.8.6.tar.gz 501678 RMD160 edf8c6b698751a18a23c8a3eec3c33c03157020b SHA1 2d2da141cebb2d7cce03abb556ee52c3dbad3831 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d
 DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354
 DIST git-manpages-1.7.9.1.tar.gz 508057 RMD160 2ed606396ece433ff3206bb4013867882e2cf51f SHA1 8c6ee031b39da5c5e53f927952838796e0959ce9 SHA256 f31d91061e96b5f882ceed2160d44937b2679931e7e217a66bfe3a23df46adae
 DIST git-manpages-1.7.9.2.tar.gz 508005 RMD160 229aee67eb986f81d8e2d511df18dfd8adc0ae41 SHA1 d6992d899fb70e40983f94a2f96ad24b8ee93557 SHA256 c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
 DIST git-manpages-1.7.9.3.tar.gz 508293 RMD160 9b51c410ec9618cd30e89b4746722680ce51fbe8 SHA1 223daa871a64facc60bdf643c50c78eac21c88f4 SHA256 6cea090e0c19bd1fc52a67576c4239ea3892a895b380dd3580b48353e423f462
 DIST git-manpages-1.7.9.4.tar.gz 508376 RMD160 a3c8d42d2be8356a27f0e74160acf169fc29d542 SHA1 833dc143d2d296754d681c57b41a008ff433b225 SHA256 570586dff6cacf56c3a43cdd2103640819d40f05a71df5ec49dfa463974c6fbb
+DIST git-manpages-1.7.9.7.tar.gz 512914 RMD160 d42444c20a793c07885579f7cc2c1ae17ef3efe2 SHA1 6cae2f1ea878de96b24644c23abc0086ac9283cc SHA256 317c7037ec517187f10e5bfa99a3568aee9a70b370bfab671273af794bb68ac9
 DIST git-manpages-1.7.9.rc2.tar.gz 508558 RMD160 ff92b1eb6cf41a760ff814fbe25b6ead77919edc SHA1 8565f64f6227fcfba3f768dabdcd9d6037f08842 SHA256 4f84e77e90abada3ac89082c7cef49af791bf63b76427edf4c9d25c732ba4a5c
 DIST git-manpages-1.7.9.tar.gz 508027 RMD160 d8b3502c1049933bf9d756f7131a42e0bff50e70 SHA1 1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a SHA256 b85c4533c0bbe0a5920399b3dc856577feaec2bbcde60c577338d29fac2f2cb1
diff --git a/dev-vcs/git/git-1.7.7.7.ebuild b/dev-vcs/git/git-1.7.7.7.ebuild
new file mode 100644
index 000000000000..17703580297b
--- /dev/null
+++ b/dev-vcs/git/git-1.7.7.7.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] dev-libs/libpcre )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
new file mode 100644
index 000000000000..679a765e5200
--- /dev/null
+++ b/dev-vcs/git/git-1.7.8.6.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] dev-libs/libpcre )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild
new file mode 100644
index 000000000000..b03c14ac2660
--- /dev/null
+++ b/dev-vcs/git/git-1.7.9.7.ebuild
@@ -0,0 +1,565 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="" # Pending git-svn fixes
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	app-crypt/gnupg
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI app-text/highlight )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)
+	test? (
+		app-crypt/gnupg
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+
+	# Newer versions of SVN hate a whitespace in the file URL.
+	# So we avoid that by replaced the space with an underscore.
+	#Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/
+	#svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool))
+	#
+	# With this change the following tests still fail: t9100 t9118 t9120
+	# Without it, MOST of t91* fails, due to the space tripping up the
+	# svn_uri_is_canonical.
+    #
+	# git-svn actually needs to be fixed here, but this chagne is useful for
+	# testing it.
+	#
+	# This patch is my work to date on fixing git-svn, but it causes more
+	# breakage than it fixes (it's manually-edited now to do nothing).
+	#epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch
+	cd "${S}"/t
+	sed -i \
+		-e 's/trash directory/trash_directory/g' \
+		test-lib.sh t0000-basic.sh Makefile || die "sed failed"
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 t9118 t9120 all fail with SVN 1.7, despite the workaround for spaces
+	# in the test directory.
+	local test_svn="t9100-git-svn-basic.sh \
+					t9118-git-svn-funky-branch-names.sh \
+					t9120-git-svn-clone-with-percent-escapes.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
index 1fc70501e6a6..04804563646d 100644
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -1,5 +1,86 @@
---- Makefile.old	2012-02-23 12:15:09.582701642 +0100
-+++ Makefile	2012-02-23 12:15:37.970700295 +0100
+--- Makefile.old	2012-04-26 21:40:25.277417417 +0200
++++ Makefile	2012-04-26 21:43:34.300835150 +0200
+@@ -344,11 +344,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(USE_CURL),1)
+@@ -380,12 +380,12 @@
+   
+   ifeq ($(USE_CIN_THEORA),1)
+     BASE_CFLAGS += -DUSE_CIN_THEORA
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+     BASE_CFLAGS += -DUSE_CODEC_MP3
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ else # ifeq Linux
+ 
+@@ -435,12 +435,12 @@
+   
+    ifeq ($(USE_CIN_THEORA),1)
+     BASE_CFLAGS += -DUSE_CIN_THEORA
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+     BASE_CFLAGS += -DUSE_CODEC_MP3
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   BASE_CFLAGS += -D_THREAD_SAFE=1
+@@ -565,7 +565,7 @@
+   endif
+ 
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(ARCH),x86)
+@@ -662,11 +662,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   # cross-compiling tweaks
+@@ -732,11 +732,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(USE_CURL),1) 
 @@ -1780,7 +1780,7 @@
  
  $(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
index 175328f93978..096d19165517 100644
--- a/games-puzzle/jag/jag-0.3.2.ebuild
+++ b/games-puzzle/jag/jag-0.3.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/games-puzzle/jag/jag-0.3.2.ebuild,v 1.3 2012/04/22 17:35:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jag/jag-0.3.2.ebuild,v 1.4 2012/04/26 19:28:42 ago Exp $
 
 EAPI=2
 inherit eutils qt4-r2 games
@@ -12,7 +12,7 @@ SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="editor"
 
 RDEPEND="x11-libs/qt-core:4
diff --git a/games-server/crossfire-server/crossfire-server-1.60.0.ebuild b/games-server/crossfire-server/crossfire-server-1.60.0.ebuild
index 24cca970dcba..bb0900a98e04 100644
--- a/games-server/crossfire-server/crossfire-server-1.60.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.60.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/games-server/crossfire-server/crossfire-server-1.60.0.ebuild,v 1.2 2012/04/23 19:17:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.60.0.ebuild,v 1.3 2012/04/26 19:25:57 ago Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="X"
 RESTRICT="test"
 
diff --git a/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
new file mode 100644
index 000000000000..73e87e0b0713
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
@@ -0,0 +1,15 @@
+--- a/src/external.py
++++ b/src/external.py
+@@ -41,7 +41,11 @@
+     _restarted = False
+ 
+     def __init__(self):
+-        self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++        if CLIENT.get_version() >= [0, 8, 99]:
++            self._extension = CLIENT._iface.get_extension("Histogram", "journal/activity")
++        else:
++            self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++
+ 
+     def _show_error(self):
+         dialog = gtk.MessageDialog(
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..ae1d3a4f9fa1
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild,v 1.1 2012/04/26 17:09:09 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit eutils gnome2 distutils gnome2-utils versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="http://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/dbus-python
+	dev-python/libgnome-python
+	dev-python/gconf-python
+	dev-python/gst-python
+	dev-python/pycairo
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	dev-python/pyxdg
+	gnome-extra/zeitgeist
+	sys-apps/dbus"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-python/python-distutils-extra"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() { :; }
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zg-0.9.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	python_convert_shebangs -r 2 "${D}"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	python_mod_optimize /usr/share/gnome-activity-journal
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	python_mod_cleanup /usr/share/gnome-activity-journal
+	gnome2_pkg_postrm
+}
diff --git a/licenses/AdobeFlash-11_beta b/licenses/AdobeFlash-11_beta
deleted file mode 100644
index 62f7c32209d0..000000000000
--- a/licenses/AdobeFlash-11_beta
+++ /dev/null
@@ -1,603 +0,0 @@
-Adobe Flash Player 11 Beta End User License Agreement
-
-ADOBE SYSTEMS INCORPORATED
-
-   Personal Computer Software License Agreement
-
-   1. WARRANTY DISCLAIMER, BINDING AGREEMENT AND ADDITIONAL TERMS AND
-   AGREEMENTS.
-
-   1.1 WARRANTY DISCLAIMER. THE SOFTWARE AND OTHER INFORMATION IS
-   DELIVERED TO YOU "AS IS" AND WITH ALL FAULTS. ADOBE, ITS SUPPLIERS AND
-   CERTIFICATION AUTHORITIES DO NOT AND CANNOT WARRANT THE PERFORMANCE OR
-   RESULTS YOU MAY OBTAIN BY USING THE SOFTWARE, CERTIFICATE AUTHORITY
-   SERVICES OR OTHER THIRD PARTY OFFERINGS. EXCEPT TO THE EXTENT ANY
-   WARRANTY, CONDITION, REPRESENTATION OR TERM CANNOT OR MAY NOT BE
-   EXCLUDED OR LIMITED BY LAW APPLICABLE TO YOU IN YOUR JURISDICTION,
-   ADOBE AND ITS SUPPLIERS AND CERTIFICATION AUTHORITIES MAKE NO
-   WARRANTIES CONDITIONS, REPRESENTATIONS, OR TERMS (EXPRESS OR IMPLIED
-   WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE) AS TO ANY
-   MATTER INCLUDING WITHOUT LIMITATION NONINFRINGEMENT OF THIRD PARTY
-   RIGHTS, MERCHANTABILITY, INTEGRATION, SATISFACTORY QUALITY, OR FITNESS
-   FOR ANY PARTICULAR PURPOSE. THE PROVISIONS OF SECTIONS 1.1 AND 10 SHALL
-   SURVIVE THE TERMINATION OF THIS AGREEMENT, HOWSOEVER CAUSED, BUT THIS
-   SHALL NOT IMPLY OR CREATE ANY CONTINUED RIGHT TO USE THE SOFTWARE AFTER
-   TERMINATION OF THIS AGREEMENT.
-
-   1.2 BINDING AGREEMENT: By using, copying or distributing all or any
-   portion of the Adobe Software, you accept all the terms and conditions
-   of this agreement, including, in particular, the provisions on:
-     * [20]Use (Section 3);
-     * [21]Transferability (Section 5);
-     * [22]Connectivity and Privacy (Section 7), including:
-          + [23]Updating,
-          + [24]Local Storage,
-          + [25]Settings Manager,
-          + [26]Peer Assisted Networking Technology,
-          + [27]Content Protection Technology, and
-          + [28]Use of Adobe Online Services;
-     * [29]Warranty Disclaimer (Section 1.1), and;
-     * [30]Liability Limitations (Sections 10 and 17).
-
-   Upon acceptance, this agreement is enforceable against you and any
-   entity that obtained the Software and on whose behalf it is used. If
-   you do not agree, do not Use the Software.
-
-   1.3 ADDITIONAL TERMS AND AGREEMENTS. Adobe permits you to Use the
-   Software only in accordance with the terms of this agreement. Use of
-   some third party materials included in the Software may be subject to
-   other terms and conditions typically found in a separate license
-   agreement, a "Read Me" file located near such materials or in the
-   "Third Party Software Notices and/or Additional Terms and Conditions"
-   found at [31]http://www.adobe.com/go/thirdparty. Such other terms and
-   conditions will supersede all or portions of this agreement in the
-   event of a conflict with the terms and conditions of this agreement.
-
-   2. Definitions.
-
-   "Adobe" means Adobe Systems Incorporated, a Delaware corporation, 345
-   Park Avenue, San Jose, California 95110, if subsection 12(a) of this
-   agreement applies; otherwise it means Adobe Systems Software Ireland
-   Limited, 4-6 Riverwalk, Citywest Business Campus, Dublin 24, Ireland, a
-   company organized under the laws of Ireland and an affiliate and
-   licensee of Adobe Systems Incorporated.
-
-   "Compatible Computer" means a Computer that conforms to the system
-   requirements of the Software as specified in the Documentation.
-
-   "Computer" means a virtual machine or physical personal electronic
-   device that accepts information in digital or similar form and
-   manipulates it for a specific result based on a sequence of
-   instructions.
-
-   "Personal Computer" or "PC" shall mean a hardware product which is
-   designed and marketed with the primary purpose of operating a wide
-   variety of productivity, entertainment, and other software applications
-   provided by unrelated third party software vendors, which operates
-   depending upon the use of a full function and full feature set computer
-   operating system of the type(s) then in widespread use with hardware to
-   operate general purpose laptop, desktop, server and large format tablet
-   microprocessor based computers. This definition of Personal Computer
-   shall exclude hardware products that are designed and/or marketed to
-   have as their primary purpose any number of the following: television,
-   television receiver, portable media player, audio/video receiver,
-   radio, audio headphone, audio speaker, personal digital assistant
-   ("PDA"), telephone or similar telephony based device, game console,
-   personal video recorder ("PVR"), player for digital versatile disc
-   ("DVD") or other optical media, video camera, still camera, camcorder,
-   video editing and format conversion device, video image projection
-   device, and shall further exclude any similar type of consumer,
-   professional or industrial device.
-
-   "Software" means (a) all of the contents of the files (delivered
-   electronically or on physical media), or disk(s) or other media with
-   which this agreement is provided, which may include (i) Adobe or third
-   party computer information or software, including Adobe® Reader®
-   ("Adobe Reader"), Adobe AIR® ("Adobe AIR"), Adobe Flash® Player,
-   Shockwave® Player and Authorware® Player (collectively, Adobe AIR and
-   the Flash, Shockwave and Authorware players are the "Adobe Runtimes");
-   (ii) related explanatory written materials or files ("Documentation");
-   and (iii) fonts; and (b) upgrades, modified versions, updates,
-   additions, and copies of the foregoing, provided to you by Adobe at any
-   time (collectively, "Updates").
-
-   "Use" means to access, install, download, copy, or otherwise benefit
-   from using the functionality of the Software.
-
-   3. Software License.
-
-   If you obtained the Software from Adobe or one of its authorized
-   licensees, and subject to your compliance with the terms of this
-   agreement, including the restrictions in Section 4, Adobe grants to you
-   a non-exclusive license to Use the Software in the manner and for the
-   purposes described in the Documentation as follows:
-
-   3.1 General Use. You may install and Use one copy of the Software on
-   your Compatible Computer. See Section 4 for important restrictions on
-   the Use of the Software.
-
-   3.2 Server Use. This agreement does not permit you to install or Use
-   the Software on a computer file server. For information on Use of
-   Software on a computer file server please refer to
-   [32]http://www.adobe.com/go/acrobat_distribute for information about
-   Adobe Reader; or [33]http://www.adobe.com/go/licensing for information
-   about the Adobe Runtimes.
-
-   3.3 Distribution. This license does not grant you the right to
-   sublicense or distribute the Software. For information about obtaining
-   the right to distribute the Software on tangible media or through an
-   internal network or with your product or service please refer to
-   [34]http://www.adobe.com/go/acrobat_distribute for information about
-   Adobe Reader; or [35]http://www.adobe.com/go/licensing for information
-   about the Adobe Runtimes.
-
-   3.4 Backup Copy. You may make one backup copy of the Software, provided
-   your backup copy is not installed or used other than for archival
-   purposes. You may not transfer the rights to a backup copy unless you
-   transfer all rights in the Software as provided under Section 5.
-
-   4. Obligations and Restrictions.
-
-   4.1 Adobe Runtime Restrictions. You will not Use any Adobe Runtime on
-   any non-PC device or with any embedded or device version of any
-   operating system. For the avoidance of doubt, and by example only, you
-   may not Use an Adobe Runtime on any (a) mobile device, set top box
-   (STB), handheld, phone, game console, TV, DVD player, media center
-   (other than with Windows XP Media Center Edition and its successors),
-   electronic billboard or other digital signage, Internet appliance or
-   other Internet-connected device, PDA, medical device, ATM, telematic
-   device, gaming machine, home automation system, kiosk, remote control
-   device, or any other consumer electronics device, (b) operator-based
-   mobile, cable, satellite, or television system or (c) other closed
-   system device. No right or license to Use any Adobe Runtime is granted
-   for such prohibited uses. For information on Software license terms for
-   non-PC versions of Adobe Runtimes please visit
-   http://www.adobe.com/go/runtime_mobile_EULA. For information on
-   licensing Adobe Runtimes for distribution on such systems please visit
-   [36]http://www.adobe.com/go/licensing.
-
-   4.1.1 AVC Video Restrictions. The Software may contain h.264/AVC video
-   technology, the use of which requires the following notice from
-   MPEG-LA, L.L.C.:
-
-   THIS SOFTWARE IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR
-   THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER TO (I) ENCODE VIDEO
-   IN COMPLIANCE WITH THE AVC STANDARD ("AVC VIDEO") AND/OR (II) DECODE
-   AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND
-   NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER
-   LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE
-   IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM
-   MPEG LA, L.L.C. SEE [37]http://www.mpegla.com.
-
-   4.2 Adobe Flash Player Restrictions. You will not use Adobe Flash
-   Player with any application or device that circumvents technological
-   measures for the protection of video, audio, and/or data content,
-   including any of Adobe's secure RTMP measures. No right or license to
-   use Adobe Flash Player is granted for such prohibited uses.
-
-   4.3 Adobe Reader Restrictions.
-
-   4.3.1 Conversion Restrictions. You will not integrate or use Adobe
-   Reader with any other software, plug-in or enhancement that uses or
-   relies upon Adobe Reader when converting or transforming PDF files into
-   a different format (e.g., a PDF file into a TIFF, JPEG, or SVG file).
-
-   4.3.2 Plug-in Restrictions. You will not integrate or use Adobe Reader
-   with any plug-in software not developed in accordance with the Adobe
-   Integration Key License Agreement, more information can be found at
-   [38]http://www.adobe.com/devnet/reader/ikla.html.
-
-   4.3.3 Disabled Features. Adobe Reader may contain features or
-   functionalities that are hidden or appear disabled or "grayed out" (the
-   "Disabled Features"). Disabled Features will activate only when opening
-   a PDF document that was created using enabling technology available
-   only from Adobe. You will not access, or attempt to access, any
-   Disabled Features other than through the use of such enabling
-   technologies, nor will you rely on Adobe Reader to create a feature
-   substantially similar to any Disabled Feature or otherwise circumvent
-   the technology that controls activation of any such feature. For more
-   information on disabled features, please refer to
-   [39]http://www.adobe.com/go/readerextensions.
-
-   4.4 Notices. You shall not alter or remove any copyright or other
-   proprietary notice that appears on or in the Software.
-
-   4.5 No Modification or Reverse Engineering. You shall not modify,
-   adapt, translate or create derivative works based upon the Software.
-   You shall not reverse engineer, decompile, disassemble, or otherwise
-   attempt to discover the source code of the Software. If you are located
-   in the European Union, please refer to the additional terms at the end
-   of this agreement under the header "European Union Provisions," in
-   Section 16.
-
-   5. Transfer.
-
-   You may not rent, lease, sublicense, assign, or transfer your rights in
-   the Software, or authorize all or any portion of the Software to be
-   copied onto another user's Computer except as may be expressly
-   permitted by this agreement. You may, however, transfer all your rights
-   to Use the Software to another person or legal entity provided that:
-   (a) you also transfer (i) this agreement, and (ii) the Software and all
-   other software or hardware bundled or pre-installed with the Software,
-   including all copies, Updates, and prior versions, to such person or
-   entity, (b) you retain no copies, including backups and copies stored
-   on a Computer, and (c) the receiving party accepts the terms and
-   conditions of this agreement and any other terms and conditions upon
-   which you obtained a valid license to the Software. Notwithstanding the
-   foregoing, you may not transfer education, pre-release, or not for
-   resale copies of the Software.
-
-   6. Intellectual Property Ownership, Reservation of Rights.
-
-   The Software and any authorized copies that you make are the
-   intellectual property of Adobe and its suppliers. The structure,
-   organization and code of the Software are the valuable intellectually
-   property (e.g. trade secrets and confidential information) of Adobe and
-   its suppliers. The Software is protected by law, including without
-   limitation the copyright laws of the United States and other countries,
-   and by international treaty provisions. Except as expressly stated
-   herein, this agreement does not grant you any intellectual property
-   rights in the Software and all rights not expressly granted are
-   reserved by Adobe and its suppliers.
-
-   7. Connectivity and Privacy. You acknowledge and agree to the
-   following:
-
-   7.1 Use of PDF Files. When you Use the Software to open a PDF file that
-   has been enabled to display ads, your Computer may connect to a website
-   operated by Adobe, an advertiser, or other third party. Your Internet
-   Protocol address ("IP Address") is sent when this happens. The party
-   hosting the site may use technology to send (or "serve") advertising or
-   other electronic content that appears in or near the opened PDF file.
-   The website operator may also use JavaScript, web beacons (also known
-   as action tags or single-pixel gifs), and other technologies to
-   increase and measure the effectiveness of advertisements and to
-   personalize advertising content. Your communication with Adobe websites
-   is governed by the Adobe Online Privacy Policy found at
-   [40]http://www.adobe.com/go/privacy ("Adobe Online Privacy Policy").
-   Adobe may not have access to or control over features that a third
-   party may use, and the information practices of third party websites
-   are not covered by the Adobe Online Privacy Policy.
-
-   7.2 Updating. If your Computer is connected to the Internet, the
-   Software may, without additional notice, check for Updates that are
-   available for automatic download and installation to your Computer and
-   let Adobe know the Software is successfully installed. For Reader,
-   Updates may be automatically downloaded but not installed without
-   additional notice unless you change your preferences to accept
-   automatic installation. Only non-personally identifying information is
-   transmitted to Adobe when this happens, except to the extent that IP
-   Addresses may be considered personally identifiable in some
-   jurisdictions. The use of such information, including your IP Address,
-   as provided by the auto update process is governed by the Adobe Online
-   Privacy Policy. Please consult the Documentation for information about
-   changing default update settings, or online at
-   [41]http://www.adobe.com/go/settingsmanager for Flash Player,
-   [42]http://acrobatsupport.com/turning-off-the-acrobat-updater (or
-   successor website) for Reader, and
-   [43]http://kb2.adobe.com/cps/403/kb403175.html and
-   [44]http://airdownload.adobe.com/air/applications/SettingsManager/Setti
-   ngsManager.air for Adobe AIR.
-
-   7.3 Local Storage. Flash Player and Adobe AIR may allow third parties
-   to store certain information on your Computer in a local data file
-   known as a local shared object. The type and amount of information that
-   the third party application requests to be stored in a local shared
-   object can vary by application and such requests are solely controlled
-   by the third party. You can find more information on local shared
-   objects at [45]http://www.adobe.com/go/flashplayer_security. For more
-   information on how to limit or control the storage of local shared
-   objects on your Computer, please visit
-   [46]http://www.adobe.com/go/settmgr_storage_en.
-
-   7.4 Settings Manager. Flash Player and Adobe AIR may cause certain user
-   settings to be stored on your Computer as a local shared object. These
-   settings are associated with the instance of Flash Player or Adobe AIR
-   on your Computer, but do not contain personally identifiable
-   information associated with you, and allow you to configure certain
-   settings within the Flash Player including the ability to limit third
-   parties from storing local shared objects. You can find more
-   information on how to configure your version of Flash Player or Adobe
-   AIR, including how to disable local shared objects in the Settings
-   Manager for Flash Player, at
-   [47]http://www.adobe.com/go/settingsmanager, or
-   [48]http://airdownload.adobe.com/air/applications/SettingsManager/Setti
-   ngsManager.air for Adobe AIR.
-
-   7.5 Peer Assisted Networking Technology. Adobe Flash Player and Adobe
-   AIR runtimes provide the ability for applications built by third
-   parties to connect to an Adobe Server or Service and permit direct
-   communication between two Adobe Runtime clients or to connect an Adobe
-   Runtime client as part of a peer or distributed network that allows a
-   portion of your resources, such as network bandwidth, to be made
-   directly available to other participants. Prior to joining such peer or
-   distributed network, you will be provided with the opportunity to
-   accept such connectivity. To manage Peer Assisted Networking settings,
-   please go to the Settings Manager at
-   [49]http://www.adobe.com/go/settmgr_networking_en. You can find more
-   information on Peer Assisted Networking at
-   [50]http://www.adobe.com/go/RTMFP.
-
-   7.6 Content Protection Technology. If you Use the Adobe Runtimes to
-   access content that has been protected with Adobe Flash Media Rights
-   Management Server or Flash Access software ("Content Protection"), in
-   order to let you play the protected content, the Software may
-   automatically request media usage rights and individualization rights
-   from a rights server on the Internet, and may download and install
-   required components of the Software, including any available Content
-   Protection Updates. You can find more information on Content Protection
-   at [51]http://www.adobe.com/go/protected_content.
-
-   7.7 Use of Adobe Online Services. If your Computer is connected to the
-   Internet, the Software may, without additional notice and on an
-   intermittent or regular basis, facilitate your access to content and
-   services that are hosted on websites maintained by Adobe or its
-   affiliates ("Adobe Online Services"). Examples of such Adobe Online
-   Services might include, but are not limited to: Acrobat.com. In some
-   cases an Adobe Online Service might appear as a feature or extension
-   within the Software even though it is hosted on a website. In some
-   cases, access to an Adobe Online Service might require a separate
-   subscription or other fee in order to access it, and/or your assent to
-   additional terms of use. Adobe Online Services might not be available
-   in all languages or to residents of all countries and Adobe may, at any
-   time and for any reason, modify or discontinue the availability of any
-   Adobe Online Service. Adobe also reserves the right to begin charging a
-   fee for access to or use of an Adobe Online Service that was previously
-   offered at no charge. If your Computer is connected to the Internet,
-   the Software may, without additional notice, update downloadable
-   materials from these Adobe Online Services so as to provide immediate
-   availability of these Adobe Online Services even when you are offline.
-   When the Software connects to the Internet, no personally identifiable
-   information is sent except to the extent that IP Addresses may be
-   considered personally identifiable in some jurisdictions.
-   Notwithstanding the foregoing, if you sign on to Acrobat.com your user
-   name and password may be sent to Adobe's servers and stored by Adobe in
-   accordance with the Acrobat.com Additional Terms of Use. Whenever the
-   Software makes an Internet connection and communicates with an Adobe
-   website, whether automatically or due to explicit user request, the
-   Adobe Online Privacy Policy shall apply. Additionally, unless you are
-   provided with separate terms of use at that time, the Adobe.com Terms
-   of Use ([52]http://www.adobe.com/go/terms) shall apply. Please note
-   that the Adobe Privacy Policy allows tracking of website visits and it
-   addresses in detail the topic of tracking and use of cookies, web
-   beacons and similar devices.
-
-   8. Third Party Offerings. You acknowledge and agree to the following:
-
-   8.1 Third Party Offerings. The Software may allow you to access and
-   interoperate with third party content, software applications, and data
-   services, including rich Internet applications ("Third Party
-   Offerings"). Your access to and use of any Third Party Offering,
-   including any goods, services, or information, is governed by the terms
-   and conditions respecting such offerings and copyright laws of the
-   United States and other countries. Third Party Offerings are not owned
-   or provided by Adobe. You agree that you will not use any of such Third
-   Party Offerings in violation of copyright laws of the United States or
-   other countries.Adobe or the third party may at any time, for any
-   reason, modify or discontinue the availability of any Third Party
-   Offerings. Adobe does not control, endorse or accept responsibility for
-   Third Party Offerings. Any dealings between you and any third party in
-   connection with a Third Party Offerings, including such party's privacy
-   policies and use of your personal information, delivery of and payment
-   for goods and services and any other terms, conditions, warranties or
-   representations associated with such dealings, are solely between you
-   and such third party. Third Party Offerings might not be available in
-   all languages or to residents of all countries and Adobe or the third
-   party may, at any time and for any reason, modify or discontinue the
-   availability of any Third Party Offerings.
-
-   8.2 EXCEPT AS EXPRESSLY AGREED BY ADOBE OR ITS AFFILIATES OR A THIRD
-   PARTY IN A SEPARATE AGREEMENT, YOUR USE OF ADOBE AND THIRD PARTY
-   OFFERINGS IS AT YOUR OWN RISK UNDER THE WARRANTY AND LIABILITY
-   LIMITATIONS OF SECTIONS 1.1 AND 10.
-
-   9. Digital Certificates. You acknowledge and agree to the following:
-
-   9.1 Use. Adobe AIR uses digital certificates to help you identify the
-   publisher of Adobe AIR applications created by third parties.
-   Additionally, Adobe AIR uses digital certificates to establish the
-   identity of servers accessed via the Transport Layer Security (TLS)
-   protocol, including access via HTTPS. Adobe Reader uses digital
-   certificates to sign and validate signatures within PDF documents and
-   to validate certified PDF documents. Adobe Runtimes use digital
-   certificates to secure protected content from unauthorized usage. Your
-   Computer may connect to the Internet at the time of validation of a
-   digital certificate in order to download current certificate revocation
-   lists (CRLs) or to update the list of digital certificates. This access
-   may be made both by the Software and by applications based on the
-   Software. Digital certificates are issued by third party certificate
-   authorities, including Adobe Certified Document Services (CDS) vendors
-   listed at [53]http://www.adobe.com/go/partners_cds and Adobe Approved
-   Trust List (AATL) vendors listed at
-   [54]http://www.adobe.com/security/approved-trust-list.html, and
-   individualization vendors found at
-   [55]http://www.adobe.com/go/protected_content (collectively
-   "Certification Authorities"), or can be self-signed.
-
-   9.2 Terms and Conditions. Purchase, use and reliance upon digital
-   certificates are the responsibility of you and a Certification
-   Authority. Before you rely upon any certified document, digital
-   signature or Certification Authority services, you should review the
-   applicable terms and conditions under which the relevant Certification
-   Authority provides services, including, for example, any subscriber
-   agreements, relying party agreements, certificate policies and practice
-   statements. See the links on [56]http://www.adobe.com/go/partners_cds
-   for information about Adobe's CDS vendors and
-   [57]http://www.adobe.com/security/approved-trust-list.html for
-   information about Adobe's AATL vendors.
-
-   9.3 Acknowledgement. You agree that (a) a digital certificate may have
-   been revoked prior to the time of verification, making the digital
-   signature or certificate appear valid when in fact it is not, (b) the
-   security or integrity of a digital certificate may be compromised due
-   to an act or omission by the signer of the document, the applicable
-   Certification Authority, or any other third party, and (c) a
-   certificate may be a self-signed certificate not provided by a
-   Certification Authority. YOU ARE SOLELY RESPONSIBLE FOR DECIDING
-   WHETHER OR NOT TO RELY ON A CERTIFICATE. UNLESS A SEPARATE WRITTEN
-   WARRANTY IS PROVIDED TO YOU BY A CERTIFICATION AUTHORITY, YOU USE
-   DIGITAL CERTIFICATES AT YOUR SOLE RISK.
-
-   9.4 Third Party Beneficiaries. You agree that any Certification
-   Authority you rely upon is a third party beneficiary of this agreement
-   and shall have the right to enforce this agreement in its own name as
-   if it were Adobe.
-
-   9.5 Indemnity. You agree to hold Adobe and any applicable Certification
-   Authority (except as expressly provided in its terms and conditions)
-   harmless from any and all liabilities, losses, actions, damages, or
-   claims (including all reasonable expenses, costs, and attorneys fees)
-   arising out of or relating to any use of, or reliance on, any service
-   of such authority, including, without limitation (a) reliance on an
-   expired or revoked certificate, (b) improper verification of a
-   certificate, (c) use of a certificate other than as permitted by any
-   applicable terms and conditions, this agreement or applicable law; (d)
-   failure to exercise reasonable judgment under the circumstances in
-   relying on issuer services or certificates or (e) failure to perform
-   any of the obligations as required in the terms and conditions related
-   to the services.
-
-   10. Limitation of Liability.
-
-   IN NO EVENT WILL ADOBE, ITS SUPPLIERS, OR CERTIFICATION AUTHORITIES BE
-   LIABLE TO YOU FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER INCLUDING ANY
-   CONSEQUENTIAL, INDIRECT, INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR
-   LOST SAVINGS, EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE
-   POSSIBILITY OF SUCH LOSS, DAMAGES, OR CLAIMS. THE FOREGOING LIMITATIONS
-   AND EXCLUSIONS APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW IN YOUR
-   JURISDICTION. ADOBE'S AGGREGATE LIABILITY AND THAT OF ITS SUPPLIERS AND
-   CERTIFICATION AUTHORITIES UNDER OR IN CONNECTION WITH THIS AGREEMENT
-   SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE, IF ANY. Nothing
-   contained in this agreement limits Adobe's liability to you in the
-   event of death or personal injury resulting from Adobe's negligence or
-   for the tort of deceit (fraud). Adobe is acting on behalf of its
-   suppliers and Certification Authorities for the purpose of disclaiming,
-   excluding and/or limiting obligations, warranties and liability as
-   provided in this agreement, but in no other respects and for no other
-   purpose. For further information, please see the jurisdiction specific
-   information at the end of this agreement, if any, or contact Adobe's
-   Customer Support Department.
-
-   11. Export Rules.
-
-   You agree that the Software will not be shipped, transferred, or
-   exported into any country or used in any manner prohibited by the
-   United States Export Administration Act or any other export laws,
-   restrictions or regulations (collectively the "Export Laws"). In
-   addition, if the Software is identified as export controlled items
-   under the Export Laws, you represent and warrant that you are not a
-   citizen, or otherwise located within, an embargoed nation (including
-   without limitation Iran, Syria, Sudan, Cuba, and North Korea) and that
-   you are not otherwise prohibited under the Export Laws from receiving
-   the Software. All rights to Use the Software are granted on condition
-   that such rights are forfeited if you fail to comply with the terms of
-   this agreement.
-
-   12. Governing Law.
-
-   This agreement will be governed by and construed in accordance with the
-   substantive laws in force: (a) in the State of California, if a license
-   to the Software is obtained when you are in the United States, Canada,
-   or Mexico; or (b) in Japan, if a license to the Software is obtained
-   when you are in Japan, China, Korea, or other Southeast Asian country
-   where all official languages are written in either an ideographic
-   script (e.g., Hanzi, Kanji, or Hanja), and/or other script based upon
-   or similar in structure to an ideographic script, such as Hangul or
-   Kana; or (c) in England, if a license to the Software is obtained when
-   you are in any other jurisdiction not described above. The respective
-   courts of Santa Clara County, California when California law applies,
-   Tokyo District Court in Japan, when Japanese law applies, and the
-   competent courts of England, when the law of England applies, shall
-   each have non-exclusive jurisdiction over all disputes relating to this
-   agreement. This agreement will not be governed by the conflict of law
-   rules of any jurisdiction or the United Nations Convention on Contracts
-   for the International Sale of Goods, the application of which is
-   expressly excluded.
-
-   13. General Provisions.
-
-   If any part of this agreement is found void and unenforceable, it will
-   not affect the validity of the balance of this agreement, which shall
-   remain valid and enforceable according to its terms. This agreement
-   shall not prejudice the statutory rights of any party dealing as a
-   consumer. This agreement may only be modified by a writing signed by an
-   authorized officer of Adobe. Updates may be licensed to you by Adobe
-   with additional or different terms. This is the entire agreement
-   between Adobe and you relating to the Software and it supersedes any
-   prior representations, discussions, undertakings, communications, or
-   advertising relating to the Software.
-
-   14. Notice to U.S. Government End Users.
-
-   For U.S. Government End Users, Adobe agrees to comply with all
-   applicable equal opportunity laws including, if appropriate, the
-   provisions of Executive Order 11246, as amended, Section 402 of the
-   Vietnam Era Veterans Readjustment Assistance Act of 1974 (38 USC 4212),
-   and Section 503 of the Rehabilitation Act of 1973, as amended, and the
-   regulations at 41 CFR Parts 60-1 through 60-60, 60-250, and 60-741. The
-   affirmative action clause and regulations contained in the preceding
-   sentence shall be incorporated by reference in this agreement.
-
-   15. Compliance with Licenses.
-
-   If you are a business or organization, you agree that upon request from
-   Adobe or Adobe's authorized representative, you will, within thirty
-   (30) days, fully document and certify that use of any and all Software
-   at the time of the request is in conformity with your valid licenses
-   from Adobe.
-
-   16. European Union Provisions.
-
-   Nothing included in this agreement (including Section 4.5) shall limit
-   any non-waivable right to decompile the Software that you may enjoy
-   under mandatory law. For example, if you are located in the European
-   Union (EU), you may have the right upon certain conditions specified in
-   the applicable law to decompile the Software if it is necessary to do
-   so in order to achieve interoperability of the Software with another
-   software program, and you have first asked Adobe in writing to provide
-   the information necessary to achieve such interoperability and Adobe
-   has not made such information available. In addition, such
-   decompilation may only be done by you or someone else entitled to use a
-   copy of the Software on your behalf. Adobe has the right to impose
-   reasonable conditions before providing such information. Any
-   information supplied by Adobe or obtained by you, as permitted
-   hereunder, may only be used by you for the purpose described herein and
-   may not be disclosed to any third party or used to create any software
-   which is substantially similar to the expression of the Software or
-   used for any other act which infringes Adobe or its licensors'
-   copyright.
-
-   17. Specific Provisions and Exceptions.
-
-   17.1 Limitation of Liability for Users Residing in Germany and Austria.
-
-   17.1.1 If you obtained the Software in Germany or Austria, and you
-   usually reside in such country, then Section 10 does not apply.
-   Instead, subject to the provisions in Section 17.1.2, Adobe's statutory
-   liability for damages shall be limited as follows: (a) Adobe shall be
-   liable only up to the amount of damages as typically foreseeable at the
-   time of entering into the license agreement in respect of damages
-   caused by a slightly negligent breach of a material contractual
-   obligation and (b) Adobe shall not be liable for damages caused by a
-   slightly negligent breach of a non-material contractual obligation.
-
-   17.1.2 The aforesaid limitation of liability shall not apply to any
-   mandatory statutory liability, in particular, to liability under the
-   German Product Liability Act, liability for assuming a specific
-   guarantee or liability for culpably caused personal injuries.
-
-   17.1.3 You are required to take all reasonable measures to avoid and
-   reduce damages, in particular to make back-up copies of the Software
-   and your computer data subject to the provisions of this agreement.
-
-   If you have any questions regarding this agreement, or if you wish to
-   request any information from Adobe, please use the address and contact
-   information included with this product or via the web at
-   [58]http://www.adobe.com to contact the Adobe office serving your
-   jurisdiction.
-
-   Adobe, Adobe AIR, AIR, Authorware, Flash, Reader, and Shockwave are
-   either registered trademarks or trademarks of Adobe Systems
-   Incorporated in the United States and/or other countries.
-
-   PlatformClients_PC_WWEULA-en_US-20100108_1657
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index a9c877735443..c1af7fb65245 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -102,6 +102,58 @@ DIST thunderbird-10.0.3esr-uk.xpi 463922 RMD160 d39ad39da90c06158b417be8f8806144
 DIST thunderbird-10.0.3esr-vi.xpi 435882 RMD160 2ea48f13c119dc4bf7310f8008a4a5e72d6fc5f1 SHA1 8f86e864381c08a56f47e7a74784305c9c8dc767 SHA256 a1e287e688ec2c8b6b715064f693c73c44f526654b2cfc2ff3ddcd7f4789e1eb
 DIST thunderbird-10.0.3esr-zh-CN.xpi 431232 RMD160 6617c84511d2753dbe00cd56181f2c5dbeb55227 SHA1 372ffe54885713e80a0080145b66434a9ab38a70 SHA256 b7c0077f9188f862866a4b36b7f9aa1e19a0350b86e9196908404f0206e79854
 DIST thunderbird-10.0.3esr-zh-TW.xpi 431824 RMD160 5649ecb95f2233b743b8b9c41b3cafc06097da03 SHA1 cde708d712327858cc077fcc075942e7a3a1d074 SHA256 bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e
+DIST thunderbird-10.0.4esr-ar.xpi 441466 RMD160 3b2cbd1531c9452c363de27c59ac5c5d6bc277c6 SHA1 6d107362718a45c4ea31a37751971e9827c6546c SHA256 8295b8d86576eef51ca04983d9e36a833eca0708bc53c87329dbcccfefc4001e
+DIST thunderbird-10.0.4esr-ast.xpi 362710 RMD160 aaf36ca61f500d62d7996edb07054735a93fbc79 SHA1 4caab1d89958e58266b687bb46367344fa9af30f SHA256 71af64f9852a8c14764ee05d68e0a5aff472838534c17754a5fa58f9bd939360
+DIST thunderbird-10.0.4esr-be.xpi 397809 RMD160 0e8f4c848f02ca7aeff6e37d239422461720cb4e SHA1 183e97f44490cb64535ed6f6263de831621d2914 SHA256 939df3e46f77f280c1c65bc2e0c48aa567d9a87b326670149a8efd270d859123
+DIST thunderbird-10.0.4esr-bg.xpi 460814 RMD160 0dec7e58bad91c0f94e0e9d0d8f553753a2b2cc7 SHA1 3bed67fb8219ce3a7a15f8dc8b0ff8982d642844 SHA256 a00755d3741612b6148c98d0d183098afb9f56ca243c1f462d7a5de0e7b154a7
+DIST thunderbird-10.0.4esr-bn-BD.xpi 478175 RMD160 dfade6cf195b289da3f3ee802b6c87081b8cfbf8 SHA1 bbee3b66663381c0f60c5aa688f5f89758703658 SHA256 cb6d05bd174743cd9b9de7c1684805f79b69a10bbee67a08e0814057900fb790
+DIST thunderbird-10.0.4esr-br.xpi 415527 RMD160 43eb27a862eaa207481d59e383a8a39da8e5a604 SHA1 1c5651018552c4fd6da1a4926aed4ee7b48cdf0c SHA256 8832db8c596fba7c953c2a9cee12055a0d7fbd63005608c6952f3f702cca9a7a
+DIST thunderbird-10.0.4esr-ca.xpi 416069 RMD160 a54ccda47326a90b2455bd9d0bfc37401b7a0447 SHA1 e5705270cb988b22d72104b754e0ba01df8697f4 SHA256 983b6b38e19c15818960ddfdfd1322cbdf2916572946b99e81aabf3f0852db93
+DIST thunderbird-10.0.4esr-cs.xpi 419419 RMD160 3c53565c6bc7cd512697c52221f7d139cc8104fe SHA1 6cf1b64e79289c6e2c477c965729060c878759f3 SHA256 8b2abbfa1a4793a3aff0dee0a5b36b7ef39e68a5b8fb5027abf2600ede65dc04
+DIST thunderbird-10.0.4esr-da.xpi 363375 RMD160 e9f48fb975086a92249e842f47a61b71d85e47be SHA1 fb284c60f4dadac027cacf5f0c04f80e0f387ec9 SHA256 cc8c0c4c42ff6d9ffddbfc5770dae2348b222fcf18ed7aae56bfcb120819e801
+DIST thunderbird-10.0.4esr-de.xpi 418266 RMD160 6cbbbf421b1c56c326d67e0a948d41a54bb6cb26 SHA1 1a0d683004073b721514e47faeb390471b87dae4 SHA256 0a45766c6c905070b099b74bd753ec9c04eebb7fff3eadb1daa168a3e3347f7e
+DIST thunderbird-10.0.4esr-el.xpi 404866 RMD160 af8a8fbae0cefa50378713ed67952738ae8b249b SHA1 e51d079e8a80f757856f17d6ef6e8c5f9d12b22e SHA256 23a9a2efa37b9d724a39626f23d1b4769ce563755d73108ef80e1318517a464c
+DIST thunderbird-10.0.4esr-en-GB.xpi 391743 RMD160 e5f42613460393432b812f18cdb10b6efc8c2c73 SHA1 8fd91083de8049a3ce957c8737f59b3e2200665b SHA256 b7f55778acaa177bb8fd1f0436685acfb10f67ee641be59dc3e8065d52fadd29
+DIST thunderbird-10.0.4esr-es-AR.xpi 410726 RMD160 18c3aadaec289e766dafdf5d1130796589305a91 SHA1 fc6f6f3640dfc0662dbbd90daa5c7cf2e43f31be SHA256 ec4198e8deb477e5016a8b70eb0cc70c4d98c69ce4ddfa501357b7959c7ea065
+DIST thunderbird-10.0.4esr-es-ES.xpi 355142 RMD160 90b6970399af36fa240730e08349f7a498cfc399 SHA1 b1e75da8a3ee743086203dc4e552d48a2d55e804 SHA256 ae49dcc476f2e16b0332d1c66084bfc5c1a258467cfe9cedb659d1728df10955
+DIST thunderbird-10.0.4esr-et.xpi 410724 RMD160 dc5a07f09e43d52b75fe74fd8a303fa93adb065c SHA1 6ed634f50833b5edeebd89a29296989941082672 SHA256 da1fde032f6beff791a592ed46710c655546c4466d57dfb04770b0270665e4a6
+DIST thunderbird-10.0.4esr-eu.xpi 406387 RMD160 54645f0b3842fb5521bb1d46dd400670f807fac3 SHA1 0f24b7d27108b7cde3081af86879067d65016884 SHA256 c0ecbafbfb62843d7b76322bff5db3ba2d7bee50283e58d54ee8123b21f91915
+DIST thunderbird-10.0.4esr-fi.xpi 411928 RMD160 5bbb915fbbd741bdb915556c8a9785d665216e20 SHA1 eeeb5bed80c8c3b3407da7eb337ffb728d35ad1c SHA256 9c83968e1004cef9a03171aec4bf90ab197f71005bf17df91eaae20e7bce6515
+DIST thunderbird-10.0.4esr-fr.xpi 414749 RMD160 807996cd1300151dfb92cbbea19d9cf43d8be230 SHA1 fda6bd0d62bf53a6666e2c807d9b67b78dcb69eb SHA256 ac0aca1a0822581805d5bd9c241b54554f9cd682bf73d88c0c15261db4772731
+DIST thunderbird-10.0.4esr-fy-NL.xpi 413985 RMD160 22227e9a8a280cc14620a559627c1f47f7f050ad SHA1 e7f02e2871711eb68fc5e98d7fa71582d04cd9d9 SHA256 a733f624164348a5666db3a624c18899961a2ed913829c19d19964ad28cd72a1
+DIST thunderbird-10.0.4esr-ga-IE.xpi 423261 RMD160 9a73037f3852cb3e1556dc76b23e08606c8de5ed SHA1 4b53ab31be218c969d13999c9a28593ac3a873f7 SHA256 ab98d4b37b69a391aee9b16cd678b0bb0a07ba064d7f7f92913c1905abe0eda9
+DIST thunderbird-10.0.4esr-gd.xpi 425876 RMD160 d321640218e99980856c524d79caf07a519b699d SHA1 d94f47708b65d24fcd73e546df4e6655cc832b8f SHA256 dae3c6fa4290eabc84e3d8a7f0df4c194a72a44f2c631a0d6f42fe1b76f0ac3f
+DIST thunderbird-10.0.4esr-gl.xpi 409229 RMD160 8421039d4d0c52c51153d7e5cfce9ff6bdb6ae2e SHA1 7aa804673d824c924f7ecca43ec6248b3f14234a SHA256 2deb10fd529124e12fc3864df7af0f03b3dd57b63bf2e7853ee634c8dbb88d20
+DIST thunderbird-10.0.4esr-he.xpi 439206 RMD160 3714f296c2c3b6a945d20936a544c391016f3be3 SHA1 2c3d740a4dfb23c48efca9e236051a72d1ba0c63 SHA256 afe7c88bdb586d2357a7024393fc28c2d096db6a9a018a8908a9c986229b7ab8
+DIST thunderbird-10.0.4esr-hu.xpi 426356 RMD160 957679487438256ebf2b83455ca06a034c7443b6 SHA1 17b67543794f307eb580fef3426a1e217a761a90 SHA256 476a2513eddb6cee28ed750e5fc468cf314b2a631ae80b8bbd3fea76ed02fb92
+DIST thunderbird-10.0.4esr-id.xpi 400411 RMD160 3ff8690e0f100ac5062d1457746eb2468a864af7 SHA1 002a5131b9ea5c157ecfb90ca677c182b9cf56a2 SHA256 d0fe5f0adeb2e7a73708b3330e1586647f1753475a4ef927b1f65384a28e12cd
+DIST thunderbird-10.0.4esr-is.xpi 412634 RMD160 6c83dabfbd252f24564fa3e1e8e05e1f2ced7006 SHA1 b161564de1631820afaa3d98c218efa95f8fbe11 SHA256 e9a4f1f8c32dc3fbe772b16e47c01679de79d061264ce92e27b69f1cc6baddb0
+DIST thunderbird-10.0.4esr-it.xpi 347633 RMD160 bc1d4fcdcb94e75f1cf45b6015d8728f9ca9c96e SHA1 c79385ba176b457a1b712f622c1b2d0dbe557d66 SHA256 48224ad82f53616d75f2e8fb638d16ea35a4e39d5b7cdc2d6084c2bacb2e7b0b
+DIST thunderbird-10.0.4esr-ja.xpi 459031 RMD160 fba1fbc068e111beb6ef3ecb91478575c1a447ba SHA1 9bf75df346b08b8770d59cc7774ef2ec85ed7541 SHA256 d1ac30764556272dd6819f77995d91233f76a51d2f2b30eec3650cab588d6611
+DIST thunderbird-10.0.4esr-ko.xpi 372016 RMD160 2c087f34750f4871acdcb4beb0f9b847ea012704 SHA1 0f5dcf1ae87b86ecbd75805f10b3485fee3b6594 SHA256 e07765842bce4bdd1a91290a0eebb325cf0915638fceafa878ce4718356d7a50
+DIST thunderbird-10.0.4esr-lt.xpi 531022 RMD160 210baaa7cb515ffdd53907367fd4d730154ed20a SHA1 7e9f0eff58ca6082f4cbff7db502fdd0ae3a89ee SHA256 bb62f856282eb161f6606f72f2d97ea86103b2a5594cd62d22beabc58fb767a5
+DIST thunderbird-10.0.4esr-nb-NO.xpi 407729 RMD160 e1ea5e5b6831e2f90aa28a7c6ce061c2eca64bde SHA1 782a24056f71cb1a7c2ff159a95dc60b0ab423cd SHA256 f9a63afb0403b6237f89ae78d5744feea4fe5d4f0a9757c0b72bcf51e4ef8a31
+DIST thunderbird-10.0.4esr-nl.xpi 407985 RMD160 b9970bfa000693014e222d3a33e860d17bdd3767 SHA1 22b7fcc0bdef34a0684a9a04503e6dc6421fd88d SHA256 80238734807ed1277eaec57bc9f3dbac363cbdbe228e6ee1321ae41571c2240f
+DIST thunderbird-10.0.4esr-nn-NO.xpi 409458 RMD160 d620bc917aaa89d8f1e28a48ae53c28fd43e070e SHA1 af23d5b78065961fea506a55aaedc4ba041611f2 SHA256 a4a0de4ba590381b011bf5c3827770e491ae315d8bd9b4ba2dd37b93f076bd42
+DIST thunderbird-10.0.4esr-pa-IN.xpi 450351 RMD160 d4da58bfeff921cf068a175d65a06c78908f3b38 SHA1 0ac496ad8f2436d69571f11094df8c891bf412a7 SHA256 304980ad3588c8e26839346be21901b1bf22de0a51278f8da868dc1ada82dc3d
+DIST thunderbird-10.0.4esr-pl.xpi 393578 RMD160 99de3859ff132d1cd3e368fdd70e3131f6191e0d SHA1 cc9d2cb22f51e069732cd6ff79e7add0341eb793 SHA256 9df0e7b399d74bcb0f6bebc51b7bbedbded306bf7d642a5db50950d5e4ea9343
+DIST thunderbird-10.0.4esr-pt-BR.xpi 417230 RMD160 4ec719dc0f8b5063ea4090f36730150f6f741ea1 SHA1 f8e8b418f38b441ddd2e37784b00eae526ea8a61 SHA256 849ad2774372a334b74c0f66686df15f107a57aaa1555c9416aa05d01f8a1534
+DIST thunderbird-10.0.4esr-pt-PT.xpi 414265 RMD160 34eceda6cb5bd9c09a5a9adf6e3832fbb6569201 SHA1 f7f65b71c07df5d5dbcb0c009f0f6b9bffb836ed SHA256 b8c87e130a4244037e35efc05f3f477b080b02f8217cd9b5bca281222a7cc045
+DIST thunderbird-10.0.4esr-rm.xpi 414709 RMD160 4f03bd3e221889fa46a622a8827300a1406cbabb SHA1 839458355ea6d884758d93df8aea5df5795dd0f8 SHA256 18aeb1ac642ed56a46357184d49d4c7732462303eaf9aeffdfe0bdaa19f7b7b8
+DIST thunderbird-10.0.4esr-ro.xpi 441292 RMD160 1c2ee1915725f51a078a8700ab6e0f17d4c54830 SHA1 607310f6ae597b10ffda8f2cd6ce2f752d7f32f2 SHA256 085135bbca76f5a49105e1198f5ac0da5739516c2b3d7d998e84bb6b554a3872
+DIST thunderbird-10.0.4esr-ru.xpi 411634 RMD160 31f8872215c2c7c0249ba4506a35e06c5f11a3c8 SHA1 9e32ed41ceb51d70fe7e9d30ab9d237303c1a7bf SHA256 6d5363913e283d25f4ba130f8f6c4f7f2be357470fc6b1ce981131b66503d93b
+DIST thunderbird-10.0.4esr-si.xpi 456607 RMD160 6c24c5e1c465e04d2ed7263671b1d1637618059e SHA1 1850757d92f57ddfecc3b13c956e377389eae872 SHA256 1f1c4c01af7a9f9af5a6f179c42a2f597e9adc795fd6f6ec12b9fc707a190b88
+DIST thunderbird-10.0.4esr-sk.xpi 425029 RMD160 99e3040fc91ca84dd3ce494f7207accd501c6a84 SHA1 8e27ac5043e6379ecc2105c739bdfc70955496d5 SHA256 42dad57a49f46be4815819f34c7c332badf778b2dc8112511788682fb10f8c76
+DIST thunderbird-10.0.4esr-sl.xpi 410431 RMD160 d8c14ae5cf73dda85fe1cb98c971275c05888107 SHA1 7077394a4db361e1434cabeef5f13cad5878ef1a SHA256 479616bb0137065948170a4ccb6ab1669747f83a0f1be649fa101d5289cb05ad
+DIST thunderbird-10.0.4esr-sq.xpi 360480 RMD160 f1eee9bc273fe2e27366c2516a0ae859d54efed2 SHA1 6e6870acd1fcb06f58234c8cb4d8eff6489c052d SHA256 e5ddc5d2d565f45a80f19dfa16912cf7c87b8b6f477f7c0ccb9f2ec11b37b663
+DIST thunderbird-10.0.4esr-sr.xpi 460237 RMD160 ded082c34e7cc96b04c857705f760d577b7e4c46 SHA1 565f111c9646bfb77d413fca2f70be781b602d33 SHA256 21f61d5f86ac2ba810534d900f6d310c50d87d3f73cf5522a8beaf028a0c5063
+DIST thunderbird-10.0.4esr-sv-SE.xpi 478281 RMD160 926540402a7a4ca6a8c46ef8b78346a7fef7a9a2 SHA1 f780496c260e14d5a3d8c671bf169bd54e90dec9 SHA256 7f8d6865d449e16d0702c8ae0a1a21f67dc98c500d47658620deabbc1114c05d
+DIST thunderbird-10.0.4esr-ta-LK.xpi 475763 RMD160 5ad85ad8a38e97a03b870f894bd283f481487786 SHA1 bdb422c86396339720d03027e1c4c47e3148988a SHA256 e34265695f5234c3d79368296ae8985f2af1524b08857f93ba35d2c968eaa79c
+DIST thunderbird-10.0.4esr-tr.xpi 418210 RMD160 4c612a4a2e2c57c012126598daf754aa72a831ff SHA1 1916e370a55468b7d90bee6783d690bb2f98e2fa SHA256 170dd5ee1974f11a618c82a677d615cf118bbd125e5c60dc4d7d4dfe38efb57c
+DIST thunderbird-10.0.4esr-uk.xpi 463925 RMD160 04d43b07fbbb05bee3b56908e3892e30285d3718 SHA1 6dff1ca2a8700ab14bda10612f7305e56f1f2dc2 SHA256 463aeb2a30d51b983b3a074cea3d5913011105b7f37eb0db38f43de81cbb5050
+DIST thunderbird-10.0.4esr-vi.xpi 435913 RMD160 84e10687b728e582fcdcb65791529ca3c1cd8646 SHA1 b350d7ae8ba196f3cbbf8e767134ce7e7f3043d4 SHA256 77f2a03d6c4c91f9b113e3b912df69265f2ca538e299b967bebd0c5b0292cf6a
+DIST thunderbird-10.0.4esr-zh-CN.xpi 431235 RMD160 f7a605f564ac8db210c09837814e52a017cac89a SHA1 43eca0afb5d649040cd5ecd4b051fb21cd6b4bea SHA256 cb3ca5e6e7f272bf40b3190969bed0b744a0d7dbee400468071e97552b656c86
+DIST thunderbird-10.0.4esr-zh-TW.xpi 431827 RMD160 d07835286c8b7e49c83f65e120555f297e46fc70 SHA1 2a442f0443441b0699e97af892ca15d7a119e1a0 SHA256 596081c0e046faa6056b8844fd42deadeaa6ba156efb25918b055d2b8b9e4fb7
 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
@@ -208,9 +260,11 @@ DIST thunderbird-12.0-zh-CN.xpi 431545 RMD160 f87d79c47373cd3af646d7008dddc247d8
 DIST thunderbird-12.0-zh-TW.xpi 432164 RMD160 188f114ed19e5abf3915e8d45b0e7b7f67457151 SHA1 cc0b8b2b920fe6f4ad898b1c3bc424fef436b285 SHA256 043e95b5380b40c8171c93919738fc0a270312268ceb5b0b5a7fc3c2a5f6d6da
 DIST thunderbird-bin_i686-10.0.2.tar.bz2 18549327 RMD160 81eccac4baf6344380360f450226ba1cc4c4d1fa SHA1 0e7cdf0e8b73029474ec6b0ce98a98997e42491d SHA256 06abdafed6e6a5f1bbb7de90ed7fb6498d9b2c0a4a9c1c84a6f326ea606f3d5a
 DIST thunderbird-bin_i686-10.0.3.tar.bz2 18549592 RMD160 9d411b1761db57f595e29e4a6b12320dddf41a26 SHA1 406255ae89cf60c462ea66c3285de5d2f6e5afb8 SHA256 6301c227be7ad5b767a0d29131fb0c45599f1020a0628162141262eccde9c3ed
+DIST thunderbird-bin_i686-10.0.4.tar.bz2 18525433 RMD160 14fd0b539b29971c58f6e5e2318b138c2c88cdc8 SHA1 99d17dfaa8730aae8b1448665f3ea04f337ada0c SHA256 2909502ae5ce80f0c945e0fb671e9180beeaa97f378563632a531a35f3644ba0
 DIST thunderbird-bin_i686-11.0.tar.bz2 18761612 RMD160 a1e5767f33d82b577b2556d7849154d26b07c51c SHA1 a926e70af1633f3ded54e9ebed3862f0a2d51bf9 SHA256 7251edac496ac0a456c92c97c57e4e235c19b5cbbb489f78eb0c60b194188f47
 DIST thunderbird-bin_i686-12.0.tar.bz2 19586247 RMD160 a9fe998c07798e80fc3e8b65f49ea03976f6be05 SHA1 cbbbb484e61f60a16116b69f8ab7c284ac6ad595 SHA256 674fad3ae34874f8833f7e623a589b0c6c0ebc7c8d372a9f7f3a85789c2e3432
 DIST thunderbird-bin_x86_64-10.0.2.tar.bz2 21461716 RMD160 fdaeea491e4d74d48d384fb98be2794e9dad6585 SHA1 d1661b63a2e6c4d774e004b823e4ed035b36ec11 SHA256 bf3fb051064bb66980e2e63b871f09cf12dcff99c0401b046dbbf03a0d0ea48a
 DIST thunderbird-bin_x86_64-10.0.3.tar.bz2 21406960 RMD160 5990edbd76d0aee01d729efb591fcf6b570bbd35 SHA1 50cbfc0cde73b694eb2974fde2f7d0595424b5da SHA256 8dd10a8f8e52e830d7b60b48364b5403516cd25b4e2f49154d508a78fc9129d7
+DIST thunderbird-bin_x86_64-10.0.4.tar.bz2 21416926 RMD160 a63dad7f2daf3705f9abf4a0279e8feba9a039fb SHA1 271e92ca8076b4dee3ccc02a078f634b581baba2 SHA256 7d2455387239c87ba95dc55b5c85cbf33cc9dd92c383836dce32270146e30f31
 DIST thunderbird-bin_x86_64-11.0.tar.bz2 21730134 RMD160 fc2ad5e0abbe5d53f6461899d37161af58c3d2f4 SHA1 0688e1b04d0f59f7115b270a453ccaef5c16daa0 SHA256 1924bdd7ee812cbd4d4587c020a083c23f7182c045489627f99baa5140801f06
 DIST thunderbird-bin_x86_64-12.0.tar.bz2 22674247 RMD160 3ed56bb5cd6d93ff50c5cbfc2c5fb627a2054937 SHA1 6a270c59278d9bd24923c6b06088c830329925dc SHA256 a9cc80e81b7617c79ef62e2104cbd0caa27935c72b70ab5612c0ef479214ef3b
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild
new file mode 100644
index 000000000000..695b415f3be5
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild
@@ -0,0 +1,111 @@
+# 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-10.0.4.ebuild,v 1.1 2012/04/27 02:55:26 jdhore Exp $
+
+EAPI="4"
+MOZ_ESR="1"
+
+# 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}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+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-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index fb620a2c115e..4dbf3d9c0614 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,120 +1,8 @@
-DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
-DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
-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.4.tar.xz 14044 RMD160 4ed929b42bc272606a67783ea31b4562fc4d939a SHA1 09ecb7c8c06064eb1c5416ccdc5483d472765f66 SHA256 ac2ce062aa23e9ad269b4a151bebbb2ce3affcd4df0002b6dd53f0ceb52f8eb2
-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-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
 DIST firefox-11.0-patches-0.4.tar.xz 16876 RMD160 2edf20116eee6c01153332cbcda2655860f53d9b SHA1 9a34c6e76b2590b1fa1791477b92cd054fa6bece SHA256 543cdba1fd9a75f41183b817b2fae44099bde52e503e34e130566d3ca51b3f49
-DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
-DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
-DIST firefox-9.0-patches-0.5.tar.xz 18580 RMD160 66870e2e194454cda309458d3793bfbe659d0598 SHA1 9f1f60e68330462e24eb81b27f2e3348689321ef SHA256 dc88f027f73bc6352da0dc873bc5ed63e72ea4d7db0aebfc44834f0b967ecd4f
-DIST thunderbird-10.0-ar.xpi 441461 RMD160 34ce98e7bc66d1bc0e5944d278e992b6d7618f91 SHA1 20705daadb85d32669430beefb188f1bf0bb025c SHA256 d965e230142815f65e428b95426321a6b2e87c9a543653c45c869d613414b4af
-DIST thunderbird-10.0-be.xpi 397803 RMD160 ef82ec8c8d0ce54daf534884848a646e900be46f SHA1 558f5f763d895d3b2583e7eac3fccd88fbc46ce1 SHA256 4fd62963d23d6cedb0862c34fa0fe899d2e8941e7c2593583fa494759489f017
-DIST thunderbird-10.0-bg.xpi 460809 RMD160 082ab98a11b5f39c7dc5ab771d3091d73b1d0c4d SHA1 5db17a275d1fa53eb0f4af976117820831d49b1b SHA256 202d5d66cfbc4c5d4289411ce54f8b533862f19bbfe0f0d144ab16b5cf33f66d
-DIST thunderbird-10.0-bn-BD.xpi 478142 RMD160 1ad08ff7c4481002befc98dea97d6a775d4ead34 SHA1 fdf5f3ac3c212bc46b4210ae1f1d8513af92aff7 SHA256 f35ee85b8b3ed9ad3a279edf4d07397f8bfe2956a2a3922bce019ab3952cf9a9
-DIST thunderbird-10.0-br.xpi 415521 RMD160 eb888a508ba29e4bd4291955e011334f85fca999 SHA1 251078ac1646287db69d4678878e9a593174234d SHA256 685f2c1076de8a406e334f63efbc7128b5bd4f0ac8a84e89c90adb20724b45df
-DIST thunderbird-10.0-ca.xpi 416065 RMD160 e9944ff4e803fba8f0a0998ee1cf9bc614c688c6 SHA1 8f47683fcea32cc43e0c9de3a746d6201062d937 SHA256 b5d4b1527d880a98eee496f288666d6acb377c048f7751ecf56971fd9d16aa26
-DIST thunderbird-10.0-cs.xpi 419414 RMD160 fa31290a22bb046f835c4122bd3a0fca376e80db SHA1 e57e3dd7d1b88aaf36269105875a4a5f7e297250 SHA256 5b88a78cfe8d00943934b2551a4b837505d42d708186ce50b9ffadcc00b311c3
-DIST thunderbird-10.0-da.xpi 363372 RMD160 c6bf6bf02fd6f3b695d7ac23760b7b9edbe81cd9 SHA1 cecb5dd3703342d218998685526524166866b5ec SHA256 b53b5ac944908742c4c18f17998e86c9132a695976c7d6573f8252294ebe9041
-DIST thunderbird-10.0-de.xpi 418261 RMD160 000866510e9abc643aeed5814cb9713e02577634 SHA1 417ac3abb32414aa2460ccd89847da54f4e9b4aa SHA256 de9b8fd05d2d63ac65891578a666407dbb54e3132e07bf77b5910cd0f616dbf2
-DIST thunderbird-10.0-el.xpi 404861 RMD160 01a46604fcc554edca65a1f009ced69f55e0f827 SHA1 da81b9517284dd5ce4357c54e96404931d06f549 SHA256 93a6a60e1d932dcb6484efd3caa66a4992f22cb9578840da9f8d7d6d19baf9e7
-DIST thunderbird-10.0-en-GB.xpi 391737 RMD160 90483211fec912efea3857588c1c87e329d32f42 SHA1 8c8d40858e43df2c930a12af8254a3dab4627166 SHA256 7194c04285e1f4a276d7f272e556206891874b1b796ff6935cd1502e1fb03666
-DIST thunderbird-10.0-es-AR.xpi 410721 RMD160 fbab7a15d516863bae4301bdff1f867ac0a6e116 SHA1 5b6946439b7c0a2806719cad852a99e243f4b85f SHA256 0b2b69db4f09e760c86d82a84a39a9354ae209a96f0b826b722d86092f0465d7
-DIST thunderbird-10.0-es-ES.xpi 355140 RMD160 79282b0802669f8ef5f439414d43283006994436 SHA1 914621799253d61c4c3a31cd768153fa853940a1 SHA256 4e7990a4120827bc72de38d7c22447b1039a23eb22986bd0c759ce69d400c2c6
-DIST thunderbird-10.0-et.xpi 410719 RMD160 88a91e50d00652377424029904f6542e91e2127f SHA1 6be8775d37b8b9ca7858b56c8ab6fbaf5ca1437b SHA256 b73ba85f2f0fb12ad97d4b5f31d0b3d357d275f7d04cd68b6cb03ce4b81035ce
-DIST thunderbird-10.0-eu.xpi 406382 RMD160 bbc8f99cf0101d2b7a44b4428591e2d4a87d1514 SHA1 a244ff4c4d68369ea9704a64a2efec1feb3413ae SHA256 96b38b2889cc2d306d0a4f64ab49cae5e43e801f03a776fe8a926dc1c40ffc8f
-DIST thunderbird-10.0-fi.xpi 411924 RMD160 e0f9368bd0561d0d9732a232abe5b835b92a87e6 SHA1 c2a86a813c6d5cbe8a4fc3257255168965995e76 SHA256 2eb19ced33447c1319f81ed75647f8e1c81023f217ddfd4884d1287d4e7e7ce1
-DIST thunderbird-10.0-fr.xpi 414744 RMD160 e1995b8bc243dd72c658fef1258755564f425091 SHA1 c10ef0c53410eea1722f752f38102b8ca839a41b SHA256 a063d76c1fa426547d5f0ee74050ad6b38dadc71934721a92252e818136ff9b5
-DIST thunderbird-10.0-fy-NL.xpi 413981 RMD160 cb755d96015a89f0b13ca51b86ebc844b4edd7c2 SHA1 ef1b057ca119363713483d82f545ee37e7292732 SHA256 9b71e110cc33c9ee7d3dec258da0b8d5de62f32777484e5d5a0a4e74b6b28cc7
-DIST thunderbird-10.0-ga-IE.xpi 423257 RMD160 59f0d059d9055d742d1112a2b8a121c9605d08cf SHA1 3710be3ebde397917ce35e946b0dbad13bd207b5 SHA256 1a9fdd20d93c50443caaf07075b86512f81c10b61e257c94bea8a57e38444d96
-DIST thunderbird-10.0-gd.xpi 425870 RMD160 5ac3b9ecda3e0ec72a8995707f7376c311aee028 SHA1 53efead7e75ab49fcd87f70e9754cad0a7dad498 SHA256 ad7e53dfc3623333e5353eb9cc573960db7f807768ed869dec410dca43ba5968
-DIST thunderbird-10.0-gl.xpi 409224 RMD160 c062f99c5002eefdb54c3d34e984c77a13d40044 SHA1 aa0445abe0f05b05b69a052b3928c28a45afaf31 SHA256 3493e1ddaf357835e605b1dcd390f23e369f0cde8d9fc55717ec5c0a7a16047b
-DIST thunderbird-10.0-he.xpi 439201 RMD160 38b2f30e014102d875956c608f386b60de42ebe5 SHA1 1419320387230e320d4ca248d072676e032ab022 SHA256 acf1312847252700c9b9eb7243b06a7adc45b83ac7938abdcbd51c1c4d91715d
-DIST thunderbird-10.0-hu.xpi 426353 RMD160 23028acf0ddf226f3897a91bd5f95e792a710e48 SHA1 d76c343fecc82aa717f9480594dd7ea3f5b74206 SHA256 51278d3b90acc20dcd3945bf61c31889dc230d1a4d4abac42c3676124bde64d6
-DIST thunderbird-10.0-id.xpi 400406 RMD160 01b7c2d396bb662340cd9d7036780bfb66aaf6e4 SHA1 c0e0c45b4bd43c83cba100055584e5fe83524650 SHA256 77540bf459261f7776ebe6211b5a068f7444bc7d139f57808222429a819081ec
-DIST thunderbird-10.0-is.xpi 412630 RMD160 bdc94ad0c25e72a67ee7ef72457c5157344fcc3e SHA1 9ce7db01c8983e5e5c70b013de797c1cac1ee0ae SHA256 8830ca8ad49eed3c49c2dc40a5ab1d0abd52e101ed7095620eb2474615f2841b
-DIST thunderbird-10.0-it.xpi 347630 RMD160 504d33c7c4ed426ffec523ab85288eb976e50c45 SHA1 1f5abab8edd5bfbdb48956282f9cc8ce9d74dd8f SHA256 236a5058be5576a5dca107c3171f0210ab7223e9660ca458bc3d8cbee531dc2c
-DIST thunderbird-10.0-ja.xpi 459024 RMD160 2c6936b69c9bce03265d43362dbed7f4179f62b9 SHA1 104e44903d09fea0bea00de5f4e378d79a7c266b SHA256 5988ff3b2efb60cbccbd4fccf20012a09b5456d2b889ce0af94b5b38c07c4847
-DIST thunderbird-10.0-ko.xpi 372008 RMD160 50a40d8e868ba3e923b8d26acee35495e387ba5f SHA1 6088784fd7223acef4f9815d6eedadb3157c329c SHA256 768ca187a5c5c761042d730a21d970ac5754714e35b7a303de9bd910fdf18977
-DIST thunderbird-10.0-lt.xpi 531017 RMD160 ac6e487d7178cbc02dd4a96a7cfeebfd5463efac SHA1 e141c58b95c523f44ead88f31f8daef9757a05e7 SHA256 fc4f13c160938b9096bc056309427f5fc28f73a46f7b38cfc31ea13efbe9baac
-DIST thunderbird-10.0-nb-NO.xpi 407725 RMD160 9f70537f3ef78127ae0d33a5fbc46c8f0a484c7b SHA1 e9f65c0d06d7e60993b475f621f16ee83636f138 SHA256 5f06d7c76164a68d6bd585ad4e3e7697d5544ba4ebfd853750cbbeefe3f6b210
-DIST thunderbird-10.0-nl.xpi 407980 RMD160 eee248065d890e07a4df432aca6cd5dceeedd0c3 SHA1 a65bc7a3ee95db7297813a45224478aa8ea11e48 SHA256 174da7a5266136f760146bd174a3b80a77391ceaffd58bf535a5f889c2f64203
-DIST thunderbird-10.0-nn-NO.xpi 409453 RMD160 0793d0251ccb9a03ec4334fe6a867372e4bb6c22 SHA1 aca7836e7803cf9223effe33f472bda13f5c2a77 SHA256 5f81175b9efb89d407f2e3bb2d38979ed27dd4a24204c94917fe42477cfc8396
-DIST thunderbird-10.0-pa-IN.xpi 450325 RMD160 4543b2fc814a5e141452e9cf61bd34a84151ac56 SHA1 5e0a5e652f42407023a6ebf5d11fee6596179cac SHA256 17560aaebb46159bab621a7dcc7ce89badc2c165179b1108355cf0ab9b60ae23
 DIST thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256 22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
-DIST thunderbird-10.0-pl.xpi 393573 RMD160 142a0ef77141bc45f6531479a656008a78ca560e SHA1 0fcb52a2469d5c2eba2e76cf995e9bc69d8597b2 SHA256 3b48e8d7754432d62fbb78431f2942d4d1e6e7526408b85189ad2b4fd9a351b2
-DIST thunderbird-10.0-pt-BR.xpi 417225 RMD160 83530dcd964749958ee1f8c3b66dcbdb9c09eaf3 SHA1 7276d2a9ec975967d256398f2729fd68aa6de410 SHA256 b830c3d90e5ebe66f4406980694d92aba2d4baf55321288606db08fee04d5815
-DIST thunderbird-10.0-pt-PT.xpi 414260 RMD160 3f6116db38a427a3c01c6dc0856e04e80baca034 SHA1 c69178969df51df557bcbcd74c83fb369b5aea9a SHA256 aa68c3740b948b7e7ac63e5906005e492db97e064725f5a35a9b4ebc35a61f19
-DIST thunderbird-10.0-rm.xpi 414703 RMD160 34d4bd84733bc7beb753bddc6dc2ebc493abfa39 SHA1 8218118e385d6e236746a08a627dc109f0af19c1 SHA256 01619fa3fe7ee96931fb144c20d540a8f5e40e174ad19dfb5a354a5f5ada4bb8
-DIST thunderbird-10.0-ro.xpi 441290 RMD160 8b9aa6bc04aa080f54a5178dec6a6c2de3467421 SHA1 0db5967f2b066090fc6705d844a73647a828eb15 SHA256 42c39d3cc41dee7a9f52943c5f684e10eacaccdb620a1bcd2cb18adcea7c0493
-DIST thunderbird-10.0-ru.xpi 411629 RMD160 2d3103903eeefad9bca61493b52a2e1dfa088091 SHA1 e0b1e100583a3c34d5e9df803ca7f0c5ac680778 SHA256 ff9a64f5137bbcfc4dd688a0df0f42693914b5b6717ecceb2d75680ace935c02
-DIST thunderbird-10.0-si.xpi 456603 RMD160 9008eaeff7c6206fbbeda33b5fe06ce5262a23b2 SHA1 30ece138ce4a6741b757c16ed56de61739cdbd51 SHA256 6ca8604c179ee51fb3d96ff54dea302b09242d57c3fd3c89e22903cb83e53ebf
-DIST thunderbird-10.0-sk.xpi 425025 RMD160 e6875f826ca43b7a630095703a9a6fb5d82085d8 SHA1 8c4d68146094f549bbd14d3adf608d4b14b5bf6c SHA256 245a01e3d8cc97ec4ef1bb5c0604bbdc41ffee4ee1f95eadfc8408a6c728fd85
-DIST thunderbird-10.0-sl.xpi 410427 RMD160 24aa7e2a50ffd15e8ae1f7ac4bdf407aab54384e SHA1 173f9a7f48e63b186799b11e82e28da8486a6523 SHA256 082d923807e4057990d4f4358d09bc8378a9e96ae2b316e618e8a48170f2b56f
-DIST thunderbird-10.0-sq.xpi 360474 RMD160 2523025391558bd4db83f6df00e3b5d7e42d4100 SHA1 9649281314470648da41274b90d5a2249e8df97a SHA256 6c6856b5abae07ebde28ad203f1f6021883762556b4b7ca5943cc3076da3fe3c
-DIST thunderbird-10.0-sv-SE.xpi 478277 RMD160 95b9b9cdc26c692b0e2b24e2ba8f7d9fc57c10d4 SHA1 e18078114c1fe7c969800cc9c1fecd681cecff15 SHA256 04becec85d19adad59c3f4fff04935a364cbe76739053d9fdaeb7d1874bc4824
-DIST thunderbird-10.0-ta-LK.xpi 475714 RMD160 d39230b0721a297b148b057e1214d66acb1268d8 SHA1 25bfa6fcdd210caf07b9106172ad702655b4bc77 SHA256 d35ecb88e7563907854878f7685dec3f2cb66ef6fa94a1325c149e161ddc682c
-DIST thunderbird-10.0-tr.xpi 418205 RMD160 7aed1bc9107519b2a43d8e6017d24d2d82cdcf32 SHA1 692ca282be586f72d36f58fa060a3d3a4b93e662 SHA256 ea14dc15f8c0ca2ce9ade00a83d5c49b3a19f1e93617a95e81bb5f7df82bb98f
-DIST thunderbird-10.0-uk.xpi 463921 RMD160 c2811b0f776f3ca01cf168606a34a6852d6f2731 SHA1 ea85f9ef020579c4b32bd838afac5875ca120091 SHA256 3cd7f758b013d00dc5ec0fd35f4a6e783cb0660f8706d08eefb63dd8e9f7e73e
-DIST thunderbird-10.0-vi.xpi 435881 RMD160 275174e2180dc3baf190f4ee3830a39bb8fc782d SHA1 51327aabf3cf22447fab60250564a0a6072cf7d6 SHA256 039921764369c2fb4a9a4f7354c48d83d45895072b1ad277540018195728cb62
-DIST thunderbird-10.0-zh-CN.xpi 431229 RMD160 ff491c003702b77587c9c29403219ad47c826a1f SHA1 738aa01aa27cbca24393663d3f1d450ec53ccfbd SHA256 5df54bf526d8fea967bd6996386dca73309fc880fc5d049c60c5ae2911fe80a5
-DIST thunderbird-10.0-zh-TW.xpi 431822 RMD160 bded27fe855ad1e4cf1d12486e1f7d51f8f1f7bd SHA1 df1171db0cd7265071eba70983ad95fdb18cd375 SHA256 fa9011c615d20cf8337e9fbd0dbfd5ee668cbf76d8f797d353b3c5cde8d9d032
-DIST thunderbird-10.0.1-ar.xpi 441462 RMD160 787c6e7bc6414ecc0e2b99c4a100d3d696637859 SHA1 aef31086c360ec247bc38baf4fc6554ef50f03f9 SHA256 52e83e6ae0cfd484fe5adc1ec02221bb9ab2bce307a0340dd1306706f06dee45
-DIST thunderbird-10.0.1-ast.xpi 362706 RMD160 ab1b8a6f64441221c9ba27c56fb5214f56ced05f SHA1 5bf7400ad22e1249e549f14d1e85b0161c36de28 SHA256 29e51b26181ab5d1e50ba2a5d72727749579aa9706f673fead49442dbf7ec942
-DIST thunderbird-10.0.1-be.xpi 397804 RMD160 8dea1965b962e5843faaaeb5d659f412d52a2ea9 SHA1 25b2ca0968bb90609bc34ed55bbe1fcaae13e478 SHA256 089a192caf448bc56cba74404c750981d574b98f1715e8d5cd7aeecde163006b
-DIST thunderbird-10.0.1-bg.xpi 460810 RMD160 299d0f2cfc0614d8b34b53224796809285646d61 SHA1 98c1fa56b435ec8b8b6bd8e0e63fb9deae8e4ade SHA256 2880a5dad581d73d383b80f6556b23a5aeae35127febd3cfbb6c08193ddfb18d
-DIST thunderbird-10.0.1-bn-BD.xpi 478142 RMD160 94ab20d6bf00f2a63ec3def48a3939f5e7420cc1 SHA1 ac631ef185aecef96c7a5d72821887470ba63957 SHA256 d9d29a4b03f98dc231f517e5e2da165d9ac8cd8a88b5a2f203cda95c5e6ec09f
-DIST thunderbird-10.0.1-br.xpi 415523 RMD160 bf241e5b81df2aaff4f75a629dbfe194241dc727 SHA1 0b7722ad103db1869125f0c5f40794aa7bdff067 SHA256 229e54cb08c5db90e2f0a47a7e3e6b7268776c431ca766fd4e6a40d2272f04c4
-DIST thunderbird-10.0.1-ca.xpi 416065 RMD160 8dbf2028fd9f3a0935896164794f7e2014af2e42 SHA1 e061d836aafa5a5306002cdc975381e54636dc8c SHA256 3b0dfa530e8ea75726ce15d368730c950e0e65e890ea9a92e5755619e6b10b05
-DIST thunderbird-10.0.1-cs.xpi 419415 RMD160 96f868502b951b04b9539c4d0a8a70fd8fb89063 SHA1 6a324ff5f18c9a33ce5435b7c0e3687f1fa7af55 SHA256 112ffeb5b9097b49161bffb034e7921e68e61900426f335b306ca6bbe6a3aa24
-DIST thunderbird-10.0.1-da.xpi 363372 RMD160 f46ecba35c97359a21083b58c34e4dcfb3ac14f0 SHA1 81092e47f6c424aa9c1d8b1e2b3f4c98d75db955 SHA256 50b8a07c09d9a53d3ca3fb225a017875d7e9ce4665c68841ccde9039ae2566ac
-DIST thunderbird-10.0.1-de.xpi 418263 RMD160 51f65cf71fe4714000a477336b52fde26e4c63b3 SHA1 eebaad9b771a14959355cfb62cfed8ae37d1e364 SHA256 95c3e317ccc9392339c2066c391ea2c932d7fd4cec459d1a6fcb25113c5d0b7e
-DIST thunderbird-10.0.1-el.xpi 404863 RMD160 4d5394bc85bed49b2d9570e253c3825f4076c7e0 SHA1 92e365e49fa02471a763a451fb24d4e4f2f18412 SHA256 2e3db796a38027d360f0f07377588d8718bf2488784a7b34c03ddc239881582f
-DIST thunderbird-10.0.1-en-GB.xpi 391740 RMD160 9600c18163af3d71fb1f9e76d2b604e893d58504 SHA1 01cd4ff363353b11e9e374d892eca3582376abad SHA256 1cfb5ae44cba254ebf14b95e1a7fe5cebff712d4a70491cc1e6138f583fd37e2
-DIST thunderbird-10.0.1-es-AR.xpi 410722 RMD160 57fd58f5f924a264b65de3239bd62522bc48b2bc SHA1 3e215e643a2570fea9f33cd01289055901aa2725 SHA256 d25df175650de9bb78e905642e6df21dba8a4eb87d4a3df7538e0e76aa522c27
-DIST thunderbird-10.0.1-es-ES.xpi 355140 RMD160 b3ba7f82b2013a824f12ff6f4e4fb00ac0b13883 SHA1 90f6316cf4e9742c468d844f54e73f142a9bf626 SHA256 c74532da1c36c84ed13970258b96ea152be1afad34c71634d387255b390fe74b
-DIST thunderbird-10.0.1-et.xpi 410720 RMD160 21ff3fe7e438fcf345494754551cff4bd227fdf7 SHA1 4661adc80aa2583f7328ab9d28417bd89e2f1644 SHA256 d9f983777691fdd41ba20f78f007c2054369092cd521cda702ac16abeae3dc79
-DIST thunderbird-10.0.1-eu.xpi 406383 RMD160 e824a3a853a02aa582b00a63ea17232b736a6ca3 SHA1 d6b9e5e689b12cd88f6413d826595dacf5f0be07 SHA256 c0a661f0d9e2d2ad57895fd753483014114c2e146e669e0a4e3a8c5d5fa1834b
-DIST thunderbird-10.0.1-fi.xpi 411925 RMD160 e63b45b05322ac48be0f948987273ed220b90193 SHA1 f9db9f0465a40c0fe89ff5c1a6c8414891bfc048 SHA256 262e848236529280c85106f70e7893db3c3e615f5a887ee063e0ec42e070c312
-DIST thunderbird-10.0.1-fr.xpi 414745 RMD160 1eb466e556e127cc218824b6551884d60d0f8535 SHA1 7edca77fdda73e7ab2f3f6bcd90798df4cce34dc SHA256 6a8be9f0625ee3ac6d74419aea321584e729d5050243d95fe080bf43f925b91f
-DIST thunderbird-10.0.1-fy-NL.xpi 413982 RMD160 26d44edf027f14cdd3fa40b0d3ebec431fff1c66 SHA1 8a78f34bde85c5ce132775a5320457ede10529f6 SHA256 a99328ee00dd38c80fb13b4cd8712e3aa900993953437b1ae8ca298765e4d8ec
-DIST thunderbird-10.0.1-ga-IE.xpi 423258 RMD160 92ac6391f61c026a9be60740816d3433bea8bc8c SHA1 ab994e0e1232ddaa108c9b79af8a2252065d0bb3 SHA256 d5b83a5444eead5e8d35e27a71dbc95ff6a3806e6194a62ecb99e316217fdce7
-DIST thunderbird-10.0.1-gd.xpi 425872 RMD160 898351a636d3810dd8b0d144232c665bebf7eb7b SHA1 d973c4d3d0ee5370f5dc526cb68ffca1b82f2274 SHA256 30c2809994705360a2abc557058bfc898b7abea675d39bfa902239f0af6beb5b
-DIST thunderbird-10.0.1-gl.xpi 409226 RMD160 fc086f865469392079db4811f180d7dc25a1e302 SHA1 b6922cf540729f34f8010308f85e0557c1e06800 SHA256 be81c33f17dcdc2a07138dde956282b4d300ee86cc0b0f7303010013ea54806f
-DIST thunderbird-10.0.1-he.xpi 439203 RMD160 3f7828e08d64600ff4e07544bb44f8bf02a2b481 SHA1 9e1c5d59a18b4cd3c30db570998933e8a6bdaa74 SHA256 be69146ee26753ef992202b62f96f6d92921932aded71798e2b764797a914a6f
-DIST thunderbird-10.0.1-hu.xpi 426354 RMD160 a586a5b711c889be098c3d2f2086c62c6e3ff8ec SHA1 cb5caf4516f9acb7b0c99d2d7e7cfbda74991859 SHA256 8069649c87e7ae04b84d6f4c1d71501c6b358e91c1c52ce89d64b2ca7d524e63
-DIST thunderbird-10.0.1-id.xpi 400408 RMD160 b06930f927a6b617db10cdd38cb6ff46111de8e8 SHA1 3055631ffc64a057647fa27ad6082ced31e3ebc8 SHA256 8396a980d9d225a1f4f2b3c78176ce83c1aaf1b311ac676301c8b4ca3169f567
-DIST thunderbird-10.0.1-is.xpi 412631 RMD160 d5a780fb268f56e68eb9c120abb8dbe48c0b8563 SHA1 dea80d7b303b0cb59e2db64417b301a7fbf8ac53 SHA256 7d7759ca8cfb006d17f5d0bc144b84cf70be94560dbdeb64a6217c8bdb2cddfd
-DIST thunderbird-10.0.1-it.xpi 347630 RMD160 b73116e5e63095dbd71504ff3595f0218f1ed8ca SHA1 aaaecac96771cf93430d977c4223fc4e194b014e SHA256 c75c3752f61ba0d306a0be3622456a43bd5cb8016433c40b90e087f2efe1a7b4
-DIST thunderbird-10.0.1-ja.xpi 459027 RMD160 e219fc6611b7dd2cd939e0d743e28e8893ae5585 SHA1 38a4d642de010f53139a70decff18f641af54dac SHA256 96aebc23df527be5e4da311650fbcca02a9f79a82157bea745c296213ab475cd
-DIST thunderbird-10.0.1-ko.xpi 372010 RMD160 54aa55ae18a0e0ce470661477c810395a3569e29 SHA1 6effed69cb3345bfeabfee7a85b230f9f01026c7 SHA256 eb62f1e1e374df9bef9fa24d9328fe51c20f2a730dcdc3366a4579f0711b05fb
-DIST thunderbird-10.0.1-lt.xpi 531018 RMD160 890264836fe9a17bf540919872e8eebaca274a61 SHA1 dfdbc4de95fef5c27f81a19f4848d79b01151b76 SHA256 fb0ac784c5222c7cb04f526940cdf3468e3e4cfcfaa77ff2b1212850bb81c010
-DIST thunderbird-10.0.1-nb-NO.xpi 407726 RMD160 bbea820ceddd73f955760703ff9b50a07ed2272f SHA1 d3179e9ad3b3fa6cbca828a5422e5d725dccf25d SHA256 ef7e9d889f721367a97574b5bd549adc2544369a891a51404360bd409e922d79
-DIST thunderbird-10.0.1-nl.xpi 407982 RMD160 24a63c1b260782786b4abd830a6d5e16e0fc9063 SHA1 d91b6fb60945ab760509203745bac569e0341c81 SHA256 5cd34214b1209137b90f71afab25fdddf39bb8ed110f586c3e2d376b7548d7a7
-DIST thunderbird-10.0.1-nn-NO.xpi 409455 RMD160 5512055c0f930a137acb36b105da8286010e2390 SHA1 76251494a5c8d2031d38ed473523d132b1b0c9d3 SHA256 311e1e76987a052b358800a09e754e85cc4fccb5c8b0cdc0a11e0a9e126dec13
-DIST thunderbird-10.0.1-pa-IN.xpi 450327 RMD160 79e3d65c4370808357af9ce356a3f1b9bd7c36ef SHA1 2f0fa4a6ec035877d910d3ac43e9b27567409778 SHA256 0d2845e7304c92fe74b4987eef7e18400c932f104d5ce14b1d0e43093ca62bea
-DIST thunderbird-10.0.1-pl.xpi 393574 RMD160 944530cb5f508c7c8723b414037eded3d6b6a6d0 SHA1 1734856d7dc2197e679dd532b979e53afe4818af SHA256 7af024923545702718a73e9c154307420eb826224a86fbb3a8f8fcc7c0c2be48
-DIST thunderbird-10.0.1-pt-BR.xpi 417225 RMD160 95cd28551d22aced37340191d27c2fd25b433ba7 SHA1 acbaa0604c9661673dc6d8ba571f78505949e237 SHA256 779b6da2fd682694529efd396f3d9bd389dd0470b6aa5932ef1ebb83ca24ea3b
-DIST thunderbird-10.0.1-pt-PT.xpi 414262 RMD160 f45cc8eabdef1df3b7c65654c97a5e1f028ffb6a SHA1 9ef2b64d931b66cd532c6f622d70212d54be84c2 SHA256 0d5add48f54e7b80bbfad8d28fe177bb35a0b2d9d901d60cd4c43dea9863a433
-DIST thunderbird-10.0.1-rm.xpi 414704 RMD160 56e5e0fc6bcb3ffbf966c6cd123e70130b7950c4 SHA1 3b06d77ef11cef437a5ef23a12b0c87525386bd8 SHA256 76967b7b2c9b13148ad0ce98d72a21abbf44e7901f9f915f96bb19032644ada7
-DIST thunderbird-10.0.1-ro.xpi 441291 RMD160 856c99424471e17b7dbe5f18c3cabf0d9403f7d4 SHA1 49bdb4553c552c4ae8c9a49e2164cf2b6d01c240 SHA256 bc9dc4433a3b277033f5c41036eb34a37221e59424f383e2e009c9c4ab064b74
-DIST thunderbird-10.0.1-ru.xpi 411632 RMD160 1c64facd38f65f46df5b91d17de012e74cbfd2e5 SHA1 6c2bcae96ced83dd9743e4df4663d6ece2bc7f5c SHA256 981c1e9e0e09a4a5cfebc2fe74f8bbc28144041d87fc8dafbda8e3e26d83937d
-DIST thunderbird-10.0.1-si.xpi 456604 RMD160 d5cd20f9c6aec863aee42b5cdcd62343738d86b9 SHA1 d5956b1c0b5fce02374ab6d0d346d11e2c3c8ed7 SHA256 10ba8eb2afd7504473b238ba0be7d000da1df1739222473fbbf8bf4a4202d497
-DIST thunderbird-10.0.1-sk.xpi 425026 RMD160 dd81340bca872cbc0280522ccfb24216f8a93fea SHA1 a5c82c67e5be04a6b40d9e1588a98a180aa14f5f SHA256 8b5f6ba187dffda362ad15205ac41d3612fb8c04b2e87c5c4adcb3d038a29139
-DIST thunderbird-10.0.1-sl.xpi 410429 RMD160 29d3960bcfe275b675648d9d1ab80f854afc32cc SHA1 9c5ff1952f5fc1f483bad7713490c9f76fbaf11f SHA256 b52332ebd5df99d7cb0f00ac831635cbcd473da8119d03470dcaca731ea49b8d
-DIST thunderbird-10.0.1-sq.xpi 360476 RMD160 a179f0ec3f68cfb8ce79e9b05b4d225f1fb1f439 SHA1 149ee7e245f89c748bb6cb24bc1cf392541ced8d SHA256 1ad111d838982a813d290c3bd931f9a18f62c1c707a198ce8a988d844ef08e9b
-DIST thunderbird-10.0.1-sr.xpi 460273 RMD160 b2abb5efce09544518e3b8ece5d9cfe52b2b2be2 SHA1 27506f03fb991487cd0d6c450cf575b6fbd44dbe SHA256 2b4f4f414a7dcd0818016015cde39bea89523daa12a3e7c9dd8889ba12aa863f
-DIST thunderbird-10.0.1-sv-SE.xpi 478278 RMD160 79c6873b045c445c7af93d35b750cc57e566474f SHA1 9a7d9d150b1a5cc50e93c9ac2693e7c7118647f7 SHA256 5cde516a447a67167b5cec9b81e3f4027a4ea9c71d135687fd601a565a91c8e0
-DIST thunderbird-10.0.1-ta-LK.xpi 475715 RMD160 7ba27dbb6828cc159cdbbf71d664e68cf8c397ff SHA1 ea8d6045cbbba1ce98aba4b72fadaeab4c9fd6e7 SHA256 85b449854727c9336e17326b5f3d5ce9b7068d6c80a82d4784ca964c5910a95c
-DIST thunderbird-10.0.1-tr.xpi 418207 RMD160 f461462bd8891709cf650b947f0941352b8d0f41 SHA1 6d96e1a2e378c48a2ff7e88fe466095ff81ae58b SHA256 5528b68b5378a0ed5739fe704eb7d89ea5795ea20d5e10dc6206ceee5d6afef1
-DIST thunderbird-10.0.1-uk.xpi 463922 RMD160 07ab3bf11c593461d57fd8477ca3d18c75d91dd8 SHA1 c2e73961dc768ee4edfd064c1b8c033bd4a01fa8 SHA256 3cf52ee171825e8c84df250ad0a98dda61b84715f53c36ab6f06e5ea100bb8dc
-DIST thunderbird-10.0.1-vi.xpi 435883 RMD160 183cd49b6ba18682f6f791b80e3af6edd1d44a65 SHA1 9b4a1d13ad0869a5390f61efc77e393fd200b2eb SHA256 3f53b8ca0c6e3ce68fd67701fd7b9f112889370d067b3ecb808c36324de1ff1c
-DIST thunderbird-10.0.1-zh-CN.xpi 431232 RMD160 ad8d720b09f9e5bb17382fb97685e288dac61549 SHA1 b4f11e265badc289e8ae744630d2bd2275281d69 SHA256 bee5179bdfa1e4a4fe33c672b3ef739976a8e98f76d36ec4b0bc90ae9b0a9cfc
-DIST thunderbird-10.0.1-zh-TW.xpi 431824 RMD160 31082a472e9319a26b70db7b22a284873025d6e6 SHA1 acacd4d35f0fbf6f118635aa0e128429c63879a7 SHA256 dbb66409f91fae123ade2b64925705857e7b16042037e27c300af36ed33f9be8
-DIST thunderbird-10.0.1.source.tar.bz2 97758544 RMD160 5162a1ea33851b9edb96452ff318aec348ef9b98 SHA1 884b8a09d27c0bac62775a3d7524150e6e9ebca2 SHA256 1ccbbe31d848486ca16a5eb475eac8e384c1abd3ffd10241f423e14456662ccd
 DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
 DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
 DIST thunderbird-10.0.3esr-be.xpi 397804 RMD160 a8d3b420a96afc93213f242530e336f4b1b32f19 SHA1 964ded2493cf768eb693708dbcfec62470bf2b7e SHA256 45faed1033a3538ec7356e12e0b582b93aae781f30284e3200b3b0425e8cebc1
@@ -168,7 +56,59 @@ DIST thunderbird-10.0.3esr-vi.xpi 435882 RMD160 2ea48f13c119dc4bf7310f8008a4a5e7
 DIST thunderbird-10.0.3esr-zh-CN.xpi 431232 RMD160 6617c84511d2753dbe00cd56181f2c5dbeb55227 SHA1 372ffe54885713e80a0080145b66434a9ab38a70 SHA256 b7c0077f9188f862866a4b36b7f9aa1e19a0350b86e9196908404f0206e79854
 DIST thunderbird-10.0.3esr-zh-TW.xpi 431824 RMD160 5649ecb95f2233b743b8b9c41b3cafc06097da03 SHA1 cde708d712327858cc077fcc075942e7a3a1d074 SHA256 bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e
 DIST thunderbird-10.0.3esr.source.tar.bz2 97709099 RMD160 d04e24f4fd50b2aab923d25e44fa59b3dbef2404 SHA1 d348e4b630750685556811279f876ba885ba28b3 SHA256 297d8b5992007e2ba112a5796ca4468ea48ec2304930676ae173234035eff134
-DIST thunderbird-10.0.source.tar.bz2 97700962 RMD160 cd3acaf16e38fe4a1f04badedb50db1cdb51c29e SHA1 4765446295a20cc3b4d73a7bc244d19011136581 SHA256 ea5d3df1227f0c344224eeaf4b24c12391425b9746515e784875edd6863ebcfd
+DIST thunderbird-10.0.4esr-ar.xpi 441466 RMD160 3b2cbd1531c9452c363de27c59ac5c5d6bc277c6 SHA1 6d107362718a45c4ea31a37751971e9827c6546c SHA256 8295b8d86576eef51ca04983d9e36a833eca0708bc53c87329dbcccfefc4001e
+DIST thunderbird-10.0.4esr-ast.xpi 362710 RMD160 aaf36ca61f500d62d7996edb07054735a93fbc79 SHA1 4caab1d89958e58266b687bb46367344fa9af30f SHA256 71af64f9852a8c14764ee05d68e0a5aff472838534c17754a5fa58f9bd939360
+DIST thunderbird-10.0.4esr-be.xpi 397809 RMD160 0e8f4c848f02ca7aeff6e37d239422461720cb4e SHA1 183e97f44490cb64535ed6f6263de831621d2914 SHA256 939df3e46f77f280c1c65bc2e0c48aa567d9a87b326670149a8efd270d859123
+DIST thunderbird-10.0.4esr-bg.xpi 460814 RMD160 0dec7e58bad91c0f94e0e9d0d8f553753a2b2cc7 SHA1 3bed67fb8219ce3a7a15f8dc8b0ff8982d642844 SHA256 a00755d3741612b6148c98d0d183098afb9f56ca243c1f462d7a5de0e7b154a7
+DIST thunderbird-10.0.4esr-bn-BD.xpi 478175 RMD160 dfade6cf195b289da3f3ee802b6c87081b8cfbf8 SHA1 bbee3b66663381c0f60c5aa688f5f89758703658 SHA256 cb6d05bd174743cd9b9de7c1684805f79b69a10bbee67a08e0814057900fb790
+DIST thunderbird-10.0.4esr-br.xpi 415527 RMD160 43eb27a862eaa207481d59e383a8a39da8e5a604 SHA1 1c5651018552c4fd6da1a4926aed4ee7b48cdf0c SHA256 8832db8c596fba7c953c2a9cee12055a0d7fbd63005608c6952f3f702cca9a7a
+DIST thunderbird-10.0.4esr-ca.xpi 416069 RMD160 a54ccda47326a90b2455bd9d0bfc37401b7a0447 SHA1 e5705270cb988b22d72104b754e0ba01df8697f4 SHA256 983b6b38e19c15818960ddfdfd1322cbdf2916572946b99e81aabf3f0852db93
+DIST thunderbird-10.0.4esr-cs.xpi 419419 RMD160 3c53565c6bc7cd512697c52221f7d139cc8104fe SHA1 6cf1b64e79289c6e2c477c965729060c878759f3 SHA256 8b2abbfa1a4793a3aff0dee0a5b36b7ef39e68a5b8fb5027abf2600ede65dc04
+DIST thunderbird-10.0.4esr-da.xpi 363375 RMD160 e9f48fb975086a92249e842f47a61b71d85e47be SHA1 fb284c60f4dadac027cacf5f0c04f80e0f387ec9 SHA256 cc8c0c4c42ff6d9ffddbfc5770dae2348b222fcf18ed7aae56bfcb120819e801
+DIST thunderbird-10.0.4esr-de.xpi 418266 RMD160 6cbbbf421b1c56c326d67e0a948d41a54bb6cb26 SHA1 1a0d683004073b721514e47faeb390471b87dae4 SHA256 0a45766c6c905070b099b74bd753ec9c04eebb7fff3eadb1daa168a3e3347f7e
+DIST thunderbird-10.0.4esr-el.xpi 404866 RMD160 af8a8fbae0cefa50378713ed67952738ae8b249b SHA1 e51d079e8a80f757856f17d6ef6e8c5f9d12b22e SHA256 23a9a2efa37b9d724a39626f23d1b4769ce563755d73108ef80e1318517a464c
+DIST thunderbird-10.0.4esr-en-GB.xpi 391743 RMD160 e5f42613460393432b812f18cdb10b6efc8c2c73 SHA1 8fd91083de8049a3ce957c8737f59b3e2200665b SHA256 b7f55778acaa177bb8fd1f0436685acfb10f67ee641be59dc3e8065d52fadd29
+DIST thunderbird-10.0.4esr-es-AR.xpi 410726 RMD160 18c3aadaec289e766dafdf5d1130796589305a91 SHA1 fc6f6f3640dfc0662dbbd90daa5c7cf2e43f31be SHA256 ec4198e8deb477e5016a8b70eb0cc70c4d98c69ce4ddfa501357b7959c7ea065
+DIST thunderbird-10.0.4esr-es-ES.xpi 355142 RMD160 90b6970399af36fa240730e08349f7a498cfc399 SHA1 b1e75da8a3ee743086203dc4e552d48a2d55e804 SHA256 ae49dcc476f2e16b0332d1c66084bfc5c1a258467cfe9cedb659d1728df10955
+DIST thunderbird-10.0.4esr-et.xpi 410724 RMD160 dc5a07f09e43d52b75fe74fd8a303fa93adb065c SHA1 6ed634f50833b5edeebd89a29296989941082672 SHA256 da1fde032f6beff791a592ed46710c655546c4466d57dfb04770b0270665e4a6
+DIST thunderbird-10.0.4esr-eu.xpi 406387 RMD160 54645f0b3842fb5521bb1d46dd400670f807fac3 SHA1 0f24b7d27108b7cde3081af86879067d65016884 SHA256 c0ecbafbfb62843d7b76322bff5db3ba2d7bee50283e58d54ee8123b21f91915
+DIST thunderbird-10.0.4esr-fi.xpi 411928 RMD160 5bbb915fbbd741bdb915556c8a9785d665216e20 SHA1 eeeb5bed80c8c3b3407da7eb337ffb728d35ad1c SHA256 9c83968e1004cef9a03171aec4bf90ab197f71005bf17df91eaae20e7bce6515
+DIST thunderbird-10.0.4esr-fr.xpi 414749 RMD160 807996cd1300151dfb92cbbea19d9cf43d8be230 SHA1 fda6bd0d62bf53a6666e2c807d9b67b78dcb69eb SHA256 ac0aca1a0822581805d5bd9c241b54554f9cd682bf73d88c0c15261db4772731
+DIST thunderbird-10.0.4esr-fy-NL.xpi 413985 RMD160 22227e9a8a280cc14620a559627c1f47f7f050ad SHA1 e7f02e2871711eb68fc5e98d7fa71582d04cd9d9 SHA256 a733f624164348a5666db3a624c18899961a2ed913829c19d19964ad28cd72a1
+DIST thunderbird-10.0.4esr-ga-IE.xpi 423261 RMD160 9a73037f3852cb3e1556dc76b23e08606c8de5ed SHA1 4b53ab31be218c969d13999c9a28593ac3a873f7 SHA256 ab98d4b37b69a391aee9b16cd678b0bb0a07ba064d7f7f92913c1905abe0eda9
+DIST thunderbird-10.0.4esr-gd.xpi 425876 RMD160 d321640218e99980856c524d79caf07a519b699d SHA1 d94f47708b65d24fcd73e546df4e6655cc832b8f SHA256 dae3c6fa4290eabc84e3d8a7f0df4c194a72a44f2c631a0d6f42fe1b76f0ac3f
+DIST thunderbird-10.0.4esr-gl.xpi 409229 RMD160 8421039d4d0c52c51153d7e5cfce9ff6bdb6ae2e SHA1 7aa804673d824c924f7ecca43ec6248b3f14234a SHA256 2deb10fd529124e12fc3864df7af0f03b3dd57b63bf2e7853ee634c8dbb88d20
+DIST thunderbird-10.0.4esr-he.xpi 439206 RMD160 3714f296c2c3b6a945d20936a544c391016f3be3 SHA1 2c3d740a4dfb23c48efca9e236051a72d1ba0c63 SHA256 afe7c88bdb586d2357a7024393fc28c2d096db6a9a018a8908a9c986229b7ab8
+DIST thunderbird-10.0.4esr-hu.xpi 426356 RMD160 957679487438256ebf2b83455ca06a034c7443b6 SHA1 17b67543794f307eb580fef3426a1e217a761a90 SHA256 476a2513eddb6cee28ed750e5fc468cf314b2a631ae80b8bbd3fea76ed02fb92
+DIST thunderbird-10.0.4esr-id.xpi 400411 RMD160 3ff8690e0f100ac5062d1457746eb2468a864af7 SHA1 002a5131b9ea5c157ecfb90ca677c182b9cf56a2 SHA256 d0fe5f0adeb2e7a73708b3330e1586647f1753475a4ef927b1f65384a28e12cd
+DIST thunderbird-10.0.4esr-is.xpi 412634 RMD160 6c83dabfbd252f24564fa3e1e8e05e1f2ced7006 SHA1 b161564de1631820afaa3d98c218efa95f8fbe11 SHA256 e9a4f1f8c32dc3fbe772b16e47c01679de79d061264ce92e27b69f1cc6baddb0
+DIST thunderbird-10.0.4esr-it.xpi 347633 RMD160 bc1d4fcdcb94e75f1cf45b6015d8728f9ca9c96e SHA1 c79385ba176b457a1b712f622c1b2d0dbe557d66 SHA256 48224ad82f53616d75f2e8fb638d16ea35a4e39d5b7cdc2d6084c2bacb2e7b0b
+DIST thunderbird-10.0.4esr-ja.xpi 459031 RMD160 fba1fbc068e111beb6ef3ecb91478575c1a447ba SHA1 9bf75df346b08b8770d59cc7774ef2ec85ed7541 SHA256 d1ac30764556272dd6819f77995d91233f76a51d2f2b30eec3650cab588d6611
+DIST thunderbird-10.0.4esr-ko.xpi 372016 RMD160 2c087f34750f4871acdcb4beb0f9b847ea012704 SHA1 0f5dcf1ae87b86ecbd75805f10b3485fee3b6594 SHA256 e07765842bce4bdd1a91290a0eebb325cf0915638fceafa878ce4718356d7a50
+DIST thunderbird-10.0.4esr-lt.xpi 531022 RMD160 210baaa7cb515ffdd53907367fd4d730154ed20a SHA1 7e9f0eff58ca6082f4cbff7db502fdd0ae3a89ee SHA256 bb62f856282eb161f6606f72f2d97ea86103b2a5594cd62d22beabc58fb767a5
+DIST thunderbird-10.0.4esr-nb-NO.xpi 407729 RMD160 e1ea5e5b6831e2f90aa28a7c6ce061c2eca64bde SHA1 782a24056f71cb1a7c2ff159a95dc60b0ab423cd SHA256 f9a63afb0403b6237f89ae78d5744feea4fe5d4f0a9757c0b72bcf51e4ef8a31
+DIST thunderbird-10.0.4esr-nl.xpi 407985 RMD160 b9970bfa000693014e222d3a33e860d17bdd3767 SHA1 22b7fcc0bdef34a0684a9a04503e6dc6421fd88d SHA256 80238734807ed1277eaec57bc9f3dbac363cbdbe228e6ee1321ae41571c2240f
+DIST thunderbird-10.0.4esr-nn-NO.xpi 409458 RMD160 d620bc917aaa89d8f1e28a48ae53c28fd43e070e SHA1 af23d5b78065961fea506a55aaedc4ba041611f2 SHA256 a4a0de4ba590381b011bf5c3827770e491ae315d8bd9b4ba2dd37b93f076bd42
+DIST thunderbird-10.0.4esr-pa-IN.xpi 450351 RMD160 d4da58bfeff921cf068a175d65a06c78908f3b38 SHA1 0ac496ad8f2436d69571f11094df8c891bf412a7 SHA256 304980ad3588c8e26839346be21901b1bf22de0a51278f8da868dc1ada82dc3d
+DIST thunderbird-10.0.4esr-pl.xpi 393578 RMD160 99de3859ff132d1cd3e368fdd70e3131f6191e0d SHA1 cc9d2cb22f51e069732cd6ff79e7add0341eb793 SHA256 9df0e7b399d74bcb0f6bebc51b7bbedbded306bf7d642a5db50950d5e4ea9343
+DIST thunderbird-10.0.4esr-pt-BR.xpi 417230 RMD160 4ec719dc0f8b5063ea4090f36730150f6f741ea1 SHA1 f8e8b418f38b441ddd2e37784b00eae526ea8a61 SHA256 849ad2774372a334b74c0f66686df15f107a57aaa1555c9416aa05d01f8a1534
+DIST thunderbird-10.0.4esr-pt-PT.xpi 414265 RMD160 34eceda6cb5bd9c09a5a9adf6e3832fbb6569201 SHA1 f7f65b71c07df5d5dbcb0c009f0f6b9bffb836ed SHA256 b8c87e130a4244037e35efc05f3f477b080b02f8217cd9b5bca281222a7cc045
+DIST thunderbird-10.0.4esr-rm.xpi 414709 RMD160 4f03bd3e221889fa46a622a8827300a1406cbabb SHA1 839458355ea6d884758d93df8aea5df5795dd0f8 SHA256 18aeb1ac642ed56a46357184d49d4c7732462303eaf9aeffdfe0bdaa19f7b7b8
+DIST thunderbird-10.0.4esr-ro.xpi 441292 RMD160 1c2ee1915725f51a078a8700ab6e0f17d4c54830 SHA1 607310f6ae597b10ffda8f2cd6ce2f752d7f32f2 SHA256 085135bbca76f5a49105e1198f5ac0da5739516c2b3d7d998e84bb6b554a3872
+DIST thunderbird-10.0.4esr-ru.xpi 411634 RMD160 31f8872215c2c7c0249ba4506a35e06c5f11a3c8 SHA1 9e32ed41ceb51d70fe7e9d30ab9d237303c1a7bf SHA256 6d5363913e283d25f4ba130f8f6c4f7f2be357470fc6b1ce981131b66503d93b
+DIST thunderbird-10.0.4esr-si.xpi 456607 RMD160 6c24c5e1c465e04d2ed7263671b1d1637618059e SHA1 1850757d92f57ddfecc3b13c956e377389eae872 SHA256 1f1c4c01af7a9f9af5a6f179c42a2f597e9adc795fd6f6ec12b9fc707a190b88
+DIST thunderbird-10.0.4esr-sk.xpi 425029 RMD160 99e3040fc91ca84dd3ce494f7207accd501c6a84 SHA1 8e27ac5043e6379ecc2105c739bdfc70955496d5 SHA256 42dad57a49f46be4815819f34c7c332badf778b2dc8112511788682fb10f8c76
+DIST thunderbird-10.0.4esr-sl.xpi 410431 RMD160 d8c14ae5cf73dda85fe1cb98c971275c05888107 SHA1 7077394a4db361e1434cabeef5f13cad5878ef1a SHA256 479616bb0137065948170a4ccb6ab1669747f83a0f1be649fa101d5289cb05ad
+DIST thunderbird-10.0.4esr-sq.xpi 360480 RMD160 f1eee9bc273fe2e27366c2516a0ae859d54efed2 SHA1 6e6870acd1fcb06f58234c8cb4d8eff6489c052d SHA256 e5ddc5d2d565f45a80f19dfa16912cf7c87b8b6f477f7c0ccb9f2ec11b37b663
+DIST thunderbird-10.0.4esr-sr.xpi 460237 RMD160 ded082c34e7cc96b04c857705f760d577b7e4c46 SHA1 565f111c9646bfb77d413fca2f70be781b602d33 SHA256 21f61d5f86ac2ba810534d900f6d310c50d87d3f73cf5522a8beaf028a0c5063
+DIST thunderbird-10.0.4esr-sv-SE.xpi 478281 RMD160 926540402a7a4ca6a8c46ef8b78346a7fef7a9a2 SHA1 f780496c260e14d5a3d8c671bf169bd54e90dec9 SHA256 7f8d6865d449e16d0702c8ae0a1a21f67dc98c500d47658620deabbc1114c05d
+DIST thunderbird-10.0.4esr-ta-LK.xpi 475763 RMD160 5ad85ad8a38e97a03b870f894bd283f481487786 SHA1 bdb422c86396339720d03027e1c4c47e3148988a SHA256 e34265695f5234c3d79368296ae8985f2af1524b08857f93ba35d2c968eaa79c
+DIST thunderbird-10.0.4esr-tr.xpi 418210 RMD160 4c612a4a2e2c57c012126598daf754aa72a831ff SHA1 1916e370a55468b7d90bee6783d690bb2f98e2fa SHA256 170dd5ee1974f11a618c82a677d615cf118bbd125e5c60dc4d7d4dfe38efb57c
+DIST thunderbird-10.0.4esr-uk.xpi 463925 RMD160 04d43b07fbbb05bee3b56908e3892e30285d3718 SHA1 6dff1ca2a8700ab14bda10612f7305e56f1f2dc2 SHA256 463aeb2a30d51b983b3a074cea3d5913011105b7f37eb0db38f43de81cbb5050
+DIST thunderbird-10.0.4esr-vi.xpi 435913 RMD160 84e10687b728e582fcdcb65791529ca3c1cd8646 SHA1 b350d7ae8ba196f3cbbf8e767134ce7e7f3043d4 SHA256 77f2a03d6c4c91f9b113e3b912df69265f2ca538e299b967bebd0c5b0292cf6a
+DIST thunderbird-10.0.4esr-zh-CN.xpi 431235 RMD160 f7a605f564ac8db210c09837814e52a017cac89a SHA1 43eca0afb5d649040cd5ecd4b051fb21cd6b4bea SHA256 cb3ca5e6e7f272bf40b3190969bed0b744a0d7dbee400468071e97552b656c86
+DIST thunderbird-10.0.4esr-zh-TW.xpi 431827 RMD160 d07835286c8b7e49c83f65e120555f297e46fc70 SHA1 2a442f0443441b0699e97af892ca15d7a119e1a0 SHA256 596081c0e046faa6056b8844fd42deadeaa6ba156efb25918b055d2b8b9e4fb7
+DIST thunderbird-10.0.4esr.source.tar.bz2 98131707 RMD160 292a99a23041a924dd15ab5fd62dced33f581012 SHA1 058392812a59c41ce50f2e3196954aa75bf42bf1 SHA256 f3657ece13c72646cdead2969deee1c16f152c08c90d350070301182ec8c1c4b
 DIST thunderbird-11.0.1-ar.xpi 441218 RMD160 f77ff1e73f0f456aa050c9563201402b18e8a038 SHA1 0506b2dff875048032ad461de303042a549b27af SHA256 dc33c48ea71c4ed3e182f995804f2097933966aa894f38b09b3c81e6309045a2
 DIST thunderbird-11.0.1-ast.xpi 362425 RMD160 1a2b98f46891b2e604cf48f97d1bcd41c62373ed SHA1 e1ae3c16444568c78d67935135f923d39ffbfde3 SHA256 ad63f262e70baf89f498b5404047c239da415dd0fce286642c88feb9dc459139
 DIST thunderbird-11.0.1-be.xpi 397780 RMD160 bd7069eb18e6536634c96bc8351d5879d4eb0f2d SHA1 4d42ed0280f14ee32f031859caed1d7f671218ab SHA256 87728d9d25719e8b299d9d85763c8fcb4fc75f6b569872a60b0ed12613c825e3
@@ -269,52 +209,6 @@ DIST thunderbird-3.1.12-uk.xpi 244865 RMD160 529b11665f6f52cfa12efaf1a3e6ad05475
 DIST thunderbird-3.1.12-zh-CN.xpi 219647 RMD160 159cf73f955c0fd8df394104271622f2ac26af88 SHA1 d1e56854ae9b83e29183d4c897b8c56cde09bd0e SHA256 6293366577bf2893e09768c81167fa5cdd42a8fff15c44b1f6c16e652f2a5591
 DIST thunderbird-3.1.12-zh-TW.xpi 220634 RMD160 fa25c1d5c1c4c7b1366099c7ae0b07df3b4e4f40 SHA1 2f1a228c7c60f4e9b0bd9c4964661b92053882cc SHA256 b63fb7b26cf7f91d53b6acaa0d9c47b7739afce1cdba82ddee2cfee6b0b70657
 DIST thunderbird-3.1.12.source.tar.bz2 69096988 RMD160 1a45492e9003e0e310bfce155a747a68bfdfe4b7 SHA1 b2fbc9b95c4b43bd2f79a3232f556108471a4df3 SHA256 ae020f6cebf81541e08642f371484c2ae6edbd7db1b70fe51f1e2cb462d48089
-DIST thunderbird-3.1.13-af.xpi 210553 RMD160 b7550a3da0ebea163e377ba151a462f2b8fbcf23 SHA1 6341987218fa40e8ddeb545026a218d8aa568f7b SHA256 5a752b9f11480a1325ed7faf417ba0b6b7d702a3781b90f4732dd0e51e635c66
-DIST thunderbird-3.1.13-ar.xpi 230390 RMD160 17360b77dc6773053b979375c5502f24db8edfc1 SHA1 03cd7bf23c75bdd483dc8db0a59b42d3a1bdacda SHA256 29c4185c29967e726ef32b2b573ade5576d4a9ef502b7759d4dc0582b44d1661
-DIST thunderbird-3.1.13-be.xpi 194457 RMD160 a2422947acbb373329cb070adec7dea02579a5b4 SHA1 a4852bdd926c0afd48d05e596d6b5f2432c686e6 SHA256 456e78cc9b711d5fc388f61041f219629e203dd02548f4068f0f8fe8c944a3a2
-DIST thunderbird-3.1.13-bg.xpi 235126 RMD160 9c3a21563d4fe8fd49ce91f6be4965168a5c6e5e SHA1 44f324ea23fd1c7d5792982a71e5b04794c5f2e7 SHA256 c7b324e9b0f803b6975b3c50b2fe444d865f7400a15a527dbfcc0b8a48aba4cb
-DIST thunderbird-3.1.13-bn-BD.xpi 244757 RMD160 3ba67a0a2ab8b078338671e3b5bf909b42b091ff SHA1 09c765e3014132dd68cbcc390376e934e67fd712 SHA256 e7f1a4f4eecf7eb6f8231a63460e09d529ffdf63de3de3e4f5215882635413f2
-DIST thunderbird-3.1.13-ca.xpi 219309 RMD160 971320e3bc9f87a482fe54ccc82fd0ca40aad2e2 SHA1 dbb84a99de2d9db68201bb690018820de921736e SHA256 6e81784f9da9bc0ce5d630686165b668a4d691f28997f54171f9afe3e88d54bf
-DIST thunderbird-3.1.13-cs.xpi 218184 RMD160 549aef12273c18c26e68a2415d82fcbbdb81fccb SHA1 0c3da449a16664fb5262350e18ed1e192e0da9b3 SHA256 5e4349070ace3e66cb73cbc292ed2db47fd62191977a8fa393e333b3f26e966d
-DIST thunderbird-3.1.13-da.xpi 203204 RMD160 18c65e12699c735175243736531cfda31e9d4e1e SHA1 911e59f9197286de018362cb77307a2d58c095d1 SHA256 af3dc6c8f65e9f3c8ba5858363059495a749fc51fb16a9368ef8cdcfb4542084
-DIST thunderbird-3.1.13-de.xpi 222842 RMD160 80983bad603cf34262ee380159fcef2ba04e8965 SHA1 30346b0005b2d0ee538f15f988183b1f9404f458 SHA256 4dbe43c671e6e0f81ddf87c701469e6e3142d7320b43bf3dd09c4f923b16e319
-DIST thunderbird-3.1.13-el.xpi 210069 RMD160 d4000473cd744a06434d76b522810b0fb7a154f3 SHA1 aa965839536128de6d49cbdfe0fb50e3f4b4e132 SHA256 7ea9f41013ff7d3491fe80016ce399b6cbbb58d109bac21ee38da428c2083392
-DIST thunderbird-3.1.13-en-GB.xpi 203672 RMD160 3999685b87c11b94af754f9b93ad0dc3ed5ae33a SHA1 4bdcbb57a06749f9c5c4a6d66aad4d0a9e8acab7 SHA256 353eaf6f1c677fc0ff1aee0126abd9bd046927c538b9ffc15bd5d81eccc11818
-DIST thunderbird-3.1.13-es-AR.xpi 218634 RMD160 8f4b6e44d010d181d201f1a14b92ca999c4ecb20 SHA1 275a9e3053862501b0140927df92830666a3bc71 SHA256 fab0c3b7ccacd26cb49f43806c6bbf7c8074d3417ac0e0b838ece6fc471e87cf
-DIST thunderbird-3.1.13-es-ES.xpi 172932 RMD160 651fec494e51a2f8886449781bb1efdc49859e8e SHA1 56ff3d02919649b3cf4b83f133168880fa480183 SHA256 32ca31049191bfd857af9c4852e79eab48e7393644e4ff828ba0b8721d32bcfb
-DIST thunderbird-3.1.13-et.xpi 221780 RMD160 5597450f4807a993fb4f7574abf03be57e0378bd SHA1 d03ff949b063c0ad9600cd587e49f27713cabd76 SHA256 b3b39b7b906c0fb7060074ee1c20d62ce33f3eb474c8296828206b002f7ef288
-DIST thunderbird-3.1.13-eu.xpi 211335 RMD160 92a2d9c1b73f6f955d01cf13fdcd0d70e9ab3643 SHA1 38a8683b439313acea121d8130ba891a0f578dbd SHA256 a842b085e59a0e75cabeabcd5fc013f4ee1957c6fae743d6e3013f9fd1985753
-DIST thunderbird-3.1.13-fi.xpi 219471 RMD160 7830775fcd903d6bfacf4c86ee38ff0847215559 SHA1 57b8a649e319f6802b7ff5e3ea948b1d939891c7 SHA256 6d8bbdd1f5598ce442392d12f30ada57373f0ada760d4582a13573d66c55aeb1
-DIST thunderbird-3.1.13-fr.xpi 221785 RMD160 43091a5dfb5630b28c6a3736db9ff6e7bfeb4998 SHA1 dc594e678940c68b85da49039774455554f32e64 SHA256 94e13498163e937ccd95543e951fe08f83103f8f7d984a2282234748e4cb5493
-DIST thunderbird-3.1.13-fy-NL.xpi 220819 RMD160 f0c68f45a2e8db84ae4a385d3c13364dea01011f SHA1 46ab28bbc552704b3901e184c2e614f9f85b96d8 SHA256 0d358fc3e3d3fadeeee38412e976b571a3ac4756de29eceedeec554065e27b9f
-DIST thunderbird-3.1.13-ga-IE.xpi 219523 RMD160 647d2bf47c3203720ee37255157192fd68cc1b4e SHA1 ac10833d1dbcfc8bf66362c7d7057f3a1c6bb51a SHA256 43b784ecf2bece9a1ca67b68bb6cc0bd9ac72cf428bb719ec1936a3338d295c7
-DIST thunderbird-3.1.13-he.xpi 204964 RMD160 715ee3e3f95949cc07b3af05d604dc0dfadc7a12 SHA1 aa50a560c72ba4a12269d1d73880596e5488d0e0 SHA256 6c5ee5cddd9f5c4f9123834b9b31b59cc1e801b5a0a5a5f5289ce418ef1976c5
-DIST thunderbird-3.1.13-hu.xpi 226093 RMD160 1939444beb15e54e07f7bf12f469a3f3ffc99553 SHA1 eea8ae2cb8ee6193a0751d1efb5f0df4d2e35d4f SHA256 590566b3b2a8b8123742e46311e2d10c8f84be0fddb9ef513ed89041ac35ea9c
-DIST thunderbird-3.1.13-id.xpi 185890 RMD160 b1e574c31e31e1ac0e40ec2ebc7fb1234178ef80 SHA1 ac005675957cd4e1cea28a00eb941ab9bc08abfd SHA256 d7a494a98a49ba4cbffff09ee99f0f7b913fb487628a55413095eba3509c2274
-DIST thunderbird-3.1.13-is.xpi 214064 RMD160 ea4757cb6b6e1d0b4ab876cb449bff47330b520b SHA1 8bc44a00a6969a86ea2d9ef7ad39136250356b61 SHA256 44ce91a05b8d9948eb430a8a5d2598ac6d10a630f9bc6804455cc4b7288eef07
-DIST thunderbird-3.1.13-it.xpi 171392 RMD160 1a4460417d8c42896f67894e939271d988b2ba9d SHA1 d68813428709a541748a835318acf0a3e1b502f6 SHA256 f2856ddb46f8cfc2ed1610d14604fd31434f24da20808f483f35bcc93e4ef579
-DIST thunderbird-3.1.13-ja.xpi 236637 RMD160 538589645e2768c03ded514352dab454c56feb1d SHA1 1c214ff7b337b77bf34fba8d2c58202dd74e1cec SHA256 d4a987a16248bd0e8ac226fae5da8bd811fd85878b99c83b7399cf7c7b8ff017
-DIST thunderbird-3.1.13-ko.xpi 194727 RMD160 9772bcbe907ac1c44febdd1e5a0e34c5bd437098 SHA1 fdee73e3a5048ac655e2eaf58d1d20e9dd07a474 SHA256 b5a350fb97594b2c7503913f563981a62136a23c7ec3312b1d98c7c7cc35620e
-DIST thunderbird-3.1.13-lt.xpi 235297 RMD160 b5ea141598502aec91ae99957da14dff0d2a8844 SHA1 bdbaacef2f563ccf5280c8b44db69a019774808f SHA256 0a3769460334f649006e173b052acfec90b66708d8aa3221c8717a734eb69757
-DIST thunderbird-3.1.13-nb-NO.xpi 213951 RMD160 5d6da78cbc4239b7e1753045170016970bf85080 SHA1 fd9ca886aec6818784490869ce788440e50809de SHA256 5524320b2fbcc422479d19667c25ffb1ef887a5000ca43fec00601f3685cfd98
-DIST thunderbird-3.1.13-nl.xpi 216579 RMD160 a4da2121ef6ab183944ef5666043061dec7fc787 SHA1 a271d361e9a5aa853a9dd7ab6f243fd8112c44a0 SHA256 f69f17e437570a22b3d7b3a591b12d6a6730dca3598feeec0c3d98a4408847c7
-DIST thunderbird-3.1.13-nn-NO.xpi 215703 RMD160 f5beee16e8214661c95a0ef69d9901adb64720ce SHA1 12012527ccfc1e48867bfd5e65fb430b1a614cf2 SHA256 d2857086d43aabc5f578d80d309c3ae38f82bd7f36d3844c2e794a2ba55e93bb
-DIST thunderbird-3.1.13-pa-IN.xpi 241103 RMD160 e0c8fdb429496fbb06c084588976628486ac1186 SHA1 6e6b3d0bd0a5a85560d68556d70a345edd6ab070 SHA256 d231e44926c41d4e67e3506d772730da45d7aaeb99d1d24d24a5b59fb0b254ea
-DIST thunderbird-3.1.13-pl.xpi 203924 RMD160 bac8e23e080a8c1193992ca727a28c87a0c06b34 SHA1 e81a84525d6c325a2a5d79fdd9be6cb4c2310216 SHA256 82df3b487d5b3c5b2aeb92e50b35e4afcfe9ba85dc6ffc06db31668dceebaf48
-DIST thunderbird-3.1.13-pt-BR.xpi 215072 RMD160 6076f5fbe6a55463febdcd80cbcb608374a8b6c5 SHA1 9995e4ae9511f3d5309d7e45fe8455c2cb86a617 SHA256 c9740f50621563c303ca0a23f03a1f6b59ca01b01cf8ffd58461b978799200b3
-DIST thunderbird-3.1.13-pt-PT.xpi 214283 RMD160 bf546baaa18f8f9393f9e73416a0f0aa705898ad SHA1 964f1ecf77043174839716c7ef0e635fc407675c SHA256 e9f7daeecbcc53d29199fd371554eddffdea6b20bf12070bc5023a057d1a08e1
-DIST thunderbird-3.1.13-ro.xpi 221193 RMD160 1782418c9d449477635d6bac0ad4b66eeb5c9059 SHA1 ff7b1e5ba8903cb52888995f7b9c9c78fc6bfa2b SHA256 3d4ad732c435a2d9929d026cd83ef8f862bb31cc07fc4e61a8b844065efea95e
-DIST thunderbird-3.1.13-ru.xpi 198284 RMD160 71bdd742a08d8bbb625676a25e5c13a284327552 SHA1 f5cd9818d7222a3b727cde1c29f4b41e38f52c8e SHA256 18286e8ad26cd1360c638f0903287b54b164ddc2de3cca5106250735d3fc8a70
-DIST thunderbird-3.1.13-si.xpi 246104 RMD160 004021d5d8f45748c4a0d4a910c163d3b2a35c56 SHA1 6ea1d32344db1f228916e37f7ff99f40fc2df0da SHA256 81eda2882b93d4eea9363e15889e538de816ab46ca35df776f6bb3d0ceb608ea
-DIST thunderbird-3.1.13-sk.xpi 224599 RMD160 02d13a17214851c3dd6f21c1cac3102b624c7787 SHA1 a1a31ce0bc9ec38f65c333ac8466d3bac605f898 SHA256 cfc5fe2b5a8a42f26932d2e4fcc506c76449fd23745c3611c1d1803edd0358d9
-DIST thunderbird-3.1.13-sl.xpi 218522 RMD160 3d0aeebde1e9503be063f0a255a70d42cfb83ee1 SHA1 f042b5cce84630747cff637d0e12c21ab84375f3 SHA256 312960b2c1e02cc03c2723c86bcd25dfc812a328869e4343aba236ae4ebfbfa3
-DIST thunderbird-3.1.13-sq.xpi 211249 RMD160 571635756e42bcbc7728f74383190b440abcd122 SHA1 bd4a2ffdb674cb29419a6281633689b192327bf6 SHA256 b64b84ec10d62e77a39237d8ac7755338e87ca27f9ee658e45ad80f8c91156e3
-DIST thunderbird-3.1.13-sv-SE.xpi 221169 RMD160 c3ecbd0ab4cdaf12b261e879491a1d7d4ad801a6 SHA1 1cc4f19a9b0951d3fd2c88155bf4af9c7d5cad99 SHA256 09e6953ac752768d9ef296696a0c663cc5bd71fe88a958e470395b6e3f0b3209
-DIST thunderbird-3.1.13-tr.xpi 215791 RMD160 14960a8998ff1b05939c388e9d1bcf3d814664c1 SHA1 10b3f93053d3dfffec5f7828952a269020bbc103 SHA256 bcf84e160135b74c3fa7741148e437a446fa4f051e8425a710bd86c763f9ac4d
-DIST thunderbird-3.1.13-uk.xpi 244816 RMD160 eb430417584fc90b39860391c11ea8bff66ba731 SHA1 b64dc18000eda698da5226a34ba797f72b8fb47b SHA256 0bec4357eb40f09e9bce3c89167e94b53530aa4f75bba725ab527ccaabed4eee
-DIST thunderbird-3.1.13-zh-CN.xpi 219653 RMD160 b65d9e612e9bd052225234be2a7d5d5c84bad6ab SHA1 f325048b9ac12a4c21a1941491fc9afabbbb7408 SHA256 8788e2f335999340254064ad5580a97e23aa80b196bb168f06ecd9b80f486b51
-DIST thunderbird-3.1.13-zh-TW.xpi 220609 RMD160 1814031054dbad8ff120e25bd02558e8be512f0a SHA1 cc3955d71d05c9f37bf501196933d47cb8870c20 SHA256 9974cfeec07aadf03c17b590d0a66e831b37d00b62febb81e9962594d757971b
-DIST thunderbird-3.1.13.source.tar.bz2 68774540 RMD160 a2bbfa66380947891d06db822fc73e2441d104f3 SHA1 5bb8945e505a9d7d89b5a95ac932c47ad9032e56 SHA256 c577a1cb5a193c35d0c169eac52d9f5fdcd50aa78d003ff31f7f5c610aad1d1d
 DIST thunderbird-3.1.14-af.xpi 210561 RMD160 c95ef663fff343b6534325d506b4d5072766020b SHA1 76c1364be9546b3b055facb6c8f9c31eafc76165 SHA256 176f3fca5058fd24e933394d01d3a249a4af03bc8f6f2572bd3538b7a8e835dc
 DIST thunderbird-3.1.14-ar.xpi 230313 RMD160 5f69dd419af2fe865036d2988021f9a6d4309b47 SHA1 af867db8222dcdeb22d89380fccc275b5a21fc91 SHA256 030c21d58a7153ea59ec03e1e08831f878db5f0c841a72650f786b4c51377c1d
 DIST thunderbird-3.1.14-be.xpi 194424 RMD160 4488d008dd787aaa9bc9beb600da4de7eba70794 SHA1 715fe295a5feae139ff2318534fba73e8419b923 SHA256 636700ac4f8fe2a42ee5726c1519b7a85b12271493edbcfe6df12e6d7e466686
@@ -361,145 +255,3 @@ DIST thunderbird-3.1.14-uk.xpi 244869 RMD160 5f9f7163b41de33e4f07ad78cf500c94a05
 DIST thunderbird-3.1.14-zh-CN.xpi 219613 RMD160 b363cafe99297d9fb167b817b13ba38bece3bbca SHA1 91f4b40648588f1b7c9588ef2d17aef3eef03745 SHA256 0968408e21938a9b56feace2cfb067387486b61bb2d5dcd257d868d3baca58a2
 DIST thunderbird-3.1.14-zh-TW.xpi 220657 RMD160 9e7019bda257af283f94814117a223776874937b SHA1 9328a5681dc47636f314d402312eaa98b06c9ab0 SHA256 f409566081a40a5d1e81d363167d0e88bef0193d48e8345e54a8367b4a324278
 DIST thunderbird-3.1.14.source.tar.bz2 69060251 RMD160 caf136d77eaf31a6dfa42a7520db5d8d8132bce0 SHA1 62ea0edbd5265be6da98fcefad3baa36349bfdd0 SHA256 69916894c9e4177c470d08f5b82ddbb15f2fddb40e5dbd52ea7d9a8d69a9c51c
-DIST thunderbird-7.0-patches-0.4.tar.xz 1600 RMD160 117ab25696595c601add3041142312ea0bc16685 SHA1 f343c165b7201ba34c5d794a508caa5ef42326e9 SHA256 ef5ee490574240dcc3d44dcd1f198a2a03405a396e557795c3bf65d22c1c060a
-DIST thunderbird-7.0.1-ar.xpi 427454 RMD160 b0749214d4b25657a491e621fb5ff7942f54f53c SHA1 070f6e98f56bdbcf92ad851e255befac8235278c SHA256 d8b7890d3036b0cf313c9f1c1bf5be13feeb75001d2732e3785667759cc16bc7
-DIST thunderbird-7.0.1-ca.xpi 408520 RMD160 a3afd32ee13596dcad3235df389da876b2a02532 SHA1 ef6e6849be09550465a0404f7d3a73542029eecc SHA256 4bdb7ca95347516f11ab6bcd31adbfd5f6ebbba6936020d3164d5b56ef57839f
-DIST thunderbird-7.0.1-cs.xpi 408949 RMD160 cfa526dc82b597673a521dc20ec7781c5dd04de9 SHA1 3e27bbb05a106b529964d988a61e9a7c86227899 SHA256 783dde52ce6153e555e2a0e3e712a4c7668abc5bf5e58c93ca72bc136c7f75db
-DIST thunderbird-7.0.1-da.xpi 351439 RMD160 4e1c9053e39fcd2003d9cee1e5ea2eebb97b5344 SHA1 572b304453fafa3fd0ad755080dc6c73463bfa07 SHA256 ab7d2afda0fc84ce3b67b00d35ea5e551a4e0de8f5f4c105ec6243cac77ef88d
-DIST thunderbird-7.0.1-de.xpi 407484 RMD160 434e591f841d92556527467f94599fe10eafdd75 SHA1 3e4877335b57477e8e0cb60c90576bc82f37c4f1 SHA256 f22b9ab0931cc00cfa3ac3cf9980207a02a74c4b74b65f777f21547366eab87c
-DIST thunderbird-7.0.1-en-GB.xpi 382209 RMD160 7a730291728c047a1cd71a37daaf0ddc34f3c69b SHA1 f4719d0087ca9abc0924764b8065b55c6642bb98 SHA256 c6083378ac46a1c21c429f588f9d53387e67d8cad503cc4dc6410b66e511895f
-DIST thunderbird-7.0.1-es-AR.xpi 400130 RMD160 1e4ea8296dca96306a3674bfb1c84ede253ff789 SHA1 a1aed84afb968d4fc0ba63f275b7331eeec0e353 SHA256 796c3a3a7fd28047fdde170e19539ab9521173ccad250aca39491deaa9f4ecdd
-DIST thunderbird-7.0.1-es-ES.xpi 344153 RMD160 1f2d8dd3788bd70d015b501f1bc02069d0521e6f SHA1 15ef5afe86db13e2278b70e16b1d960700e18d8c SHA256 305e46178e3894bf42212682084b92d8dbc1d6b6a4123bb1a4efcdde183d1b5b
-DIST thunderbird-7.0.1-et.xpi 400673 RMD160 c26c99cf69a3d7dfb90e5831325365f5d778ea5a SHA1 6f3dc10766dbcfe8d40a1a14d7852289716d77a6 SHA256 b4ae465bd74226d869570303cdbb0d8e055e8c5673ce144983f0db36d3e98af2
-DIST thunderbird-7.0.1-eu.xpi 396533 RMD160 6a6992133789bf5ebec0ae3dabcf6db9ba1d0806 SHA1 d86f2dca76f1f92711cde0f0a5a7e29e992ce37b SHA256 32de9c4bd56b12acce3eb463f0000659f502afc91ec632853738fa80b66c948a
-DIST thunderbird-7.0.1-fi.xpi 401658 RMD160 e1556ef7877a2344938351435864d69ad27b3835 SHA1 541bbbe6069e8f42de51f463edf32bd60538e19d SHA256 74db6e66a086a2553ce40c915d86d3d20e289d31e38a424b5f1c76a577c8e054
-DIST thunderbird-7.0.1-fr.xpi 404117 RMD160 16f8b8e9da0be712eb210494118f3846703593e4 SHA1 1b4e3c9a89622b33792268a45b04a2d301589300 SHA256 ffbb2fc4196b5cb3937ed496721fb68bc0017729ddb44670eb32cf0f9f36561c
-DIST thunderbird-7.0.1-fy-NL.xpi 404061 RMD160 5760dca9a18c987e1d7cd223888d229f8805f43a SHA1 ba988cd7951aa5eec43ffa573ccb315199944ed9 SHA256 eeea18e9785aab5cf11e3e112ed299b903750bbdff3b4b0884e5b23e5ad2cab7
-DIST thunderbird-7.0.1-ga-IE.xpi 412635 RMD160 e0f556247a689bdf17f954cf3f560d2add0bf07b SHA1 4e79e8051b86ef16751e04438b43e431b5f0b251 SHA256 04816d7ada231aa14aca16f60882453677aab0b405f9403c5c75fa86a65afe42
-DIST thunderbird-7.0.1-he.xpi 415873 RMD160 434926c821fe90d814f85d36e5b9f8e61e8b150c SHA1 fc9538abd8ac268744059f92711ec4829b44e6f2 SHA256 4c0bc0bb09e9d96ac4ae79fa5110e19dcfd5e10d0c7611e12702d89e6bee6288
-DIST thunderbird-7.0.1-hu.xpi 416167 RMD160 4a73683d8152d14648c59d4adbfbcb292cda12b9 SHA1 a973f8cda80cbeb29ad42e4f459e6c762cca9eea SHA256 1932ccd651fdc5e2a35becd4cf6fcab1fe057314b350222e80b67a808888939c
-DIST thunderbird-7.0.1-is.xpi 402402 RMD160 293c2cfa86a61136da56a1c69f50d05f08ac6714 SHA1 8f18fe8cd885710678f169969aee4ca84557679a SHA256 9c84fa11966a13f8cd2ac98fae2d74d3c00ec7e190b9d4ab71f85e6a0b0b7f3c
-DIST thunderbird-7.0.1-it.xpi 336756 RMD160 a2bc9ba3e29a382b41d048edb5ccf761efe98ba7 SHA1 a12e1f327e301d7b8ff492c8af42a3e84e0e85db SHA256 6a8f6e6ae721d93a0da444f77163e3a50a104c8bde56b1d079f344d1d1ba98eb
-DIST thunderbird-7.0.1-ja.xpi 448004 RMD160 60c7afae9be61cc746ea31f0c6b789d8c6d0ea19 SHA1 946a01b3b75a7b66bf6a56059b3c8d04a2068f40 SHA256 18c33b330a3fd88ee5b746f7ee62e3e814e8dab4c2f94d8dec581f775efda2e0
-DIST thunderbird-7.0.1-ko.xpi 360332 RMD160 d6c98091906c0d7a117ec4a57636d65933079dd1 SHA1 05a7a4206b32d70169504d1dee259ac66a431aa7 SHA256 a8228f7493de3dae8bf39268d75f6ac50454567ac62355b2ec0fd36380f0513c
-DIST thunderbird-7.0.1-lt.xpi 525068 RMD160 5e153392cabf5108c410109b50258c0f57f8e111 SHA1 2861eb61061170423dbe9e309393b26ff7ad9a67 SHA256 bcf50348738013eca380d20a147c2777707d8231d122716d87b76de77ce73361
-DIST thunderbird-7.0.1-nb-NO.xpi 397788 RMD160 e0ab617264fdd06f4ffeabbaa023998bcfc4e2fa SHA1 4fae25865734ceff3aaac2a4d2e25063c5dd36de SHA256 a1a896545f974d80cf6db3d0a9b2bf397a7d8866a9f93491d3b5cdcbfea9b7cb
-DIST thunderbird-7.0.1-nl.xpi 398048 RMD160 f4a96175ad415238ffacbe35ee8376665afd63bc SHA1 b7111994e4628e2db4abde97b99992ebe24f082b SHA256 ce45d2789109567686e12200f803c17756d84d7e086a463bef4492a67c96eb22
-DIST thunderbird-7.0.1-nn-NO.xpi 399363 RMD160 36a2987efa5fd4700d748e9197721e6e9f9f9a62 SHA1 ab2172004d3694b3cfb319d953e6deb55f99f28d SHA256 2d5970b8e3fecce025266bc6727064c9980ec96a541810b3680c520789fb18e2
-DIST thunderbird-7.0.1-pl.xpi 384533 RMD160 734d4d45ab635a769a3a7e508a5b1f0bca397ff3 SHA1 53126e499dd56d7207736f0d928fbc72cc0d0dbe SHA256 899025c10e9a558e22220dd3e0b92c8a3366bce31b08b41dc7584cd07d2ddaee
-DIST thunderbird-7.0.1-pt-BR.xpi 406851 RMD160 a43583c856903438cb45270a1d18fdb22083ddd9 SHA1 f0fc0aee98fd7a337e9723deb7175a93ab193e20 SHA256 2fb8938c4b71aac8882a70d2112bfd889d46002909cba81401b43804feacd5eb
-DIST thunderbird-7.0.1-pt-PT.xpi 403835 RMD160 dd5fa8e51e5df2575c2cf04166b8b2656f4be952 SHA1 894f914954fba831a5d944827199648c1e118296 SHA256 8b3025f8ef733f16207188069273d7f409115d4af3407c1633baa3feee5f1e69
-DIST thunderbird-7.0.1-ru.xpi 398589 RMD160 b57f1d73a4e44371e4f0aede7ac5e706742696db SHA1 6d9afb64ab5e7c813091e5442b342cd3c277555b SHA256 b3b790054e882bed777fd7073cb854e3f43d20f3a091c981005aa2defc430b96
-DIST thunderbird-7.0.1-si.xpi 446193 RMD160 a37f81d70e32302bfc407c316d9d04424b11c9a8 SHA1 c8c925d83831784f3572bba37419e0d72228930f SHA256 b8bfdb7d0f2718f6e973aab9d0265eaf269b78f55d7d113e1f74c2949b5e3aa2
-DIST thunderbird-7.0.1-sk.xpi 414195 RMD160 3bbf2d5271a0ea643d185fca09e970fed6c44dbe SHA1 1dfd53f37e6381dda01a883d7ff8732610c4f597 SHA256 cc6fcb73596b992a86cfb6ab735271d2046d530ad44e0620a5931d21aa4b2f30
-DIST thunderbird-7.0.1-sl.xpi 400565 RMD160 c78da217b857a351646f04140a753ef4ae867713 SHA1 6448772fb29f7e52d967549e98b283dbb8945184 SHA256 8a6997b630aada96f4150d8e27387cdbb946a0f268860f6bd35aa571088b2f54
-DIST thunderbird-7.0.1-sq.xpi 348842 RMD160 c6eadbbc72ff25c2c6a2d99920fa3ab972252c63 SHA1 90a83660e29073b20ea10ccc1046e3fc8bcd99b5 SHA256 3bf3fa4be4008f50b081f982546973badcdf82134b492cfa315b329bb699e761
-DIST thunderbird-7.0.1-sv-SE.xpi 468433 RMD160 b7024a683e657a6e1e179457654a4cf4f2326ff1 SHA1 f1021e527d3ac46f5d29fc94002ada10ef863d46 SHA256 0bcc392c8944606538674a7dcb802ee03c40cdb2b9f75ed7d1c37c86d4b8c301
-DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13f604d0d88dc8c675fec9b36ba7e94 SHA1 11347751d427935c2d7cb8ac56340c800adfa8ef SHA256 e5018cd62f7ece8d6ced30d42807d7d2632e68a3a659fb7adacd21f94f07aa68
-DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab67be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466
-DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668
-DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA256 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242
-DIST thunderbird-8.0-ar.xpi 429682 RMD160 ac02f62b746232efcbbf622e7d2a84269194441f SHA1 da148179119926bfb2305e2157ccbe6edee86e79 SHA256 ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
-DIST thunderbird-8.0-be.xpi 388182 RMD160 b76fa607aef8a84430fd174f53bdca2d542e7f92 SHA1 7e606ae1e580242a62e6a136155b8a478ec09dce SHA256 c744b02fe1cb2acc1254d9c7b34af80710dc5de523d077187b87fd53e061aa9f
-DIST thunderbird-8.0-bg.xpi 447619 RMD160 e13ac28e4b34e08308364418b5aab97518bbde84 SHA1 25d48b7d9fbaea3ab2b60e3361185fa3d72e34fa SHA256 aec72e7de903f79775456926e255c39346f8b52d0e12db90246f9401055e6405
-DIST thunderbird-8.0-bn-BD.xpi 467423 RMD160 de9d84e240110fd178b4eb0807e9b18709306892 SHA1 cf1185820ee431ec1f8928526fd866316d80350b SHA256 f4812cb69d83f94b31a6cab11672946dc9ae0afd3166553aa05df837971fc46f
-DIST thunderbird-8.0-br.xpi 407854 RMD160 ce49a786c8608852d42d3230743fbb362a77e6b0 SHA1 f4b227d70f87b707cb1ab8ad203e2aefa5c5fa64 SHA256 bfe0a405db47e62cf4f2037f10592f37e6f4804ff141c98f03a708c8b76886c9
-DIST thunderbird-8.0-ca.xpi 407844 RMD160 f0860202c3b3ca2117373a657f08585e79b8fb23 SHA1 676c0b2904b282649323ee8287eede0fd011f31d SHA256 f9cbd66875016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8
-DIST thunderbird-8.0-cs.xpi 410932 RMD160 efb7559493f30a25d0707b36240d28c4fb5e9647 SHA1 4a1efdaa8b7cc497a48dc91d35e69464cfa2695c SHA256 1fd879a3802d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e
-DIST thunderbird-8.0-da.xpi 353524 RMD160 ef82b894d5c104f20a301f498e4ecb778343c50f SHA1 f60819da07a43405faf6d88a9163ed964ac5095f SHA256 db28f6e245304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef
-DIST thunderbird-8.0-de.xpi 409617 RMD160 65e0a6ff2e8f1dd192ae06235def1d269bef7202 SHA1 514cc2f40cca34be61a0e4287f1f01a00c96def8 SHA256 d8047dafbcf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2
-DIST thunderbird-8.0-el.xpi 392612 RMD160 433f3350a94aa8e1c815a821c718dea1b0af180a SHA1 7d026284b05903e5fe20eae6abc46246d9c3f79c SHA256 ebb6e4e5cdb20a3d19c72d5bc8967ff1d5ce65b479426ffa7f7cb2a367ea9d9f
-DIST thunderbird-8.0-en-GB.xpi 384202 RMD160 37331b2e48c0fc12c25d1e290c352187ab326332 SHA1 95dbc9cd72a58d6d2b6cc7e6d38846eef15ff6cc SHA256 77a53b255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f
-DIST thunderbird-8.0-es-AR.xpi 402208 RMD160 7f9cb8d89f54e5b8e022b152f69a542d978c3612 SHA1 83dba6b048b1fd6132bf9ff286e3e492208b1dc9 SHA256 3d23032bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc
-DIST thunderbird-8.0-es-ES.xpi 345966 RMD160 87b19f178bcd1dae36dc2896b1e751efb934a7af SHA1 9f9e2965fb1786f44a9e4998d4bbceb6ffb2eb30 SHA256 9e4d21fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327
-DIST thunderbird-8.0-et.xpi 402614 RMD160 f8b05fbb5b6a84da11fd7827c3400b9d8fb91916 SHA1 c6c9d8a80d7bff3e909a955f7e8653a65b306439 SHA256 7e866bb4f163e8aac567266414e20877bb9c6d0525d6621d717cdef1a9715ed2
-DIST thunderbird-8.0-eu.xpi 398556 RMD160 71c8a71728fb9bfa9b71fcb682aa145d7e64ec7a SHA1 1fcb6c067f2d5355b6940fc9693ff584eca81741 SHA256 af1a9e5cd29befc818ab5b93ce3b5058766f80fe0feeaedd261a702e56d1853c
-DIST thunderbird-8.0-fi.xpi 403666 RMD160 0889d030e832d3f1a894bf3641ef3b98af3c7265 SHA1 fb984fbcbb0cbbc97779bc3abf87ebfefad24782 SHA256 e2c94b11072377e3ce6758a6f3b607e03fa7a0073e167b31ee097e0363b6c50c
-DIST thunderbird-8.0-fr.xpi 406258 RMD160 8e6684d7cb942b34c69d467619c42599dd1f02cd SHA1 55d3d5117f36bb5451cf3e040317cdd67b444487 SHA256 5384e5e75061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2
-DIST thunderbird-8.0-fy-NL.xpi 406182 RMD160 18b02278929414909101c8d550a05ef5407484ac SHA1 b1df077e7fe68ebb69133655821f640915ea4a79 SHA256 fbf0e7e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890
-DIST thunderbird-8.0-ga-IE.xpi 414791 RMD160 5f5843a6fdfcbb47c84266ed57aa03bed0d197f0 SHA1 e8f77908d61f82796fa80c974b821aed7a82f421 SHA256 6f193c7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db
-DIST thunderbird-8.0-gd.xpi 417258 RMD160 4fa9be2ddc45716832dc62a8d4d9a5613c6da22b SHA1 d699f7432c42b43ae339e7cb1fbbd6dd7a710a6f SHA256 a79cd6a967aa6023953e1b24cf784e5600b05bd77f081c11fa1ab53c145f19e8
-DIST thunderbird-8.0-gl.xpi 401200 RMD160 53401ac6094f275ddb536da38ebaf54cdfeda097 SHA1 dc343fcf130314eaef14bb70d6770f79c37a2edb SHA256 bd164a1c8b5a1fa7514323a6fad15f43765c42886ab46cd0995edf29e19ec25e
-DIST thunderbird-8.0-he.xpi 429157 RMD160 cbcd11073637c0a8ffb4200ca7b93caf6a78f1fc SHA1 d58b666d5a7ec7cd8c3ea6215f9a48a84fde8316 SHA256 15049fbc3a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562
-DIST thunderbird-8.0-hu.xpi 418308 RMD160 d5c39902eb580bfe74cb0d9f8fd50927c52418b3 SHA1 47bd74822aafe1326d4a86bc998edafcec9bf45e SHA256 2ba9485a7d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08
-DIST thunderbird-8.0-id.xpi 392824 RMD160 dcadd8a3480c88770da8189e37a39dc656419b55 SHA1 564d1f8a6348def0d6ef21f10508dcd642606434 SHA256 a03a86b388d79d15dc2ee09a99e11f492f9d11a6a72a75bc26896b09125a4604
-DIST thunderbird-8.0-is.xpi 404491 RMD160 4b3f8f95b25bfcd49e1a58f90d0f1138a1134820 SHA1 88336dc416de62a1f021233fee8c66e9c88e07cc SHA256 60110ee7c61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c
-DIST thunderbird-8.0-it.xpi 338611 RMD160 f5e5a492c30dcafa6d8858419dec3adb2f551d88 SHA1 acdba9e5a105d855e18e244b73c7e6c348421e33 SHA256 61c243264edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2
-DIST thunderbird-8.0-ja.xpi 450381 RMD160 71cafc3ebe76704b22a976d446cecd0c82fdecb9 SHA1 40f500176e13716c2f74ddb620be3d3681a89751 SHA256 1ffc9c291893601172be91f50b25b651c18ea008def94b858a12147872da2ce9
-DIST thunderbird-8.0-ko.xpi 362650 RMD160 9a55eea99af12cc333b3aceff54a6e2e1d45057a SHA1 5d55df5d8451c875ccafd8247f0e971102fae5c9 SHA256 b7063cad1f6ebe4c21dce881eb748a88aa906d23f248593d9bb53ba14381efba
-DIST thunderbird-8.0-lt.xpi 527185 RMD160 eab4cf6c9dba554aecd83647df27f79d217d9939 SHA1 727ae314f34aedbeda861ed3df7a93466810b901 SHA256 fcd2c44bdebe7866f087b088ce5103366e2241bc341cc24b771684bc1d06d253
-DIST thunderbird-8.0-nb-NO.xpi 399860 RMD160 b959cdbe5e5e5e061c9e414f5719c76e4f0e9d80 SHA1 a37e40e894e4f1dfaf5b77555d533c000087a667 SHA256 83b800ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d
-DIST thunderbird-8.0-nl.xpi 399870 RMD160 aa6068ebf5370de95b8118823b90e76d08b820ae SHA1 d9b71812e16505867c3d64a48d91cf203a3c6ed8 SHA256 bce99a6e95ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf
-DIST thunderbird-8.0-nn-NO.xpi 401462 RMD160 547fc9ea77a2e43c9c58f24f5c9299db9f793c50 SHA1 a91a42860fa6ab81e3ba381a2dd32bd16be8aa5a SHA256 7e93e1e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9
-DIST thunderbird-8.0-pa-IN.xpi 434683 RMD160 1b5f27a2f25e9af0404583e7a3047f49c25763e6 SHA1 ef1dccae1fb0c439aa48678827c84b0728389e6e SHA256 56c0e6bd4e5cccbb486fadcf7cddd6b0a75acaddc07d319e9bf39e679b98f900
-DIST thunderbird-8.0-patches-0.1.tar.xz 532 RMD160 4fd95b36f692fe6852eb65fe8bb8052913132047 SHA1 61eb8c40ad4b31025cd21b096c00a45ab8483193 SHA256 7dfee7ee0289645a5de7e3132d16412cd93713188d86a0a1ff4570a25cbe92c4
-DIST thunderbird-8.0-pl.xpi 386210 RMD160 9f393faab5504a98c876ac42fb6562a5115fd270 SHA1 5aa92c952156673ef354a2763f59430622447221 SHA256 040b62774df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a
-DIST thunderbird-8.0-pt-BR.xpi 408964 RMD160 f53215aa67880eacea3108063b3ec0d14895c202 SHA1 eed871c5b8af96bc7c36391d3796ae6feb7acaeb SHA256 669f7ad7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397
-DIST thunderbird-8.0-pt-PT.xpi 405968 RMD160 29121ec74b43cd321a94eb83f761b091c4e272c2 SHA1 b2889c50eac0c0b583dd3f20e5d6d4f641f00397 SHA256 b2ff74fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f
-DIST thunderbird-8.0-rm.xpi 406577 RMD160 611076b8da1aaede20c05a50bbc708d40bca8fdc SHA1 d6bf1db0ef2c5c2f0077933587dc50822f5be27e SHA256 0110cfd35cd8354930ba5511ccde62539e75e69d31f4d428a20bd8aa113cfaef
-DIST thunderbird-8.0-ro.xpi 430139 RMD160 9ed6a3c834d8c8d748f7d57d26129f0c2c2e0c51 SHA1 0c53963d16221bf0d609d3772994b14fdde2f4dc SHA256 57d2dfa73581629a305ea11fd98b7ff6e2ec971a1a031f635fad103104760084
-DIST thunderbird-8.0-ru.xpi 400687 RMD160 8ad0c810a54131cc344edf662c34b208f4e9c842 SHA1 823c97ed7a93c0c10c8cf2555ef4bb0556e0027a SHA256 a412dd6f6763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6
-DIST thunderbird-8.0-si.xpi 448334 RMD160 7340edc0cf0326213dc7832931779f186fa76eaf SHA1 c48cace01c7659a87dfcf9beb045728b958767fc SHA256 fce2b953375d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631
-DIST thunderbird-8.0-sk.xpi 416338 RMD160 573654a59aa83e083182b00b4c81603d0ea5c83a SHA1 53b0146da50a8a5cbc3bbd9c4c3077c294e337af SHA256 e09edb3471eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff
-DIST thunderbird-8.0-sl.xpi 402625 RMD160 3da5c058d1953947b4fdb1f30371db296c3dc892 SHA1 34ac589a09b759507ef7a58e9e81d5a8fa367a66 SHA256 91c6151d3c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71
-DIST thunderbird-8.0-sq.xpi 351703 RMD160 9fe4bd4663d1c9eee57eb31feb98ff32e7e68f43 SHA1 775103b7eac89e52ad2600462146c20d16841da0 SHA256 f14b7ca5d4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893
-DIST thunderbird-8.0-sv-SE.xpi 470499 RMD160 edfe10d92fec7767b62782f34d0148a89608721c SHA1 4ecb7e9462fd43bb2665d6ed8dbdb6dc3d1fa0f2 SHA256 c7cc27527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b
-DIST thunderbird-8.0-ta-LK.xpi 466437 RMD160 14e348e400a24d4e12679ce3b55b2e4a127721e4 SHA1 a1fafc13181f41ba9b93854594807b3e5cf65b49 SHA256 a49d999804b2925dc87b5fd990cbd373489b007bfd67a862ca1f775eb5448c04
-DIST thunderbird-8.0-tr.xpi 405974 RMD160 4f80a26fc871135b850851bb06ddbd7b8de60574 SHA1 12c21c981fb65ee8c8d7a1720e567c1166da4177 SHA256 984f7bcae3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d
-DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c834c278bc1 SHA1 59cd3d8a0b47ba087d4493374bd6ba8b233758e8 SHA256 cdf663bdc0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe
-DIST thunderbird-8.0-vi.xpi 425968 RMD160 5412aefbf05179354fb4fa2f3865a58b53552041 SHA1 561e797859bb118e54e50e24dbe826558900d96c SHA256 fa82a8f09cc3adaa8e816c953bfef03a385e84662f886061d0a6712dfad576c0
-DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132
-DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
-DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256 f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
-DIST thunderbird-9.0-ar.xpi 434061 RMD160 dce4ff025e17ae4b7d29a27111a4c3c5c54e3a7c SHA1 f9a12796268c7c48a76c981de38faef891186852 SHA256 273f348d47929ddad8901c3af498612cce18c54abfa28fc3b06789ff6fc0c7ba
-DIST thunderbird-9.0-be.xpi 393303 RMD160 17361a5b7832f9f68464b26010e0bb1279309a57 SHA1 3466218729480ff47bea88eb02f2719a1859e6b3 SHA256 e05e929c00a46ffcbd9e0a5877ddf566e43e69bcebc5ca83e5d22c3078e659e6
-DIST thunderbird-9.0-bg.xpi 452513 RMD160 0125fe3125f7a89a8505667aa9d78c7bf083681b SHA1 0f4201088001b8659fc6536208ebc3120a532d07 SHA256 628d9a8099604e0877471547a77efc722754c86c34a71337fc1aef013e5e399d
-DIST thunderbird-9.0-bn-BD.xpi 471927 RMD160 8ab469c7b2b6d5f139cadb0e29174ab0bc681b8a SHA1 006ae0ab129abd05a771a82964c624159c4af6ac SHA256 e03528da2661c1f0392c2b2766d316771ab1cd1ded90c4d33e91f66996412853
-DIST thunderbird-9.0-br.xpi 411787 RMD160 1629349b7019903d7ffcfc93b3adc31784eb6ad1 SHA1 9ad708c1e4cff12d1cf5ce794a64ba19ec3cc220 SHA256 5d6f0af6299784abf3503eb9d173c697e94289013c769a91ab6905406b2eb95a
-DIST thunderbird-9.0-ca.xpi 411848 RMD160 468a11a55c99afafb2eefa2d91bbca76da3e9139 SHA1 a40eeb46ba7c641937e28b4ec97d5b14157becb3 SHA256 ff87ebf98aebf5132b9fe6963de1eaae9e1ae095987f4f31bae0546e850c4fb7
-DIST thunderbird-9.0-cs.xpi 415080 RMD160 2828be920de9c3ec89d83418a4506f72728e317a SHA1 862b11e4191aa4d9490d97ca2e76ce232027b6d7 SHA256 e53874fc0076ab0c79e7c78b5f0731fe978b6797756c02e1b2cbc9bbd16b8133
-DIST thunderbird-9.0-da.xpi 359198 RMD160 085480e7800c58f32e30e5cb5587ab4e850622c3 SHA1 39a792952357188c73b8db15c9d7a997e40b71f3 SHA256 ccd378133f7239e105be119d1931f43606c05c4937e3fdeed29a9668d9283d01
-DIST thunderbird-9.0-de.xpi 413690 RMD160 c743becf87f0fbbfeba09c7248790860b412b26b SHA1 ade43cbab833bdf59940383021b7463182e9a8f1 SHA256 2a18df2bcc60977d9e5eea837f026b9cb09f44ccb0d99b3b2521f3463cfed5e6
-DIST thunderbird-9.0-el.xpi 399465 RMD160 411d532837cd3e635382ca07a31b7fb0a53dc4db SHA1 c7365659069f280e56e1dd5e1b830b4d315ea46a SHA256 3570d6fd3068ff8203101cdc152808e5c0ee499bd0e9f7c07a3bc2251039d0cf
-DIST thunderbird-9.0-en-GB.xpi 388497 RMD160 5e247cc1d1cfc7e131db127cb0bb56bd50911efc SHA1 2b86a2b8ae192b4de2da90faa9eb3c2dea07c18d SHA256 5e48976b35563ca9c704d70292b60a34fa73f76a6f09217186dee33ca8608cab
-DIST thunderbird-9.0-es-AR.xpi 406257 RMD160 2e31c5a8af59490fc16abd267d69dbbc1d257fc3 SHA1 fe1f3923d182a3b24f5dc50afe890e46027b4424 SHA256 7230887cff950ead2aa8c1d50d197cfbdef35105003f56e57ac91efeeef39676
-DIST thunderbird-9.0-es-ES.xpi 350318 RMD160 3724760f0a7f3c46f2a51dd17527f58672929b89 SHA1 e38f0d2aabd39b65ee9b3b80b76d1b572c437792 SHA256 eb17e1046cf401ff4678462f136bd3623c09d35e7e9d4a5b8105c0a3b47ab706
-DIST thunderbird-9.0-et.xpi 406523 RMD160 2d2390fea6f68d299abffc344b68207c27ba7409 SHA1 a8b41d700ecdc3d9fc2b0a84a286a41a9da264d0 SHA256 4ec4da174e94e0e80f08316af0dc7011da27157542b3ac049fa0362e34b5ffbb
-DIST thunderbird-9.0-eu.xpi 402325 RMD160 83d35635e79e1cca808397436eb40b58cfa043c9 SHA1 cbd6b21298e380fc7b96c7fa77328016f084f73f SHA256 5f5f5558ad6875debf34b1ce7a00b18bc15dce96989bdc058365dbdd6b24be4a
-DIST thunderbird-9.0-fi.xpi 407656 RMD160 2dba56ef9ec0859429855b3d2540bdbc4072cf21 SHA1 5e56716899ff686603f4b0dfc8979af63c557143 SHA256 3cc68c48edac8d97ec8abded479d3756b45b740de707ff093ff39b08513c7848
-DIST thunderbird-9.0-fr.xpi 410408 RMD160 5a13f29c46f2f98efb4af810075db388be6a254b SHA1 4d2b652a6bc4ff8f08b6ccf249577586a87dccbf SHA256 5800a56cfee8bcd50a8bd5eb4da1931105e31d0ab9eecdbd05d3a839dd295cf3
-DIST thunderbird-9.0-fy-NL.xpi 410230 RMD160 3c358ed2f4b819a56e2131b53427d549bc855ebd SHA1 2111b6d8e05b0b8b8c9c823c86629a2547b1607c SHA256 cb7bee472752fc701e5e521475bae385125a9c504c67eb7b46cd2ae81e80d195
-DIST thunderbird-9.0-ga-IE.xpi 418964 RMD160 64be8a7bccbe00b22f22a411f0b9293005cb4ad5 SHA1 c7254278ad91c92839398784f55862ffcf5bd4d3 SHA256 14ed9d4bd15ae6a24ffe8216266cec28373c4522003f1f338f3a436742c09f53
-DIST thunderbird-9.0-gd.xpi 421640 RMD160 ffa943cbff9625b1596c7638bb3ddbed8fb2e513 SHA1 01faab0883c62a4347b788e012cf215386ad96e9 SHA256 679e259f2206fb6194d6e6dcc9e52d6f17c90b5ed8d7c0b62e58c3b2a4daa358
-DIST thunderbird-9.0-gl.xpi 405083 RMD160 5ea5fb2e9a27a54332d2b1d059853bdbb8ab8589 SHA1 d3c5cce6a3cbbe683139b2d1971e7fb1a9857cfe SHA256 b1007a534dc37efb908e1da3426118da72b5c7159faa47a6046c6057fe1a08ae
-DIST thunderbird-9.0-he.xpi 433194 RMD160 2828459029d1e311c8d0ca6170537ce38800c21e SHA1 59dec733a966daf7679a2f0900a8c96767fba513 SHA256 a5e7dbfa039fc71bfd84068568403099304a2a3663bcc01d95367fd4d931bd59
-DIST thunderbird-9.0-hu.xpi 422491 RMD160 0a58ba18e6cde2f60ef285279584bb9717339391 SHA1 4c2e4ce163c44fd699e67d3b6c3e2a76cd35e232 SHA256 df3cdcca73a7fd18908c47c0e561213723be81f791e5e5cc11332f65699da536
-DIST thunderbird-9.0-id.xpi 396570 RMD160 a590628117086a415930a765f65214d5717a829b SHA1 7807b4005fa9d3f8c46266d4beec92a8a5e990be SHA256 1238cafd28da58274c816bf8be9481cb641387962dde7b1fd26deb76c9d2e323
-DIST thunderbird-9.0-is.xpi 408517 RMD160 90d773d15394f2f9bf14900bec90809a5873b46a SHA1 7e364ad3030a8a8fb299f7128b9e1ec06c8fffcb SHA256 0e98641ec60b474b77aa2873560a1b897ea85bd1084dbf4b668b34ea971c2a52
-DIST thunderbird-9.0-it.xpi 342810 RMD160 012dedc6b2c9a847e72ee08737fe6c0449f5cf5c SHA1 a7092ce7063ccfe871153abb6a9444568c8e616b SHA256 db3c9c5c78f4f3244975ca69ac50fba1816664bdd38d27c8907c6f9f6e2d3b77
-DIST thunderbird-9.0-ja.xpi 454770 RMD160 3f118a2f1347e81c1270d74843a1d6d4ea61a90e SHA1 0e5b5f8f30ddbe272f097c145e533eac34e4b62a SHA256 f85f62f387b01a779cc19cb264aa95908df122e2b6cca37c5ea661e919c1859a
-DIST thunderbird-9.0-ko.xpi 367944 RMD160 23a2bcf5dfc92bdec91007ef036be3d485ec633a SHA1 d72319814831e7680933cb127545ff8464263c02 SHA256 6ca0b3ffa448e6f6431ca99440bc5a90346dd398ce0254a06734976c95e78f1f
-DIST thunderbird-9.0-lt.xpi 532804 RMD160 2b7fb51eceaaa224c9b13bcbc5455f9783d3feac SHA1 38c0388db9dd3b577d7334d2d5c4142792bbcc5c SHA256 000c12b2c175f6563e9d41375199dcb7e1928ad9556defaee441b572913a0e59
-DIST thunderbird-9.0-nb-NO.xpi 403653 RMD160 f80cf933678024671b67f9618294213236b6d038 SHA1 b938f0c7b2c2277575cbacca5be73db4005b091e SHA256 fb8ed2db6c58884180216a35c0171751b812c99a48ac9571bfd96dcd9994bc11
-DIST thunderbird-9.0-nl.xpi 403894 RMD160 6ec77e4b6b8d38c6887ae53183318945c19f95d3 SHA1 5ae91a5bc405b768208440d5ef539a88951045e3 SHA256 5a41d63fef2b4a29b53c93346f422914984603d52230c0a2c91f6497ed93a34c
-DIST thunderbird-9.0-nn-NO.xpi 405231 RMD160 f8134c9dc1c71afcfaab1ed00578caa5a7a030c7 SHA1 6e33d8c45af21c8115e53b5b865990e357fb110a SHA256 c5ba721345b2f8b2719458f30d5db5ad964ec56fbd6a8df79a1077a45505982f
-DIST thunderbird-9.0-pa-IN.xpi 443655 RMD160 d1fdf6c544f07bc163f93286b9badacb942fd8e8 SHA1 357a9e2bc436dc59a5f86f31911ea28175dc7012 SHA256 aee8d664d53552849974292eda076129fa81c5eddd978e662f79d65e7b51076b
-DIST thunderbird-9.0-patches-0.1.tar.xz 696 RMD160 986ad69f21f6eddf46b73258b0a2aa8eb85fb9c4 SHA1 62dd6e724e2e3a1b76eaed3d165e2e9f47385f8a SHA256 64028e8ca37e1259ed196dfe6e8a87cd08153047f80639ca36cfd276eaa9aaea
-DIST thunderbird-9.0-pl.xpi 390106 RMD160 959a73fac75984a6c89e791ba27cd0631c54894b SHA1 776cb14781499c466dc517df66b52de86d6f73ae SHA256 812104868da4bb631fdd9725b88329517538f889a7eb0b26b78efdc7135a4f6e
-DIST thunderbird-9.0-pt-BR.xpi 412877 RMD160 d23f8f394bbbaa17cfb0bd74caee88cd44807f55 SHA1 8d0e68fbafbd66c4fc8afaf23b7a86ab1581141c SHA256 019d2cd7e3bc8ae5dd5865a22408dd43b0aa4b66b60baadd26c02737649f299b
-DIST thunderbird-9.0-pt-PT.xpi 409931 RMD160 08e668394ad1b18e3fec913fdce739786cdaf2fd SHA1 f23c241683c46ccb2ed64702b3a73807e879f5ac SHA256 4144be099f10147cd9eb21645cdb8c72974740474f2dff0848af9fb6aa16404f
-DIST thunderbird-9.0-rm.xpi 410499 RMD160 f25a988e5920eda08994ead6bee56fdce91af47e SHA1 24bf7b78fceabdc813893bf20c5ef0c6713eec61 SHA256 c541d26e82e33efdff281e5f094ea1bbdca041289e83f94652ee654ac95e712c
-DIST thunderbird-9.0-ro.xpi 436140 RMD160 23bc222f2eb315eef9d2298130e50f25a5e2269b SHA1 5910b482fee1d1838807e6682e38948dc3f295b9 SHA256 33062abc3a72903726d5b4ce3fcbef37b239e760191f33f0c1691b2e4db71122
-DIST thunderbird-9.0-ru.xpi 406089 RMD160 7ee3c02ea7e23e0b6f06426c85f44e3c81ecda31 SHA1 8fe5af5e9f507efb215f6880f6c307d8156dff5a SHA256 23f7e457c9f8183eb829c4d9f2433528bca88746be1077bee92384340eb9db76
-DIST thunderbird-9.0-si.xpi 451806 RMD160 e0a151ef3fdedffe41b562c3aa09c9379fba57a0 SHA1 9ec5193243b98eb698987f626ed9add65b23885c SHA256 5c301d42bd4a81ebf5b364828c050e3b893ff9115effe5fd2e25bdebe2c55f09
-DIST thunderbird-9.0-sk.xpi 420587 RMD160 e33484cc3c41418f0caf755b88c6d39a63ee0a46 SHA1 08191059dc2f6d8f77bc28d153c8565ea231e309 SHA256 6c77f9ce27f36c76af863f9c88d1d4bf59872be60743259c510738a4fba9c394
-DIST thunderbird-9.0-sl.xpi 406469 RMD160 2bc25fe07301ca81c9d5a5b02128bc3992b9b194 SHA1 38c5e9d6f262af6cb0a07a28e9838a9e2ede0071 SHA256 4ddb0ce9d976d83c007efd577a99e2b8aec9985d6d5f9ed1aa5d434aaeec1a14
-DIST thunderbird-9.0-sq.xpi 355950 RMD160 1df115817b96e4e5bea0d96f1a49af252d69afeb SHA1 bda7df057ea9c77ed77ccda8c424d129518c7762 SHA256 91da37d89c4586f75573a2cb51362f14020fa692cd0d5bf3a52b343a4541c174
-DIST thunderbird-9.0-sv-SE.xpi 474265 RMD160 1b7f5fc023c8f12932f60df5c2edfe27e33e7816 SHA1 83800b6d82dc40a9ae1f843963cb2f9a9f69105d SHA256 b197bd86e52b12a095e72821e0202413794d4e569baee5151c3445b9371dca96
-DIST thunderbird-9.0-ta-LK.xpi 469046 RMD160 a47a31f2822d4f893eb2da3ca5fc5fc22124f472 SHA1 501200fd933dcc3c6489371083c8729c84979e14 SHA256 e5a85cfa4fecb88eebbea48df713c2a52b70237632bc6c04e063a1049355d4d0
-DIST thunderbird-9.0-tr.xpi 411360 RMD160 16482549baad4de2c9ec75760923afcea922fc96 SHA1 431d2eda0cc3dcd997179626cbd7432d5ad329fc SHA256 c82bf4fb9cb8cf088ef3ee733e33881f428a886c46146315b7dd9d1259603562
-DIST thunderbird-9.0-uk.xpi 460380 RMD160 e917ec702ef4091210144cd727a831473aa86453 SHA1 3286b36cdfa2f621aa920af8ae0c2597f9f73573 SHA256 4fbb45fd729a28b6a71f1e885187c2884bc2ad502dfd3f3bc59f97561e21a062
-DIST thunderbird-9.0-vi.xpi 429543 RMD160 8705ee88da51d9bd92fe063ac948aa875fc72d4f SHA1 4a0bf514a91ed42258509ed1ec063352d2a397e8 SHA256 ccfb80b4be592edf63927252cc72825f85135251f5a6dcaa3c2aaab8253e9255
-DIST thunderbird-9.0-zh-CN.xpi 426797 RMD160 13da2b2fe191b792546e274611ad1fc3d5cec351 SHA1 4f90b87183e41c71400d955a0eb6bfceebb61ca0 SHA256 7bc4f2a2cb338f57969630e0a1abd7b05360a66934170d52d383a69d877d45e7
-DIST thunderbird-9.0-zh-TW.xpi 427199 RMD160 28db91466f45b6c3395186cef32cd7ae3c921ed1 SHA1 7503c57eae25a435bef5bfec71ddb9561e12ceb3 SHA256 3f321e139f9f52eb1df044b4ef2c2cf35193a24e9ed2f3eafea905b7cfaeb959
-DIST thunderbird-9.0.source.tar.bz2 96194907 RMD160 12899236ee7106b32f8e1343c566396fc4980c85 SHA1 16fda096809d2eaf069458553ceb370f512337b3 SHA256 6f6c40b1c1e3c3cbf3de4dbd9465a5383b0596cb9a97ba8eee7daaade52aa40c
diff --git a/mail-client/thunderbird/thunderbird-10.0.1.ebuild b/mail-client/thunderbird/thunderbird-10.0.1.ebuild
deleted file mode 100644
index fca4f1040361..000000000000
--- a/mail-client/thunderbird/thunderbird-10.0.1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.1.ebuild,v 1.3 2012/02/20 11:26:26 tomka Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-# This list can be updated using scripts/get_langs.sh from the 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 mozlinguas
-MOZ_PV="${PV/_beta/b}"
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Enigmail version
-EMVER="1.3.5"
-# 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/${PN}/releases/"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
-
-PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-10.0-patches-0.5"
-
-SRC_URI="${SRC_URI}
-	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	webm? ( >=media-libs/libvpx-0.9.7
-		media-libs/alsa-lib )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-S="${WORKDIR}"/comm-release
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Use an objdir to keep things organized.
-	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable 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
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake -f client.mk || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		cd "${S}"/tbird/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="tbird"
-	cd "${S}/${obj_dir}"
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if use crypt ; then
-		cd "${T}" || 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}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
-	fi
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}
diff --git a/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-10.0.4.ebuild
similarity index 95%
rename from mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild
rename to mail-client/thunderbird/thunderbird-10.0.4.ebuild
index 975ec9480d2f..99dbf9899bbe 100644
--- a/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.4.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.1-r1.ebuild,v 1.2 2012/03/01 15:12:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.1 2012/04/26 21:49:22 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
 
 # This list can be updated using scripts/get_langs.sh from the 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
@@ -12,6 +13,10 @@ 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 mozlinguas
 MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
 MOZ_P="${PN}-${MOZ_PV}"
 
 # Enigmail version
@@ -25,13 +30,13 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
 
 PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-10.0-patches-0.6"
+PATCHFF="firefox-10.0-patches-0.7"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -71,7 +76,11 @@ DEPEND="${RDEPEND}
 	webm? ( x86? ( ${ASM_DEPEND} )
 		amd64? ( ${ASM_DEPEND} ) )"
 
-S="${WORKDIR}"/comm-release
+if [[ ${MOZ_ESR} == 1 ]]; then
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+else
+	S="${WORKDIR}/comm-release"
+fi
 
 pkg_setup() {
 	moz_pkgsetup
@@ -106,6 +115,7 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_EXCLUDE="6012_fix_shlibsign.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
diff --git a/mail-client/thunderbird/thunderbird-10.0.ebuild b/mail-client/thunderbird/thunderbird-10.0.ebuild
deleted file mode 100644
index 338c5591500f..000000000000
--- a/mail-client/thunderbird/thunderbird-10.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.ebuild,v 1.1 2012/02/06 13:41:02 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-# Add 'ast sr' soon as mirrors finish syncing.
-MOZ_LANGS=(ar 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 sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-MOZ_P="${PN}-${MOZ_PV}"
-
-# Upstream fail...
-MY_TEN_PV="10.0-real"
-MOZ_LANGPACK_PREFIX="${MY_TEN_PV}/linux-i686/xpi/"
-
-# Enigmail version
-EMVER="1.3.5"
-# 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/${PN}/releases/"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
-
-PATCH="thunderbird-9.0-patches-0.1"
-PATCHFF="firefox-${PV}-patches-0.4"
-
-SRC_URI="${SRC_URI}
-	${MOZ_FTP_URI}/${MY_TEN_PV}/source/${MOZ_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	webm? ( >=media-libs/libvpx-0.9.7
-		media-libs/alsa-lib )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-S="${WORKDIR}"/comm-release
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable 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
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/mozilla/dist/bin/xpcshell
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	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
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	share_plugins_dir
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}
diff --git a/mail-client/thunderbird/thunderbird-3.1.13.ebuild b/mail-client/thunderbird/thunderbird-3.1.13.ebuild
deleted file mode 100644
index 83c9506cbdb9..000000000000
--- a/mail-client/thunderbird/thunderbird-3.1.13.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.13.ebuild,v 1.2 2011/11/14 15:58:24 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools python pax-utils
-
-# This list can be updated using get_langs.sh from the mozilla overlay
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \
-sk sl sq sv-SE tr uk zh-CN zh-TW"
-NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa ldap +crypt bindist gnome libnotify +lightning mozdom system-sqlite wifi"
-PATCH="${PN}-3.1-patches-1.2"
-
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
-SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# english is handled internally
-	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		if [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	x11-libs/cairo[X]
-	alsa? ( media-libs/alsa-lib )
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] )
-	wifi? ( net-wireless/wireless-tools )"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*[threads]"
-
-PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )"
-
-S="${WORKDIR}"/comm-1.9.2
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-pkg_setup() {
-	export BUILD_OFFICIAL=1
-	export MOZILLA_OFFICIAL=1
-	export ALDFLAGS=${LDFLAGS}
-
-	if ! use bindist; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in ${linguas}; do
-		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-	done
-	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas}"
-	fi
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_EXCLUDE="1002-fix_hunspell_double_buffer.patch" \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	epatch "${FILESDIR}/bug-606109.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-
-	cd mozilla
-	eautoreconf
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	touch mail/config/mozconfig
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-crypto
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=mail
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-system-hunspell
-
-	# Use enable features
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable !bindist official-branding
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use lightning ; then
-		declare emid emd1 emid2
-
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid1="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-	fi
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${D}"/usr/share/applications/${PN}.desktop
-
-	fi
-
-	# Warn user that remerging enigmail is neccessary on USE=crypt
-	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}."
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-}
diff --git a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
deleted file mode 100644
index 1eda44d52c84..000000000000
--- a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.7 2011/12/27 00:14:18 halcy0n Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs
-
-TB_PV="${PV/_beta/b}"
-TB_P="${PN}-${TB_PV}"
-EMVER="1.3.2"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
-PATCH="${PN}-7.0-patches-0.4"
-PATCHFF="firefox-7.0-patches-0.5"
-
-FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-if ! [[ ${PV} =~ alpha|beta ]]; then
-	# This list can be updated using get_langs.sh from the mozilla overlay
-	# Not supported yet bn-BD ro id zh-CN be af el pa-IN bg
-	LANGS="ar ca cs da de en en-GB en-US es-AR es-ES et eu fi fr \
-	fy-NL ga-IE he hu is it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT ru si \
-	sk sl sq sv-SE tr uk zh-TW"
-	NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X/-/_}"
-		# english is handled internally
-		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-			if [ "${X}" != "en-US" ]; then
-				SRC_URI="${SRC_URI}
-					linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-			fi
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.10
-	>=dev-libs/nspr-4.8.8
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/comm-release
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if ! use bindist; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in ${linguas}; do
-			# FIXME: Add support for unpacking xpis to portage
-			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-		done
-		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-			einfo "Selected language packs (first will be default): ${linguas}"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-
-	cd mozilla
-	eautoreconf
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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 crypt ; then
-		# omni.jar breaks enigmail
-		mozconfig_annotate '' --enable-chrome-format=jar
-	fi
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable 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
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	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
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-		done
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
diff --git a/mail-client/thunderbird/thunderbird-8.0-r1.ebuild b/mail-client/thunderbird/thunderbird-8.0-r1.ebuild
deleted file mode 100644
index 7a29fb969954..000000000000
--- a/mail-client/thunderbird/thunderbird-8.0-r1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0-r1.ebuild,v 1.6 2012/01/28 05:31:11 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs
-
-TB_PV="${PV/_beta/b}"
-TB_P="${PN}-${TB_PV}"
-EMVER="1.3.3"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
-PATCH="${PN}-${PV}-patches-0.1"
-PATCHFF="firefox-${PV}-patches-0.2"
-
-FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-if ! [[ ${PV} =~ alpha|beta ]]; then
-	# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-	LANGS=(ar 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 sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-	for X in "${LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${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="${SRC_URI}
-				linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.10
-	>=dev-libs/nspr-4.8.8
-	crashreporter? ( net-misc/curl )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-S="${WORKDIR}"/comm-release
-
-# 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 en_US; 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
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in "${linguas[@]}"; do
-			xpi_unpack "${P}-${X}.xpi"
-		done
-	fi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use lightning ; then
-		einfo "Fix lightning version to match upstream release"
-		einfo
-		sed -i -e 's:1.0b8pre:1.0:' "${S}"/calendar/sunbird/config/version.txt \
-			|| die "Failed to correct lightning version"
-	fi
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		# Ensure enigmail can find its scripts for gpg
-		epatch "${FILESDIR}"/enigmail-1.3.3-bug373733.patch
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable 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
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/mozilla/dist/bin/xpcshell
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	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
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in "${linguas[@]}"; do
-			xpi_install "${WORKDIR}/${P}-${X}"
-		done
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}
diff --git a/mail-client/thunderbird/thunderbird-9.0.ebuild b/mail-client/thunderbird/thunderbird-9.0.ebuild
deleted file mode 100644
index 6916a57aaf99..000000000000
--- a/mail-client/thunderbird/thunderbird-9.0.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-9.0.ebuild,v 1.7 2012/01/28 05:31:11 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs nsplugins
-
-TB_PV="${PV/_beta/b}"
-TB_P="${PN}-${TB_PV}"
-EMVER="1.3.4"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-
-KEYWORDS="~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
-PATCH="${P}-patches-0.1"
-PATCHFF="firefox-${PV}-patches-0.5"
-
-FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
-SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
-
-if ! [[ ${PV} =~ alpha|beta ]]; then
-	# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-	LANGS=(ar 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 sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-	for X in "${LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${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="${SRC_URI}
-				linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.1
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
-	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.14.0
-	>=x11-libs/gtk+-2.14
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )
-	virtual/libffi
-	!x11-plugins/enigmail
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
-	crypt?  ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-S="${WORKDIR}"/comm-release
-
-# 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 en_US; 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
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	export MOZILLA_DIR="${S}/mozilla"
-
-	if ! use bindist ; then
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-		elog
-	fi
-
-	# Ensure we have enough disk space to compile
-	CHECKREQS_DISK_BUILD="4G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in "${linguas[@]}"; do
-			xpi_unpack "${P}-${X}.xpi"
-		done
-	fi
-}
-
-src_prepare() {
-	# Apply our Thunderbird patchset
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/thunderbird"
-
-	# Apply our patchset from firefox to thunderbird as well
-	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-	popd &>/dev/null || die
-
-	if use lightning ; then
-		einfo "Fix lightning version to match upstream release"
-		einfo
-		sed -i -e 's:1.0b8pre:1.0:' "${S}"/calendar/sunbird/config/version.txt \
-			|| die "Failed to correct lightning version"
-	fi
-
-	if use crypt ; then
-		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		# Ensure enigmail can find its scripts for gpg
-		epatch "${FILESDIR}"/enigmail-1.3.3-bug373733.patch
-		cd "${S}"/mailnews/extensions/enigmail || die
-		./makemake -r 2&> /dev/null
-		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
-		cd "${S}"
-	fi
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/mozilla/config/system-headers \
-		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Use enable features
-	mozconfig_use_enable lightning calendar
-	mozconfig_use_enable gconf
-
-	# Bug #72667
-	if use mozdom; then
-		MEXTENSIONS="${MEXTENSIONS},inspector"
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable 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
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-
-	CPPFLAGS="${CPPFLAGS}" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-}
-
-src_compile() {
-	emake || die
-
-	# Only build enigmail extension if crypt enabled.
-	if use crypt ; then
-		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	declare emid
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}"/mozilla/dist/bin/xpcshell
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	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
-
-	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
-
-		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
-
-		# Fix mimetype so it shows up as a calendar application in GNOME 3
-		# This requires that the .desktop file was already installed earlier
-		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
-			-e "s:^\(Categories=\):\1Calendar;:" \
-			-i "${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	if ! [[ ${PV} =~ alpha|beta ]]; then
-		linguas
-		for X in "${linguas[@]}"; do
-			xpi_install "${WORKDIR}/${P}-${X}"
-		done
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-
-	share_plugins_dir
-}
-
-pkg_postinst() {
-	elog
-	elog "If you are experience problems with plugins please issue the"
-	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
-	elog "then restart thunderbird"
-}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index fb6347d9f421..410290656bcb 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,4 @@
-DIST postfix-2.10-20120423.tar.gz 3772514 RMD160 b16400b371d88abcbc68a7b914d4dfab941943ec SHA1 d47a1ab9367f13cb81a781ef102fd9d2483b8d72 SHA256 9966b473a5b1867011d6f4d54347e9593c0d410e9f1318d7e89009917648cc60
+DIST postfix-2.10-20120426.tar.gz 3773206 RMD160 14977ad152b7fb5821eebf0388d63ea6341b0881 SHA1 ca97562f4dcd6aa3f840795c3beea996a1c64b46 SHA256 86b79a39c338c42fa82351a79faf7415926fb382bad1aef8222fb0ff71bfbd58
 DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
 DIST postfix-2.7.5.tar.gz 3425071 RMD160 a900ff09c0a54382a4af62b609f6ddaba17963fc SHA1 066cc87f602f2daf1d3207de92ca08de9eb16bab SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
 DIST postfix-2.7.6.tar.gz 3425286 RMD160 9961b959ae34a1fe1d3bf70acce1f16e5ada255d SHA1 9a2cd652abdc0d3cf29563261d5c0f407d8d7bf9 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
diff --git a/mail-mta/postfix/postfix-2.10_pre20120423.ebuild b/mail-mta/postfix/postfix-2.10_pre20120426.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-2.10_pre20120423.ebuild
rename to mail-mta/postfix/postfix-2.10_pre20120426.ebuild
index fd3f80f26fb8..0c2d32dee065 100644
--- a/mail-mta/postfix/postfix-2.10_pre20120423.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120426.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-mta/postfix/postfix-2.10_pre20120423.ebuild,v 1.1 2012/04/24 08:50:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120426.ebuild,v 1.1 2012/04/27 05:13:00 eras Exp $
 
 EAPI=4
 
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild
index 024b15ca6c42..146a9b44d928 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild,v 1.9 2010/01/01 17:54:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1.ebuild,v 1.10 2012/04/26 21:11:19 aballier Exp $
 
 inherit font
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 63fcf4080474..0c5872412703 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild,v 1.12 2010/01/01 17:58:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild,v 1.13 2012/04/26 21:06:59 aballier Exp $
 
 inherit font font-ebdftopcf
 
@@ -16,7 +16,7 @@ SRC_URI="http://kldp.net/download.php/1429/${TTF_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
 
 S=${WORKDIR}
diff --git a/media-fonts/dejavu/dejavu-2.33.ebuild b/media-fonts/dejavu/dejavu-2.33.ebuild
index 05900fe6e7ca..18ff705befac 100644
--- a/media-fonts/dejavu/dejavu-2.33.ebuild
+++ b/media-fonts/dejavu/dejavu-2.33.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/media-fonts/dejavu/dejavu-2.33.ebuild,v 1.9 2012/02/01 09:05:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.33.ebuild,v 1.10 2012/04/26 19:28:04 aballier Exp $
 
 EAPI="4"
 
@@ -30,7 +30,7 @@ else
 fi
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 
 IUSE="fontforge"
 DEPEND="fontforge? ( x11-apps/mkfontscale
diff --git a/media-fonts/encodings/encodings-1.0.4.ebuild b/media-fonts/encodings/encodings-1.0.4.ebuild
index e98294c9b68d..45f080502aaa 100644
--- a/media-fonts/encodings/encodings-1.0.4.ebuild
+++ b/media-fonts/encodings/encodings-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# 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-fonts/encodings/encodings-1.0.4.ebuild,v 1.10 2011/02/14 17:24:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/encodings-1.0.4.ebuild,v 1.11 2012/04/26 19:27:30 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-util/font-util-1.3.0.ebuild b/media-fonts/font-util/font-util-1.3.0.ebuild
index 93e5a87c5de5..39bff227ea2d 100644
--- a/media-fonts/font-util/font-util-1.3.0.ebuild
+++ b/media-fonts/font-util/font-util-1.3.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/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.1 2012/03/04 21:01:50 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.2 2012/04/26 18:35:48 aballier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
 DESCRIPTION="X.Org font utilities"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 4a93899e708f..f010acc88000 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.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-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild,v 1.18 2011/02/06 21:22:17 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild,v 1.19 2012/04/26 21:08:25 aballier Exp $
 
 inherit font
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${PV:0:8}
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 1943087cca07..cbd22a8a65c9 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.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/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild,v 1.19 2012/01/22 22:58:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild,v 1.20 2012/04/26 20:50:41 aballier Exp $
 
 # At some point URW++ released fonts under GPL license. After that they were took
 # and improved by Valek Filippov and this work was somehow related with AFPL...
@@ -30,7 +30,7 @@ DESCRIPTION="free good quality fonts gpl'd by URW++"
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 4f3eb3f2c92f..f38ce6e80e12 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ebdftopcf-2.ebuild,v 1.15 2010/01/07 22:03:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ebdftopcf/ebdftopcf-2.ebuild,v 1.16 2012/04/26 21:06:39 aballier Exp $
 
 DESCRIPTION="ebdftopcf optimially generators PCF files from BDF files"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
index 5bfd876e6c23..7b3d84b3288c 100644
--- a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.8.0-r2.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-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.2 2011/10/13 16:59:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.3 2012/04/26 19:28:10 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/freetype/freetype-2.4.9-r1.ebuild b/media-libs/freetype/freetype-2.4.9-r1.ebuild
index 4323efec6b4d..ecff749ba85b 100644
--- a/media-libs/freetype/freetype-2.4.9-r1.ebuild
+++ b/media-libs/freetype/freetype-2.4.9-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/media-libs/freetype/freetype-2.4.9-r1.ebuild,v 1.8 2012/04/17 21:44:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.9-r1.ebuild,v 1.9 2012/04/26 19:13:28 aballier Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="FTL GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils"
 
 DEPEND="sys-libs/zlib
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index 1391e0875415..26f0c9d81c29 100644
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.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/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.16 2012/04/23 20:14:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.17 2012/04/26 21:37:16 aballier Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
 
 LICENSE="as-is BSD"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
diff --git a/media-libs/jasper/jasper-1.900.1-r4.ebuild b/media-libs/jasper/jasper-1.900.1-r4.ebuild
index fe8b61775f96..88c12c69de2c 100644
--- a/media-libs/jasper/jasper-1.900.1-r4.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r4.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-libs/jasper/jasper-1.900.1-r4.ebuild,v 1.5 2011/12/27 00:48:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r4.ebuild,v 1.6 2012/04/26 21:10:33 aballier Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip
 
 LICENSE="JasPer2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg opengl static-libs"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
index b2f2e0bf798f..407fba276502 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.11-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/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild,v 1.11 2012/03/18 17:37:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild,v 1.12 2012/04/26 20:48:37 aballier Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="http://ghostscript.com/~giles/jbig2/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( >=media-libs/libpng-1.2:0 )"
diff --git a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
index bd91bde3aad8..b453e17124d1 100644
--- a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.0-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/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.13 2012/03/12 19:48:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.14 2012/04/26 20:30:05 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}
diff --git a/media-libs/lcms/lcms-1.19.ebuild b/media-libs/lcms/lcms-1.19.ebuild
index c9109ae76e54..beb417b3df31 100644
--- a/media-libs/lcms/lcms-1.19.ebuild
+++ b/media-libs/lcms/lcms-1.19.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/media-libs/lcms/lcms-1.19.ebuild,v 1.12 2012/02/20 08:08:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.13 2012/04/26 20:40:16 aballier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="jpeg python static-libs tiff zlib"
 
 RDEPEND="tiff? ( media-libs/tiff:0 )
diff --git a/media-libs/lcms/lcms-2.3.ebuild b/media-libs/lcms/lcms-2.3.ebuild
index 9e3d7b659fce..9abe3abcc294 100644
--- a/media-libs/lcms/lcms-2.3.ebuild
+++ b/media-libs/lcms/lcms-2.3.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/media-libs/lcms/lcms-2.3.ebuild,v 1.4 2012/02/07 17:25:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.3.ebuild,v 1.5 2012/04/26 20:40:16 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc jpeg static-libs test tiff zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/libpng/libpng-1.5.10.ebuild b/media-libs/libpng/libpng-1.5.10.ebuild
index 03141904bcf6..0bdd7899fdcb 100644
--- a/media-libs/libpng/libpng-1.5.10.ebuild
+++ b/media-libs/libpng/libpng-1.5.10.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/media-libs/libpng/libpng-1.5.10.ebuild,v 1.7 2012/04/17 21:21:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.8 2012/04/26 20:14:33 aballier Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.ebuild b/media-libs/openjpeg/openjpeg-1.5.0.ebuild
index 758e1a910855..8b09a3a1105d 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.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/media-libs/openjpeg/openjpeg-1.5.0.ebuild,v 1.10 2012/04/21 17:29:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.0.ebuild,v 1.11 2012/04/26 20:41:06 aballier Exp $
 
 EAPI=4
 inherit cmake-utils multilib
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="media-libs/lcms:2
diff --git a/media-libs/tiff/tiff-4.0.1-r1.ebuild b/media-libs/tiff/tiff-4.0.1-r1.ebuild
index f3bdfc53bb44..fb6d1410bb99 100644
--- a/media-libs/tiff/tiff-4.0.1-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.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/media-libs/tiff/tiff-4.0.1-r1.ebuild,v 1.8 2012/04/21 16:57:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.1-r1.ebuild,v 1.9 2012/04/26 20:36:59 aballier Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
index ef0dc270da06..dc84277e7c2c 100644
--- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.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/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.4 2012/04/21 19:34:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.5 2012/04/26 17:45:21 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
 	_live_inherits="autotools mercurial"
 else
-	KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+	KEYWORDS="amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 fi
 
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index 0db97f64f376..88ae0f41fb95 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -1,2 +1 @@
 DIST vdr-osdteletext-0.9.1.tgz 61037 RMD160 84305011858e327a402ecf71bd4276bf3a457460 SHA1 6dd6c4fb35237062e637a85ecec445c8e203e251 SHA256 7cfaf3d1e475bf46f01d924b48ff8061e08da9c488706cf249e94b9863139eb1
-DIST vdr-osdteletext-0.9.3.tgz 60215 RMD160 8f057acf673157b529e471124a334a2e016a6694 SHA1 2b73affcc1fc1ac89a9f90d21e2139418f17beaa SHA256 e7f9849d8e08b4f251fc73c260b39218a8b9f0ef06ae5306629b657ea3660c18
diff --git a/media-plugins/vdr-osdteletext/files/confd-v2 b/media-plugins/vdr-osdteletext/files/confd-v2
deleted file mode 100644
index 12bb31f794ff..000000000000
--- a/media-plugins/vdr-osdteletext/files/confd-v2
+++ /dev/null
@@ -1,38 +0,0 @@
-# /etc/conf.d/vdr.osdteletext
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/files/confd-v2,v 1.1 2012/04/18 17:33:35 hd_brummy Exp $
-
-# ################################################
-#
-# for minimal activity on your Harddisc
-# store the vtx files in a temp filesystem
-#	allowed values: yes no
-#	default: yes
-#OSDTELETEXT_TMPFS=yes
-
-
-# #########  Expert Functions  ###################
-#
-# set the size of the videotext store
-# (when using TMPFS this is taken from RAM)
-# 	allowed values: size in megabyte
-#	default: 20	# used 20 Mb for videotext
-#OSDTELETEXT_SIZE=20
-
-# set the dir of the tmpfs
-#	allowed values: directory names
-#	default: /var/cache/osdteletext
-#OSDTELETEXT_DIR=/var/cache/osdteletext
-
-# store top text pages at cache. (unviewable pages)
-#	allowed values: yes no
-#	default: no
-#OSDTELETEXT_STORETOPTEXT=no
-
-# ########  NOTE! ################################
-#
-# User with an old install have an entry like
-#
-# tmpfs          /vtx        tmpfs       size=20M        0 0
-#
-# in the /etc/fstab
-# you can remove the entry, not needed anymore.
diff --git a/media-plugins/vdr-osdteletext/files/rc-addon-v2.sh b/media-plugins/vdr-osdteletext/files/rc-addon-v2.sh
deleted file mode 100644
index 2bc0662bc45f..000000000000
--- a/media-plugins/vdr-osdteletext/files/rc-addon-v2.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/files/rc-addon-v2.sh,v 1.1 2012/04/18 17:33:35 hd_brummy Exp $
-#
-# rc-addon-script for plugin osdteletext
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-# Matthias Schwarzott <zzam@gentoo.org>
-
-: ${OSDTELETEXT_TMPFS:=yes}
-: ${OSDTELETEXT_SIZE:=20}
-: ${OSDTELETEXT_DIR:=/var/cache/osdteletext}
-: ${OSDTELETEXT_STORETOPTEXT:=no}
-
-plugin_pre_vdr_start() {
-	add_plugin_param "-d ${OSDTELETEXT_DIR}"
-	add_plugin_param "-n ${OSDTELETEXT_SIZE}"
-
-	if [ "${OSDTELETEXT_STORETOPTEXT}" = "yes" ]; then
-		add_plugin_param "-t"
-	fi
-
-	if [ "${OSDTELETEXT_TMPFS}" = "yes" ]; then
-		## test on mountet TMPFS
-		if /bin/mount | /bin/grep -q ${OSDTELETEXT_DIR} ; then
-			:
-		else
-			einfo_level2 mounting videotext dir ${OSDTELETEXT_DIR}
-			/bin/mount -t tmpfs -o size=${OSDTELETEXT_SIZE}m,uid=vdr,gid=vdr tmpfs ${OSDTELETEXT_DIR}
-		fi
-	fi
-}
-
-plugin_post_vdr_stop() {
-	if [ "${OSDTELETEXT_TMPFS}" = "yes" ]; then
-		if /bin/mount | /bin/grep -q ${OSDTELETEXT_DIR} ; then
-			einfo_level2 unmounting videotext dir ${OSDTELETEXT_DIR}
-			/bin/umount ${OSDTELETEXT_DIR}
-		fi
-	fi
-}
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.3.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.3.ebuild
deleted file mode 100644
index 89b0c3260a68..000000000000
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.3.ebuild,v 1.2 2012/04/23 21:17:16 hd_brummy Exp ${VDRPLUGIN}/vdr-${VDRPLUGIN}-0.3.1.ebuild,v 1.1 2003/05/13 09:39:19 fow0ryl Exp $
-
-EAPI="4"
-
-inherit vdr-plugin
-
-VERSION="912" # every bump, new version
-
-DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext on the OSD"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-osdteletext"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.5.7"
-RDEPEND="${DEPEND}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-v2.sh"
-VDR_CONFD_FILE="${FILESDIR}/confd-v2"
-
-src_install() {
-	vdr-plugin_src_install
-
-	# create the teletext directory
-	diropts -m755 -ovdr -gvdr
-	keepdir /var/cache/${VDRPLUGIN}
-}
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 37b9640e6ce9..dc439f7e84f5 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<longdescription lang="en">
-	</longdescription>
+<herd>qt</herd>
 </pkgmetadata>
-
diff --git a/media-video/qt-recordmydesktop/metadata.xml b/media-video/qt-recordmydesktop/metadata.xml
index 6466a303e4bf..d2d9d54f60f2 100644
--- a/media-video/qt-recordmydesktop/metadata.xml
+++ b/media-video/qt-recordmydesktop/metadata.xml
@@ -3,8 +3,4 @@
 <pkgmetadata>
 <herd>video</herd>
 <herd>qt</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
-
diff --git a/metadata/cache/app-admin/eselect-ctags-1.13 b/metadata/cache/app-admin/eselect-ctags-1.13
index 1546072424a3..fd02f8c7c78a 100644
--- a/metadata/cache/app-admin/eselect-ctags-1.13
+++ b/metadata/cache/app-admin/eselect-ctags-1.13
@@ -6,7 +6,7 @@ mirror://gentoo/eselect-emacs-1.13.tar.bz2
 http://www.gentoo.org/proj/en/lisp/emacs/
 GPL-2
 Manages ctags implementations
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-admin/eselect-fontconfig-1.1 b/metadata/cache/app-admin/eselect-fontconfig-1.1
index 6cfcc66d7f3e..84b5d2cba916 100644
--- a/metadata/cache/app-admin/eselect-fontconfig-1.1
+++ b/metadata/cache/app-admin/eselect-fontconfig-1.1
@@ -6,7 +6,7 @@ mirror://gentoo/fontconfig.eselect-1.1.bz2
 http://www.gentoo.org
 GPL-2
 An eselect module to manage /etc/fonts/conf.d symlinks.
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-admin/eselect-ruby-20120106 b/metadata/cache/app-admin/eselect-ruby-20120106
index bd55c61a5eb3..c793fdd19c68 100644
--- a/metadata/cache/app-admin/eselect-ruby-20120106
+++ b/metadata/cache/app-admin/eselect-ruby-20120106
@@ -6,7 +6,7 @@ http://dev.a3li.li/gentoo/distfiles/ruby.eselect-20120106.bz2
 http://www.gentoo.org
 GPL-2
 Manages multiple Ruby versions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 
 
 
diff --git a/metadata/cache/app-admin/eselect-vi-1.1.7-r1 b/metadata/cache/app-admin/eselect-vi-1.1.7-r1
index b0e4c6f32b82..19d74cbfbefa 100644
--- a/metadata/cache/app-admin/eselect-vi-1.1.7-r1
+++ b/metadata/cache/app-admin/eselect-vi-1.1.7-r1
@@ -6,7 +6,7 @@ mirror://gentoo/vi.eselect-1.1.7.bz2
 http://www.gentoo.org/
 GPL-2
 Manages the /usr/bin/vi symlink
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-admin/gam-server-0.1.10 b/metadata/cache/app-admin/gam-server-0.1.10
index 0fec8e6ce5e1..6a797d42be02 100644
--- a/metadata/cache/app-admin/gam-server-0.1.10
+++ b/metadata/cache/app-admin/gam-server-0.1.10
@@ -6,7 +6,7 @@ mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.
 http://www.gnome.org/~veillard/gamin/
 LGPL-2
 Library providing the FAM File Alteration Monitor API
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic gnome.org libtool multilib python toolchain-funcs user versionator
 debug kernel_linux
 
diff --git a/metadata/cache/app-admin/gamin-0.1.10 b/metadata/cache/app-admin/gamin-0.1.10
index 3cf177b27209..e3c5ff1fe069 100644
--- a/metadata/cache/app-admin/gamin-0.1.10
+++ b/metadata/cache/app-admin/gamin-0.1.10
@@ -6,7 +6,7 @@
 http://www.gnome.org/~veillard/gamin/
 LGPL-2
 Meta package providing the File Alteration Monitor API & Server
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-arch/gzip-1.4 b/metadata/cache/app-arch/gzip-1.4
index 892ec6c52e38..eaf3108ada5e 100644
--- a/metadata/cache/app-arch/gzip-1.4
+++ b/metadata/cache/app-arch/gzip-1.4
@@ -6,7 +6,7 @@ mirror://gnu-alpha/gzip/gzip-1.4.tar.gz mirror://gnu/gzip/gzip-1.4.tar.gz mirror
 http://www.gnu.org/software/gzip/
 GPL-2
 Standard GNU compressor
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 nls pic static
 
diff --git a/metadata/cache/app-arch/rpm2targz-9.0.0.4g b/metadata/cache/app-arch/rpm2targz-9.0.0.4g
index d02301953c05..83a7d8029349 100644
--- a/metadata/cache/app-arch/rpm2targz-9.0.0.4g
+++ b/metadata/cache/app-arch/rpm2targz-9.0.0.4g
@@ -6,7 +6,7 @@ mirror://gentoo/rpm2targz-9.0.0.4g.tar.lzma
 http://www.slackware.com/config/packages.php
 as-is
 Convert a .rpm file to a .tar.gz archive
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/app-arch/unzip-6.0-r3 b/metadata/cache/app-arch/unzip-6.0-r3
index f0cc39ebcc17..3dc4677fb65b 100644
--- a/metadata/cache/app-arch/unzip-6.0-r3
+++ b/metadata/cache/app-arch/unzip-6.0-r3
@@ -6,7 +6,7 @@ mirror://sourceforge/infozip/unzip60.tar.gz
 http://www.info-zip.org/
 Info-ZIP
 unzipper for pkzip-compressed files
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 bzip2 natspec unicode
 
diff --git a/metadata/cache/app-cdr/dvdisaster-0.72.4 b/metadata/cache/app-cdr/dvdisaster-0.72.4
new file mode 100644
index 000000000000..f985afa3e221
--- /dev/null
+++ b/metadata/cache/app-cdr/dvdisaster-0.72.4
@@ -0,0 +1,22 @@
+app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2 dev-util/pkgconfig virtual/os-headers >=sys-apps/sed-4
+app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2
+0
+mirror://debian/pool/main/d/dvdisaster/dvdisaster_0.72.4.orig.tar.bz2
+
+http://dvdisaster.sourceforge.net/
+GPL-2
+Data-protection and recovery tool for DVDs
+~amd64 ~ppc ~x86
+eutils gnome2-utils multilib toolchain-funcs user
+debug nls linguas_cs linguas_de linguas_it linguas_pt_BR linguas_ru linguas_sv
+
+
+
+4
+
+compile configure install postinst postrm preinst
+
+
+
+
+
diff --git a/metadata/cache/app-crypt/p11-kit-0.12 b/metadata/cache/app-crypt/p11-kit-0.12
index d59608b7ac17..01313842433f 100644
--- a/metadata/cache/app-crypt/p11-kit-0.12
+++ b/metadata/cache/app-crypt/p11-kit-0.12
@@ -6,7 +6,7 @@ http://p11-glue.freedesktop.org/releases/p11-kit-0.12.tar.gz
 http://p11-glue.freedesktop.org/p11-kit.html
 MIT
 Provides a standard configuration setup for installing PKCS#11.
-alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 debug
 
diff --git a/metadata/cache/app-doc/doxygen-1.8.0 b/metadata/cache/app-doc/doxygen-1.8.0
index 8d9eecad82cd..c752ad335b41 100644
--- a/metadata/cache/app-doc/doxygen-1.8.0
+++ b/metadata/cache/app-doc/doxygen-1.8.0
@@ -6,9 +6,9 @@ mirror
 http://www.doxygen.org/
 GPL-2
 Documentation system for most programming languages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils fdo-mime flag-o-matic multilib python qt4-r2 toolchain-funcs user
-debug doc dot qt4 latex elibc_FreeBSD linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
+debug doc dot qt4 latex elibc_FreeBSD userland_GNU linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
 
 
 
diff --git a/metadata/cache/app-editors/vim-7.3.502 b/metadata/cache/app-editors/vim-7.3.502
index 60dfe9e1b52c..c39f84b88810 100644
--- a/metadata/cache/app-editors/vim-7.3.502
+++ b/metadata/cache/app-editors/vim-7.3.502
@@ -6,7 +6,7 @@ ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/v
 http://www.vim.org/
 vim
 Vim, an improved vi-style text editor
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 bash-completion-r1 eutils fdo-mime flag-o-matic multilib prefix python toolchain-funcs user versionator vim vim-doc
 nls acl cscope debug gpm perl python ruby X minimal vim-pager
 
diff --git a/metadata/cache/app-editors/vim-core-7.3.502 b/metadata/cache/app-editors/vim-core-7.3.502
index 84e0d871620a..c15301f5cfe9 100644
--- a/metadata/cache/app-editors/vim-core-7.3.502
+++ b/metadata/cache/app-editors/vim-core-7.3.502
@@ -6,7 +6,7 @@ ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/v
 http://www.vim.org/
 vim
 vim and gvim shared files
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 bash-completion-r1 eutils fdo-mime flag-o-matic multilib prefix python toolchain-funcs user versionator vim vim-doc
 nls acl livecd
 
diff --git a/metadata/cache/app-emulation/libguestfs-1.17.21 b/metadata/cache/app-emulation/libguestfs-1.17.21
deleted file mode 100644
index b4e76f562dec..000000000000
--- a/metadata/cache/app-emulation/libguestfs-1.17.21
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
-0
-http://libguestfs.org/download/1.17-development/libguestfs-1.17.21.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
-
-http://libguestfs.org/
-GPL-2 LGPL-2
-Tools for accessing, inspect and modifying virtual machine (VM) disk images
-~amd64
-autotools autotools-utils base bash-completion-r1 check-reqs eutils libtool linux-info multilib perl-module toolchain-funcs user versionator
-bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection
-
-
-
-4
-
-compile configure install prepare pretend setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/libguestfs-1.17.26 b/metadata/cache/app-emulation/libguestfs-1.17.26
deleted file mode 100644
index 5a620df63d48..000000000000
--- a/metadata/cache/app-emulation/libguestfs-1.17.26
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
-0
-http://libguestfs.org/download/1.17-development/libguestfs-1.17.26.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
-
-http://libguestfs.org/
-GPL-2 LGPL-2
-Tools for accessing, inspect and modifying virtual machine (VM) disk images
-~amd64
-autotools autotools-utils base bash-completion-r1 check-reqs eutils libtool linux-info multilib perl-module toolchain-funcs user versionator
-bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection
-
-
-
-4
-
-compile configure install prepare pretend setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/libguestfs-1.17.32 b/metadata/cache/app-emulation/libguestfs-1.17.32
index 3a30ef50ab22..f926e12d5d66 100644
--- a/metadata/cache/app-emulation/libguestfs-1.17.32
+++ b/metadata/cache/app-emulation/libguestfs-1.17.32
@@ -1,5 +1,5 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
+>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl dev-util/gtk-doc app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl dev-util/gtk-doc app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
 0
 http://libguestfs.org/download/1.17-development/libguestfs-1.17.32.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
 
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.10 b/metadata/cache/app-emulation/virtualbox-4.1.14
similarity index 52%
rename from metadata/cache/app-emulation/virtualbox-4.1.10
rename to metadata/cache/app-emulation/virtualbox-4.1.14
index 9dfc47312f04..6603ad24af0e 100644
--- a/metadata/cache/app-emulation/virtualbox-4.1.10
+++ b/metadata/cache/app-emulation/virtualbox-4.1.14
@@ -1,7 +1,7 @@
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 
 http://www.virtualbox.org/
 GPL-2
@@ -10,7 +10,7 @@ Family of powerful x86 virtualization products for enterprise as well as home us
 base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
 +additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
 java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-additions? ( ~app-emulation/virtualbox-additions-4.1.10 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.10 )
+additions? ( ~app-emulation/virtualbox-additions-4.1.14 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.14 )
 
 4
 
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.4 b/metadata/cache/app-emulation/virtualbox-4.1.4
deleted file mode 100644
index 7dfdce92a566..000000000000
--- a/metadata/cache/app-emulation/virtualbox-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.5 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 x86
-base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
-+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-additions? ( ~app-emulation/virtualbox-additions-4.1.4 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.4 )
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.8 b/metadata/cache/app-emulation/virtualbox-4.1.8
deleted file mode 100644
index 6ff0b9e279d9..000000000000
--- a/metadata/cache/app-emulation/virtualbox-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 x86
-base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
-+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-additions? ( ~app-emulation/virtualbox-additions-4.1.8 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.8 )
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.8-r1 b/metadata/cache/app-emulation/virtualbox-4.1.8-r1
deleted file mode 100644
index 9bc86bf85449..000000000000
--- a/metadata/cache/app-emulation/virtualbox-4.1.8-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-Family of powerful x86 virtualization products for enterprise as well as home use
-~amd64 ~x86
-base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
-+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-additions? ( ~app-emulation/virtualbox-additions-4.1.8 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.8 )
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-additions-4.1.10 b/metadata/cache/app-emulation/virtualbox-additions-4.1.14
similarity index 74%
rename from metadata/cache/app-emulation/virtualbox-additions-4.1.10
rename to metadata/cache/app-emulation/virtualbox-additions-4.1.14
index 365e1331db2b..2014b73797d5 100644
--- a/metadata/cache/app-emulation/virtualbox-additions-4.1.10
+++ b/metadata/cache/app-emulation/virtualbox-additions-4.1.14
@@ -1,7 +1,7 @@
 
 !app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 0
-http://download.virtualbox.org/virtualbox/4.1.10/VBoxGuestAdditions_4.1.10.iso
+http://download.virtualbox.org/virtualbox/4.1.14/VBoxGuestAdditions_4.1.14.iso
 mirror
 http://www.virtualbox.org/
 PUEL
diff --git a/metadata/cache/app-emulation/virtualbox-additions-4.1.4 b/metadata/cache/app-emulation/virtualbox-additions-4.1.4
deleted file mode 100644
index acd41f20c1ad..000000000000
--- a/metadata/cache/app-emulation/virtualbox-additions-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-0
-http://download.virtualbox.org/virtualbox/4.1.4/VBoxGuestAdditions_4.1.4.iso
-mirror
-http://www.virtualbox.org/
-PUEL
-CD image containing guest additions for VirtualBox
-amd64 x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-additions-4.1.8 b/metadata/cache/app-emulation/virtualbox-additions-4.1.8
deleted file mode 100644
index 63ee4a50e575..000000000000
--- a/metadata/cache/app-emulation/virtualbox-additions-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-0
-http://download.virtualbox.org/virtualbox/4.1.8/VBoxGuestAdditions_4.1.8.iso
-mirror
-http://www.virtualbox.org/
-PUEL
-CD image containing guest additions for VirtualBox
-amd64 x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.10 b/metadata/cache/app-emulation/virtualbox-bin-4.1.14
similarity index 65%
rename from metadata/cache/app-emulation/virtualbox-bin-4.1.10
rename to metadata/cache/app-emulation/virtualbox-bin-4.1.14
index fc6d6703195a..d3af3410f07f 100644
--- a/metadata/cache/app-emulation/virtualbox-bin-4.1.10
+++ b/metadata/cache/app-emulation/virtualbox-bin-4.1.14
@@ -1,7 +1,7 @@
 app-arch/unzip >=sys-apps/sed-4
-!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.10 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.14 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
 0
-amd64? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10-76795-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10-76795-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBoxSDK-4.1.10-76795.zip ) http://download.virtualbox.org/virtualbox/4.1.10/Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz
+amd64? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14-77440-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14-77440-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBoxSDK-4.1.14-77440.zip ) http://download.virtualbox.org/virtualbox/4.1.14/Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz
 mirror
 http://www.virtualbox.org/
 GPL-2 PUEL
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.4 b/metadata/cache/app-emulation/virtualbox-bin-4.1.4
deleted file mode 100644
index c4968a0a0dc8..000000000000
--- a/metadata/cache/app-emulation/virtualbox-bin-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip
-!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.4 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-0
-amd64? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4-74291-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4-74291-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBoxSDK-4.1.4-74291.zip ) http://download.virtualbox.org/virtualbox/4.1.4/Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz
-mirror
-http://www.virtualbox.org/
-GPL-2 PUEL
-Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 x86
-eutils fdo-mime multilib pax-utils toolchain-funcs unpacker user
-+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp
-
-
-
-2
-
-install postinst postrm unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.8 b/metadata/cache/app-emulation/virtualbox-bin-4.1.8
deleted file mode 100644
index 522937b36198..000000000000
--- a/metadata/cache/app-emulation/virtualbox-bin-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip >=sys-apps/sed-4
-!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.8 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-0
-amd64? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8-75467-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8-75467-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBoxSDK-4.1.8-75467.zip ) http://download.virtualbox.org/virtualbox/4.1.8/Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz
-mirror
-http://www.virtualbox.org/
-GPL-2 PUEL
-Family of powerful x86 virtualization products for enterprise as well as home use
-amd64 x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib pax-utils toolchain-funcs unpacker user versionator
-+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.10 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.10
deleted file mode 100644
index 072f0d399a2e..000000000000
--- a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.10
+++ /dev/null
@@ -1,22 +0,0 @@
-
-~app-emulation/virtualbox-4.1.10
-0
-http://download.virtualbox.org/virtualbox/4.1.10/Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz
-mirror strip
-http://www.virtualbox.org/
-PUEL
-PUEL extensions for VirtualBox
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.14 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.14
new file mode 100644
index 000000000000..6b0890f59f4f
--- /dev/null
+++ b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.14
@@ -0,0 +1,22 @@
+
+~app-emulation/virtualbox-4.1.14
+0
+http://download.virtualbox.org/virtualbox/4.1.14/Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz
+mirror strip
+http://www.virtualbox.org/
+PUEL
+PUEL extensions for VirtualBox
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+2
+
+install
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4
deleted file mode 100644
index 0f2740670ff0..000000000000
--- a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-
-~app-emulation/virtualbox-4.1.4
-0
-http://download.virtualbox.org/virtualbox/4.1.4/Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz
-mirror strip
-http://www.virtualbox.org/
-PUEL
-PUEL extensions for VirtualBox
-amd64 x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.8 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.8
deleted file mode 100644
index a68330c6d544..000000000000
--- a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-
-~app-emulation/virtualbox-4.1.8
-0
-http://download.virtualbox.org/virtualbox/4.1.8/Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz
-mirror strip
-http://www.virtualbox.org/
-PUEL
-PUEL extensions for VirtualBox
-amd64 x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.10 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.14
similarity index 82%
rename from metadata/cache/app-emulation/virtualbox-guest-additions-4.1.10
rename to metadata/cache/app-emulation/virtualbox-guest-additions-4.1.14
index 579e986aaada..73752e24b355 100644
--- a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.10
+++ b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.14
@@ -1,7 +1,7 @@
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+X? ( ~x11-drivers/xf86-video-virtualbox-4.1.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+X? ( ~x11-drivers/xf86-video-virtualbox-4.1.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 0
-http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 
 http://www.virtualbox.org/
 GPL-2
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
deleted file mode 100644
index 012cb5e0a43d..000000000000
--- a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.4 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.4 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-0
-http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox kernel modules and user-space tools for Linux guests
-amd64 x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-X kernel_linux
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.8 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.8
deleted file mode 100644
index 9c0acac0442b..000000000000
--- a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.8 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.8 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-0
-http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox kernel modules and user-space tools for Linux guests
-amd64 x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-X kernel_linux
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-modules-4.1.10 b/metadata/cache/app-emulation/virtualbox-modules-4.1.14
similarity index 95%
rename from metadata/cache/app-emulation/virtualbox-modules-4.1.10
rename to metadata/cache/app-emulation/virtualbox-modules-4.1.14
index 2c2cbf39a617..5041178099e5 100644
--- a/metadata/cache/app-emulation/virtualbox-modules-4.1.10
+++ b/metadata/cache/app-emulation/virtualbox-modules-4.1.14
@@ -1,7 +1,7 @@
 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 !=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 0
-http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.10.tar.xz
+http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.14.tar.xz
 
 http://www.virtualbox.org/
 GPL-2
diff --git a/metadata/cache/app-emulation/virtualbox-modules-4.1.4 b/metadata/cache/app-emulation/virtualbox-modules-4.1.4
deleted file mode 100644
index 507c41633457..000000000000
--- a/metadata/cache/app-emulation/virtualbox-modules-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.4.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-Kernel Modules for Virtualbox
-amd64 x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-pax_kernel kernel_linux
-
-
-
-2
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-modules-4.1.8 b/metadata/cache/app-emulation/virtualbox-modules-4.1.8
deleted file mode 100644
index 3486e5eb87ee..000000000000
--- a/metadata/cache/app-emulation/virtualbox-modules-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.8.tar.xz
-
-http://www.virtualbox.org/
-GPL-2
-Kernel Modules for Virtualbox
-amd64 x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-pax_kernel kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-i18n/unicode-data-6.0.0 b/metadata/cache/app-i18n/unicode-data-6.0.0
index 4f38c83da107..6692cfc37368 100644
--- a/metadata/cache/app-i18n/unicode-data-6.0.0
+++ b/metadata/cache/app-i18n/unicode-data-6.0.0
@@ -6,7 +6,7 @@ mirror://debian/pool/main/u/unicode-data/unicode-data_6.0.0.orig.tar.gz
 http://unicode.org/
 unicode
 Unicode data from unicode.org
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 
 
 
diff --git a/metadata/cache/app-misc/getopt-1.1.4 b/metadata/cache/app-misc/getopt-1.1.4
index 760598aac479..9f2d1a1d67c1 100644
--- a/metadata/cache/app-misc/getopt-1.1.4
+++ b/metadata/cache/app-misc/getopt-1.1.4
@@ -6,7 +6,7 @@ http://software.frodo.looijaard.name/getopt/files/getopt-1.1.4.tar.gz
 http://software.frodo.looijaard.name/getopt/
 GPL-2
 getopt(1) replacement supporting GNU-style long options
-~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 nls
 
diff --git a/metadata/cache/app-office/calligra-2.4.1 b/metadata/cache/app-office/calligra-2.4.1
new file mode 100644
index 000000000000..75e7bcd8b686
--- /dev/null
+++ b/metadata/cache/app-office/calligra-2.4.1
@@ -0,0 +1,22 @@
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base =dev-libs/libpqxx-3* ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base =dev-libs/libpqxx-3* ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+4
+mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
+test
+http://www.calligra.org/
+GPL-2
+KDE Office Suite
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/calligra-l10n-2.3.92 b/metadata/cache/app-office/calligra-l10n-2.3.92
deleted file mode 100644
index 5c975f8e6613..000000000000
--- a/metadata/cache/app-office/calligra-l10n-2.3.92
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-linguas_ca? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ca-2.3.92.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ca@valencia-2.3.92.tar.bz2 ) linguas_cs? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-cs-2.3.92.tar.bz2 ) linguas_da? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-da-2.3.92.tar.bz2 ) linguas_de? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-de-2.3.92.tar.bz2 ) linguas_el? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-el-2.3.92.tar.bz2 ) linguas_en_GB? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-en_GB-2.3.92.tar.bz2 ) linguas_es? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-es-2.3.92.tar.bz2 ) linguas_et? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-et-2.3.92.tar.bz2 ) linguas_fr? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-fr-2.3.92.tar.bz2 ) linguas_it? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-it-2.3.92.tar.bz2 ) linguas_kk? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-kk-2.3.92.tar.bz2 ) linguas_nb? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nb-2.3.92.tar.bz2 ) linguas_nds? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nds-2.3.92.tar.bz2 ) linguas_nl? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nl-2.3.92.tar.bz2 ) linguas_pl? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pl-2.3.92.tar.bz2 ) linguas_pt? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pt-2.3.92.tar.bz2 ) linguas_pt_BR? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pt_BR-2.3.92.tar.bz2 ) linguas_ru? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ru-2.3.92.tar.bz2 ) linguas_sv? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-sv-2.3.92.tar.bz2 ) linguas_uk? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-uk-2.3.92.tar.bz2 ) linguas_zh_CN? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-zh_CN-2.3.92.tar.bz2 ) linguas_zh_TW? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-zh_TW-2.3.92.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-Calligra localization package
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-l10n-2.4.1 b/metadata/cache/app-office/calligra-l10n-2.4.1
new file mode 100644
index 000000000000..302afa1d1b7d
--- /dev/null
+++ b/metadata/cache/app-office/calligra-l10n-2.4.1
@@ -0,0 +1,22 @@
+sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca-2.4.1.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca@valencia-2.4.1.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-cs-2.4.1.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-da-2.4.1.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-de-2.4.1.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-el-2.4.1.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-en_GB-2.4.1.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-es-2.4.1.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-et-2.4.1.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fi-2.4.1.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fr-2.4.1.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-hu-2.4.1.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-it-2.4.1.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-kk-2.4.1.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nb-2.4.1.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nds-2.4.1.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nl-2.4.1.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pl-2.4.1.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt-2.4.1.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt_BR-2.4.1.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ru-2.4.1.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sk-2.4.1.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sv-2.4.1.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-uk-2.4.1.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_CN-2.4.1.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_TW-2.4.1.tar.bz2 )
+
+http://www.kde.org/
+GPL-2
+Calligra localization package
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-portage/gentoolkit-0.3.0.6 b/metadata/cache/app-portage/gentoolkit-0.3.0.6
index feb0748435a2..11d602797a41 100644
--- a/metadata/cache/app-portage/gentoolkit-0.3.0.6
+++ b/metadata/cache/app-portage/gentoolkit-0.3.0.6
@@ -6,7 +6,7 @@ mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
 http://www.gentoo.org/proj/en/portage/tools/index.xml
 GPL-2
 Collection of administration scripts for Gentoo
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 distutils eutils multilib python toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/asciidoc-8.6.7 b/metadata/cache/app-text/asciidoc-8.6.7
index 25a68ccc0199..634d6958548c 100644
--- a/metadata/cache/app-text/asciidoc-8.6.7
+++ b/metadata/cache/app-text/asciidoc-8.6.7
@@ -6,7 +6,7 @@ mirror://sourceforge/project/asciidoc/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz
 http://www.methods.co.nz/asciidoc/
 GPL-2
 A text document format for writing short documents, articles, books and UNIX man pages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 multilib python toolchain-funcs
 examples graphviz highlight test vim-syntax
 
diff --git a/metadata/cache/app-text/build-docbook-catalog-1.19 b/metadata/cache/app-text/build-docbook-catalog-1.19
index b95bf720cf42..f73449aef1c0 100644
--- a/metadata/cache/app-text/build-docbook-catalog-1.19
+++ b/metadata/cache/app-text/build-docbook-catalog-1.19
@@ -6,7 +6,7 @@ mirror://gentoo/build-docbook-catalog-1.19.tar.xz http://dev.gentoo.org/~vapier/
 http://sources.gentoo.org/gentoo-src/build-docbook-catalog/
 GPL-2
 DocBook XML catalog auto-updater
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 
 
 
diff --git a/metadata/cache/app-text/djvu-3.5.24-r1 b/metadata/cache/app-text/djvu-3.5.24-r1
index 62a1475eeced..a1bddaa518cc 100644
--- a/metadata/cache/app-text/djvu-3.5.24-r1
+++ b/metadata/cache/app-text/djvu-3.5.24-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/djvu/djvulibre-3.5.24.tar.gz
 http://djvu.sourceforge.net/
 GPL-2
 DjVu viewers, encoders and utilities
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils fdo-mime flag-o-matic libtool multilib toolchain-funcs user
 debug doc jpeg nls tiff xml linguas_ja
 
diff --git a/metadata/cache/app-text/docbook-sgml-dtd-3.0-r3 b/metadata/cache/app-text/docbook-sgml-dtd-3.0-r3
index 35a5d3499bc7..cf877ee54f14 100644
--- a/metadata/cache/app-text/docbook-sgml-dtd-3.0-r3
+++ b/metadata/cache/app-text/docbook-sgml-dtd-3.0-r3
@@ -6,7 +6,7 @@ http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
 http://www.docbook.org/sgml/
 as-is
 Docbook SGML DTD 3.0
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-sgml-dtd-3.1-r3 b/metadata/cache/app-text/docbook-sgml-dtd-3.1-r3
index db447411accb..9e94cebca424 100644
--- a/metadata/cache/app-text/docbook-sgml-dtd-3.1-r3
+++ b/metadata/cache/app-text/docbook-sgml-dtd-3.1-r3
@@ -6,7 +6,7 @@ http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
 http://www.docbook.org/sgml/
 as-is
 Docbook SGML DTD 3.1
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xml-dtd-4.1.2-r6 b/metadata/cache/app-text/docbook-xml-dtd-4.1.2-r6
index 08416a7df975..29e25fadf07f 100644
--- a/metadata/cache/app-text/docbook-xml-dtd-4.1.2-r6
+++ b/metadata/cache/app-text/docbook-xml-dtd-4.1.2-r6
@@ -6,7 +6,7 @@ http://www.docbook.org/xml/4.1.2/docbkx412.zip
 http://www.docbook.org/
 as-is
 Docbook DTD for XML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xml-dtd-4.2-r2 b/metadata/cache/app-text/docbook-xml-dtd-4.2-r2
index 479c049311fd..4ba371c40a1e 100644
--- a/metadata/cache/app-text/docbook-xml-dtd-4.2-r2
+++ b/metadata/cache/app-text/docbook-xml-dtd-4.2-r2
@@ -6,7 +6,7 @@ http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
 http://www.docbook.org/
 as-is
 Docbook DTD for XML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xml-dtd-4.3-r1 b/metadata/cache/app-text/docbook-xml-dtd-4.3-r1
index f03a250b3d81..4081db7557fc 100644
--- a/metadata/cache/app-text/docbook-xml-dtd-4.3-r1
+++ b/metadata/cache/app-text/docbook-xml-dtd-4.3-r1
@@ -6,7 +6,7 @@ http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
 http://www.docbook.org/
 as-is
 Docbook DTD for XML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xml-dtd-4.4-r2 b/metadata/cache/app-text/docbook-xml-dtd-4.4-r2
index aca7ab765f56..1b03e3127b62 100644
--- a/metadata/cache/app-text/docbook-xml-dtd-4.4-r2
+++ b/metadata/cache/app-text/docbook-xml-dtd-4.4-r2
@@ -6,7 +6,7 @@ http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
 http://www.docbook.org/
 as-is
 Docbook DTD for XML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xml-dtd-4.5-r1 b/metadata/cache/app-text/docbook-xml-dtd-4.5-r1
index a26113e0097d..4df63e6c54a1 100644
--- a/metadata/cache/app-text/docbook-xml-dtd-4.5-r1
+++ b/metadata/cache/app-text/docbook-xml-dtd-4.5-r1
@@ -6,7 +6,7 @@ http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 http://www.docbook.org/
 as-is
 Docbook DTD for XML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib sgml-catalog toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1 b/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
index 1261029c64de..56d659fce2fc 100644
--- a/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
+++ b/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
@@ -6,7 +6,7 @@ test
 http://wiki.docbook.org/topic/DocBookXslStylesheets
 BSD
 XSL Stylesheets for Docbook
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/ghostscript-gpl-9.05 b/metadata/cache/app-text/ghostscript-gpl-9.05
index 4d3e0a85c792..8d50c95da7a9 100644
--- a/metadata/cache/app-text/ghostscript-gpl-9.05
+++ b/metadata/cache/app-text/ghostscript-gpl-9.05
@@ -6,7 +6,7 @@ mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghosts
 http://ghostscript.com/
 GPL-3 CPL-1.0
 Ghostscript is an interpreter for the PostScript language and for PDF
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user versionator
 bindist cups dbus djvu gtk idn jpeg2k static-libs X linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/app-text/gnome-doc-utils-0.20.10 b/metadata/cache/app-text/gnome-doc-utils-0.20.10
index 45b91e27663b..6c022e70e9f5 100644
--- a/metadata/cache/app-text/gnome-doc-utils-0.20.10
+++ b/metadata/cache/app-text/gnome-doc-utils-0.20.10
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz
 http://live.gnome.org/GnomeDocUtils
 GPL-2 LGPL-2.1
 A collection of documentation utilities for the Gnome project
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/app-text/libpaper-1.1.24-r1 b/metadata/cache/app-text/libpaper-1.1.24-r1
index c2299b0ba01e..26567d8a48e6 100644
--- a/metadata/cache/app-text/libpaper-1.1.24-r1
+++ b/metadata/cache/app-text/libpaper-1.1.24-r1
@@ -6,7 +6,7 @@ mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
 http://packages.debian.org/unstable/source/libpaper
 GPL-2
 Library for handling paper characteristics
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/openjade-1.3.2-r4 b/metadata/cache/app-text/openjade-1.3.2-r4
index dd644ada28f6..a9a4355613e9 100644
--- a/metadata/cache/app-text/openjade-1.3.2-r4
+++ b/metadata/cache/app-text/openjade-1.3.2-r4
@@ -6,7 +6,7 @@ mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 http://openjade.sourceforge.net
 as-is
 Jade is an implementation of DSSSL - an ISO standard for formatting SGML and XML documents
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools base eutils flag-o-matic libtool multilib sgml-catalog toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/app-text/opensp-1.5.2-r3 b/metadata/cache/app-text/opensp-1.5.2-r3
index 0bda182a5585..028634748df1 100644
--- a/metadata/cache/app-text/opensp-1.5.2-r3
+++ b/metadata/cache/app-text/opensp-1.5.2-r3
@@ -6,7 +6,7 @@ mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 http://openjade.sourceforge.net/
 JamesClark
 A free, object-oriented toolkit for SGML parsing and entity management
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 doc nls static-libs test
 
diff --git a/metadata/cache/app-text/poppler-0.18.4-r1 b/metadata/cache/app-text/poppler-0.18.4-r1
index a489a296feab..15892d056783 100644
--- a/metadata/cache/app-text/poppler-0.18.4-r1
+++ b/metadata/cache/app-text/poppler-0.18.4-r1
@@ -6,7 +6,7 @@ test
 http://poppler.freedesktop.org/
 GPL-2
 PDF rendering library based on the xpdf-3.0 code base
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers
 
diff --git a/metadata/cache/app-text/poppler-data-0.4.5-r1 b/metadata/cache/app-text/poppler-data-0.4.5-r1
index 718b9470da68..4b0392d5371c 100644
--- a/metadata/cache/app-text/poppler-data-0.4.5-r1
+++ b/metadata/cache/app-text/poppler-data-0.4.5-r1
@@ -6,7 +6,7 @@ http://poppler.freedesktop.org/poppler-data-0.4.5.tar.gz
 http://poppler.freedesktop.org/
 BSD GPL-2 MIT
 Data files for poppler to support uncommon encodings without xpdfrc
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/scrollkeeper-dtd-1.0 b/metadata/cache/app-text/scrollkeeper-dtd-1.0
index dd75d0c46f76..630f9b7f51d4 100644
--- a/metadata/cache/app-text/scrollkeeper-dtd-1.0
+++ b/metadata/cache/app-text/scrollkeeper-dtd-1.0
@@ -6,7 +6,7 @@ http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.d
 http://scrollkeeper.sourceforge.net/
 FDL-1.1
 DTD from the Scrollkeeper package
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/sgml-common-0.6.3-r5 b/metadata/cache/app-text/sgml-common-0.6.3-r5
index 850141696f3f..083edab2adc2 100644
--- a/metadata/cache/app-text/sgml-common-0.6.3-r5
+++ b/metadata/cache/app-text/sgml-common-0.6.3-r5
@@ -6,7 +6,7 @@ mirror://kde/devel/docbook/SOURCES/sgml-common-0.6.3.tgz
 http://www.iso.ch/cate/3524030.html
 GPL-2
 Base ISO character entities and utilities for SGML
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib prefix toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/xmlto-0.0.25 b/metadata/cache/app-text/xmlto-0.0.25
index b0863da95e1d..927c4861ed99 100644
--- a/metadata/cache/app-text/xmlto-0.0.25
+++ b/metadata/cache/app-text/xmlto-0.0.25
@@ -6,7 +6,7 @@ https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.25.tar.bz2
 https://fedorahosted.org/xmlto/
 GPL-2
 script for converting XML and DocBook formatted documents to a variety of output formats
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils multilib toolchain-funcs user
 latex
 
diff --git a/metadata/cache/app-vim/gentoo-syntax-20120109 b/metadata/cache/app-vim/gentoo-syntax-20120109
index 38e8d038ff81..aa318c611e00 100644
--- a/metadata/cache/app-vim/gentoo-syntax-20120109
+++ b/metadata/cache/app-vim/gentoo-syntax-20120109
@@ -6,7 +6,7 @@ mirror://gentoo/gentoo-syntax-20120109.tar.bz2
 http://www.gentoo.org/
 vim
 vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files syntax highlighting, filetype and indent settings
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 vim-doc vim-plugin
 ignore-glep31
 
diff --git a/metadata/cache/app-vim/pam-syntax-20060424 b/metadata/cache/app-vim/pam-syntax-20060424
index 410e233ed471..9a38da35b4d0 100644
--- a/metadata/cache/app-vim/pam-syntax-20060424
+++ b/metadata/cache/app-vim/pam-syntax-20060424
@@ -6,7 +6,7 @@ mirror://gentoo/pam-syntax-20060424.tar.bz2
 http://www.vim.org/scripts/script.php?script_id=735
 as-is
 vim plugin: PAM configuration syntax highlighting
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 vim-doc vim-plugin
 
 
diff --git a/metadata/cache/dev-db/sqlite-3.7.11 b/metadata/cache/dev-db/sqlite-3.7.11
index 3092fbb35537..3ff943790326 100644
--- a/metadata/cache/dev-db/sqlite-3.7.11
+++ b/metadata/cache/dev-db/sqlite-3.7.11
@@ -6,7 +6,7 @@ doc? ( http://sqlite.org/sqlite-doc-3071100.zip ) tcl? ( http://sqlite.org/sqlit
 http://sqlite.org/
 as-is
 A SQL Database Engine in a C Library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user versionator
 debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify
 
diff --git a/metadata/cache/dev-java/netbeans-apisupport-7.1.2 b/metadata/cache/dev-java/netbeans-apisupport-7.1.2
new file mode 100644
index 000000000000..8d59d310ba43
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-apisupport-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+
+http://netbeans.org/projects/apisupport
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans API Support Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-cnd-7.1.2 b/metadata/cache/dev-java/netbeans-cnd-7.1.2
new file mode 100644
index 000000000000..cb4d7566e4da
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-cnd-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip
+
+http://netbeans.org/projects/cnd
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans CND Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-dlight-7.1.2 b/metadata/cache/dev-java/netbeans-dlight-7.1.2
new file mode 100644
index 000000000000..73b96ba96b33
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-dlight-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans D-Light Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-enterprise-7.1.2 b/metadata/cache/dev-java/netbeans-enterprise-7.1.2
new file mode 100644
index 000000000000..7d5b9352cc02
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-enterprise-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload:0 dev-java/glassfish-deployment-api:1.2 dev-java/jakarta-jstl:0 dev-java/javahelp:0 >=dev-java/junit-4.4:4 dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload:0 dev-java/glassfish-deployment-api:1.2 dev-java/jakarta-jstl:0 dev-java/antlr:0[java] dev-java/asm:3 dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 dev-java/jettison:0 dev-java/jsr311-api:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Enterprise cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-ergonomics-7.1.2 b/metadata/cache/dev-java/netbeans-ergonomics-7.1.2
new file mode 100644
index 000000000000..e1281fbf63f1
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-ergonomics-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Ergonomics Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-groovy-7.1.2 b/metadata/cache/dev-java/netbeans-groovy-7.1.2
new file mode 100644
index 000000000000..2c018f48a329
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-groovy-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
+
+http://netbeans.org/projects/groovy
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Groovy Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-harness-7.1.2 b/metadata/cache/dev-java/netbeans-harness-7.1.2
new file mode 100644
index 000000000000..c380143c9311
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-harness-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/junit-4.4:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
+
+http://netbeans.org/features/platform/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Harness
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-ide-7.1.2 b/metadata/cache/dev-java/netbeans-ide-7.1.2
new file mode 100644
index 000000000000..3290114bb16b
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-ide-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip dev-java/commons-codec:0 dev-java/jsch:0 dev-java/jzlib:0 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 dev-vcs/subversion:0[java] dev-java/javacc:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 dev-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
+
+http://netbeans.org/projects/ide
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans IDE Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-java-7.1.2 b/metadata/cache/dev-java/netbeans-java-7.1.2
new file mode 100644
index 000000000000..86f1cd7a185a
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-java-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
+
+http://netbeans.org/projects/java
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Java Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare pretend setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-javacard-7.1.2 b/metadata/cache/dev-java/netbeans-javacard-7.1.2
new file mode 100644
index 000000000000..5b2685d8d5ef
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-javacard-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
+
+http://netbeans.org/projects/javacard
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans JavaCard Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-javadoc-7.1.2 b/metadata/cache/dev-java/netbeans-javadoc-7.1.2
new file mode 100644
index 000000000000..3c498abbe82b
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-javadoc-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip dev-java/javahelp:0 dev-java/junit:4 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-cnd-7.1.2 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ergonomics-7.1.2 ~dev-java/netbeans-groovy-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-javacard-7.1.2 ~dev-java/netbeans-javafx-7.1.2 ~dev-java/netbeans-mobility-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-php-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans JavaDocs
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-javafx-7.1.2 b/metadata/cache/dev-java/netbeans-javafx-7.1.2
new file mode 100644
index 000000000000..d14e2ff13fb9
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-javafx-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
+
+http://netbeans.org/projects/javafx
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans JavaFX Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-mobility-7.1.2 b/metadata/cache/dev-java/netbeans-mobility-7.1.2
new file mode 100644
index 000000000000..9faff2284e29
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-mobility-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar
+
+http://netbeans.org/features/platform/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Mobility Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-nb-7.1.2 b/metadata/cache/dev-java/netbeans-nb-7.1.2
new file mode 100644
index 000000000000..8e2e7ffbf7bb
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-nb-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans IDE Branding
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+keychain elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-php-7.1.2 b/metadata/cache/dev-java/netbeans-php-7.1.2
new file mode 100644
index 000000000000..884fb98ad135
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-php-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
+
+http://netbeans.org/projects/php
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans PHP Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-platform-7.1.2 b/metadata/cache/dev-java/netbeans-platform-7.1.2
new file mode 100644
index 000000000000..d50c77111acc
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-platform-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+
+http://netbeans.org/features/platform/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Platform
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-profiler-7.1.2 b/metadata/cache/dev-java/netbeans-profiler-7.1.2
new file mode 100644
index 000000000000..648e22237587
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-profiler-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+
+http://netbeans.org/projects/profiler
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Profiler Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-websvccommon-7.1.2 b/metadata/cache/dev-java/netbeans-websvccommon-7.1.2
new file mode 100644
index 000000000000..1c102fe4af13
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-websvccommon-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Web Services Common Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/nasm-2.10 b/metadata/cache/dev-lang/nasm-2.10
index 541245cad1c9..c3dcc6506cc1 100644
--- a/metadata/cache/dev-lang/nasm-2.10
+++ b/metadata/cache/dev-lang/nasm-2.10
@@ -6,7 +6,7 @@ http://www.nasm.us/pub/nasm/releasebuilds/2.10/nasm-2.10.tar.bz2
 http://nasm.sourceforge.net/
 BSD-2
 groovy little assembler
--* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 eutils flag-o-matic multilib toolchain-funcs user
 doc
 
diff --git a/metadata/cache/dev-lang/python-2.6.8 b/metadata/cache/dev-lang/python-2.6.8
new file mode 100644
index 000000000000..6d81b4047e8d
--- /dev/null
+++ b/metadata/cache/dev-lang/python-2.6.8
@@ -0,0 +1,22 @@
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.61 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
+2.6
+http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
+-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater
+
+2
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/python-2.7.3-r1 b/metadata/cache/dev-lang/python-2.7.3-r1
new file mode 100644
index 000000000000..f0946abd5a15
--- /dev/null
+++ b/metadata/cache/dev-lang/python-2.7.3-r1
@@ -0,0 +1,22 @@
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
+2.7
+http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-0.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
+-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater
+
+2
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/python-3.1.5 b/metadata/cache/dev-lang/python-3.1.5
new file mode 100644
index 000000000000..5359f87f06b7
--- /dev/null
+++ b/metadata/cache/dev-lang/python-3.1.5
@@ -0,0 +1,22 @@
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.61 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
+3.1
+http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
+build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater
+
+3
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/python-3.2.3 b/metadata/cache/dev-lang/python-3.2.3
new file mode 100644
index 000000000000..e066631ffd43
--- /dev/null
+++ b/metadata/cache/dev-lang/python-3.2.3
@@ -0,0 +1,22 @@
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
+3.2
+http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
+build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater
+
+3
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/ruby-1.8.7_p358 b/metadata/cache/dev-lang/ruby-1.8.7_p358
index 16ae59b7924c..b03b3643d7be 100644
--- a/metadata/cache/dev-lang/ruby-1.8.7_p358
+++ b/metadata/cache/dev-lang/ruby-1.8.7_p358
@@ -6,7 +6,7 @@ mirror://ruby/1.8/ruby-1.8.7-p358.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-
 http://www.ruby-lang.org/
 || ( Ruby GPL-2 )
 An object-oriented scripting language
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user versionator
 +berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit
 
diff --git a/metadata/cache/dev-lang/swig-2.0.4-r1 b/metadata/cache/dev-lang/swig-2.0.4-r1
index 4a7bd6142e6d..3bc3b983ecbb 100644
--- a/metadata/cache/dev-lang/swig-2.0.4-r1
+++ b/metadata/cache/dev-lang/swig-2.0.4-r1
@@ -6,7 +6,7 @@ test
 http://www.swig.org/
 GPL-3 as-is
 Simplified Wrapper and Interface Generator
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib toolchain-funcs user
 ccache doc pcre
 
diff --git a/metadata/cache/dev-lang/tk-8.5.11 b/metadata/cache/dev-lang/tk-8.5.11
index af0720a7038e..69294f780116 100644
--- a/metadata/cache/dev-lang/tk-8.5.11
+++ b/metadata/cache/dev-lang/tk-8.5.11
@@ -6,7 +6,7 @@ mirror://sourceforge/tcl/tk8.5.11-src.tar.gz
 http://www.tcl.tk/
 BSD
 Tk Widget Set
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib prefix toolchain-funcs user
 debug threads truetype aqua xscreensaver
 
diff --git a/metadata/cache/dev-libs/check-0.9.8-r1 b/metadata/cache/dev-libs/check-0.9.8-r1
index 2a0e2c69800f..548041b298b3 100644
--- a/metadata/cache/dev-libs/check-0.9.8-r1
+++ b/metadata/cache/dev-libs/check-0.9.8-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/check/check-0.9.8.tar.gz
 http://sourceforge.net/projects/check/
 LGPL-2.1
 A unit test framework for C
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 static-libs subunit
 
diff --git a/metadata/cache/dev-libs/cloog-ppl-0.15.10 b/metadata/cache/dev-libs/cloog-ppl-0.15.10
index 425e7e54c3d4..4c0d3264ff29 100644
--- a/metadata/cache/dev-libs/cloog-ppl-0.15.10
+++ b/metadata/cache/dev-libs/cloog-ppl-0.15.10
@@ -6,7 +6,7 @@ ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.10.tar.gz
 http://repo.or.cz/w/cloog-ppl.git
 GPL-2
 Port of CLooG (Chunky LOOp Generator) to PPL (Parma Polyhedra Library)
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 autotools eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/dev-libs/gmime-2.2.27-r1 b/metadata/cache/dev-libs/gmime-2.2.27-r1
index efdc93aa996c..cb244cc483db 100644
--- a/metadata/cache/dev-libs/gmime-2.2.27-r1
+++ b/metadata/cache/dev-libs/gmime-2.2.27-r1
@@ -6,7 +6,7 @@ mirror://gnome/sources/gmime/2.2/gmime-2.2.27.tar.bz2 http://dev.gentoo.org/~pac
 http://spruce.sourceforge.net/gmime/
 LGPL-2.1
 Utilities for creating and parsing messages using MIME
-~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib toolchain-funcs user versionator
 doc mono
 
diff --git a/metadata/cache/dev-libs/gmime-2.4.32 b/metadata/cache/dev-libs/gmime-2.4.32
index 56aaa569b01d..4b688c68d77f 100644
--- a/metadata/cache/dev-libs/gmime-2.4.32
+++ b/metadata/cache/dev-libs/gmime-2.4.32
@@ -6,7 +6,7 @@ mirror://gnome/sources/gmime/2.4/gmime-2.4.32.tar.xz
 http://spruce.sourceforge.net/gmime/
 LGPL-2.1
 Utilities for creating and parsing messages using MIME
-~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib toolchain-funcs user versionator
 doc mono static-libs
 
diff --git a/metadata/cache/dev-libs/gmime-2.6.7 b/metadata/cache/dev-libs/gmime-2.6.7
index 68c3d92f4310..fb07c2ee8816 100644
--- a/metadata/cache/dev-libs/gmime-2.6.7
+++ b/metadata/cache/dev-libs/gmime-2.6.7
@@ -6,7 +6,7 @@ mirror://gnome/sources/gmime/2.6/gmime-2.6.7.tar.xz
 http://spruce.sourceforge.net/gmime/
 LGPL-2.1
 Utilities for creating and parsing messages using MIME
-~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool mono multilib toolchain-funcs user versionator
 doc mono static-libs
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-1.32.1 b/metadata/cache/dev-libs/gobject-introspection-1.32.1
index b2571baa7299..d5931287fe9b 100644
--- a/metadata/cache/dev-libs/gobject-introspection-1.32.1
+++ b/metadata/cache/dev-libs/gobject-introspection-1.32.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.t
 http://live.gnome.org/GObjectIntrospection/
 LGPL-2 GPL-2
 Introspection infrastructure for generating gobject library bindings for various languages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 doc doctool test
 
diff --git a/metadata/cache/dev-libs/gobject-introspection-common-1.32.1 b/metadata/cache/dev-libs/gobject-introspection-common-1.32.1
index 9f59db79622e..a764f4223687 100644
--- a/metadata/cache/dev-libs/gobject-introspection-common-1.32.1
+++ b/metadata/cache/dev-libs/gobject-introspection-common-1.32.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.t
 http://live.gnome.org/GObjectIntrospection/
 as-is
 Build infrastructure for GObject Introspection
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils gnome.org multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/dev-libs/kpathsea-6.0.1_p20110705 b/metadata/cache/dev-libs/kpathsea-6.0.1_p20110705
index 335d57caff2e..dac7e85be05e 100644
--- a/metadata/cache/dev-libs/kpathsea-6.0.1_p20110705
+++ b/metadata/cache/dev-libs/kpathsea-6.0.1_p20110705
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/kpathsea-texmf.d-
 http://tug.org/texlive/
 GPL-2
 Library implementing generic path searching, configuration, and TeX-specific file searching
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib texlive-common toolchain-funcs user
 doc source static-libs
 
diff --git a/metadata/cache/dev-libs/libbegemot-1.11 b/metadata/cache/dev-libs/libbegemot-1.11
index 1be979c14693..0b142cddd8f7 100644
--- a/metadata/cache/dev-libs/libbegemot-1.11
+++ b/metadata/cache/dev-libs/libbegemot-1.11
@@ -6,7 +6,7 @@ http://people.freebsd.org/~harti/libbegemot/libbegemot-1.11.tar.gz
 http://people.freebsd.org/~harti/
 BSD
 begemot utility function library
-~amd64 ~x86-fbsd
+~amd64 ~amd64-fbsd ~x86-fbsd
 libtool multilib toolchain-funcs
 
 
diff --git a/metadata/cache/dev-libs/libgamin-0.1.10-r2 b/metadata/cache/dev-libs/libgamin-0.1.10-r2
index e271c17f80e2..93b2fdba945b 100644
--- a/metadata/cache/dev-libs/libgamin-0.1.10-r2
+++ b/metadata/cache/dev-libs/libgamin-0.1.10-r2
@@ -6,7 +6,7 @@ test
 http://www.gnome.org/~veillard/gamin/
 LGPL-2
 Library providing the FAM File Alteration Monitor API
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic gnome.org libtool multilib python toolchain-funcs user versionator
 debug kernel_linux python static-libs
 
diff --git a/metadata/cache/dev-libs/libnatspec-0.2.6 b/metadata/cache/dev-libs/libnatspec-0.2.6
index 372b2f318d88..33eb6cf830da 100644
--- a/metadata/cache/dev-libs/libnatspec-0.2.6
+++ b/metadata/cache/dev-libs/libnatspec-0.2.6
@@ -6,7 +6,7 @@ mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 http://natspec.sourceforge.net/
 LGPL-2.1
 library to smooth charset/localization issues
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 doc python
 
diff --git a/metadata/cache/dev-libs/libpthread-stubs-0.3 b/metadata/cache/dev-libs/libpthread-stubs-0.3
index 5f1210bc293f..341140e15a05 100644
--- a/metadata/cache/dev-libs/libpthread-stubs-0.3
+++ b/metadata/cache/dev-libs/libpthread-stubs-0.3
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Pthread functions stubs for platforms missing them
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/dev-libs/libxslt-1.1.26-r3 b/metadata/cache/dev-libs/libxslt-1.1.26-r3
index 68bfa92b6f7d..77ceb6893f20 100644
--- a/metadata/cache/dev-libs/libxslt-1.1.26-r3
+++ b/metadata/cache/dev-libs/libxslt-1.1.26-r3
@@ -6,7 +6,7 @@ ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
 http://www.xmlsoft.org/
 MIT
 XSLT libraries and tools
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils libtool multilib python toolchain-funcs user
 crypt debug python static-libs
 
diff --git a/metadata/cache/dev-libs/nspr-4.9 b/metadata/cache/dev-libs/nspr-4.9
index ac54786613f0..b334322ceda0 100644
--- a/metadata/cache/dev-libs/nspr-4.9
+++ b/metadata/cache/dev-libs/nspr-4.9
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
 http://www.mozilla.org/projects/nspr/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Netscape Portable Runtime
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user versionator
 debug
 
diff --git a/metadata/cache/dev-libs/nss-3.13.3 b/metadata/cache/dev-libs/nss-3.13.3
index c119d6f301d5..05cd0d0529f3 100644
--- a/metadata/cache/dev-libs/nss-3.13.3
+++ b/metadata/cache/dev-libs/nss-3.13.3
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/n
 http://www.mozilla.org/projects/security/pki/nss/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Mozilla's Network Security Services library that implements PKI support
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils flag-o-matic multilib toolchain-funcs user
 utils
 
diff --git a/metadata/cache/dev-libs/ppl-0.12 b/metadata/cache/dev-libs/ppl-0.12
index b3cd0217172d..eb64a761c797 100644
--- a/metadata/cache/dev-libs/ppl-0.12
+++ b/metadata/cache/dev-libs/ppl-0.12
@@ -6,7 +6,7 @@ http://bugseng.com/products/ppl/download/ftp/releases/0.12/ppl-0.12.tar.bz2
 http://bugseng.com/products/ppl
 GPL-3
 The Parma Polyhedra Library provides numerical abstractions for analysis of complex systems
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 eutils multilib toolchain-funcs user
 doc lpsol pch static-libs test
 
diff --git a/metadata/cache/dev-perl/Font-TTF-0.480.0 b/metadata/cache/dev-perl/Font-TTF-0.480.0
index 42dd10fbdc90..65d9a756d60f 100644
--- a/metadata/cache/dev-perl/Font-TTF-0.480.0
+++ b/metadata/cache/dev-perl/Font-TTF-0.480.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.48.tar.gz
 http://search.cpan.org/dist/Font-TTF/
 Artistic
 module for compiling and altering fonts
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/PPI-1.215.0 b/metadata/cache/dev-perl/PPI-1.215.0
index ffadea5845f6..827ba188d683 100644
--- a/metadata/cache/dev-perl/PPI-1.215.0
+++ b/metadata/cache/dev-perl/PPI-1.215.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz
 http://search.cpan.org/dist/PPI/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Parse, Analyze and Manipulate Perl (without perl)
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/PPIx-Regexp-0.26.0 b/metadata/cache/dev-perl/PPIx-Regexp-0.26.0
index 69ef3f8efbf4..0adb9a84daf3 100644
--- a/metadata/cache/dev-perl/PPIx-Regexp-0.26.0
+++ b/metadata/cache/dev-perl/PPIx-Regexp-0.26.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.026.tar.gz
 http://search.cpan.org/dist/PPIx-Regexp/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Represent a regular expression of some sort
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Perl-Critic-1.117.0 b/metadata/cache/dev-perl/Perl-Critic-1.117.0
index c00f6d351e25..14ce733388e6 100644
--- a/metadata/cache/dev-perl/Perl-Critic-1.117.0
+++ b/metadata/cache/dev-perl/Perl-Critic-1.117.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.117.tar.gz
 http://search.cpan.org/dist/Perl-Critic/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Critique Perl source code for best-practices
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Pod-Spell-1.10.0 b/metadata/cache/dev-perl/Pod-Spell-1.10.0
index 8d6da6ed2f83..7057c1b9689e 100644
--- a/metadata/cache/dev-perl/Pod-Spell-1.10.0
+++ b/metadata/cache/dev-perl/Pod-Spell-1.10.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SB/SBURKE/Pod-Spell-1.01.tar.gz mirror://gentoo/podsp
 http://search.cpan.org/dist/Pod-Spell/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 A formatter for spellchecking Pod
-~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/gtk2-perl-1.242.0 b/metadata/cache/dev-perl/gtk2-perl-1.242.0
index 790808794cc3..d5acee3ab613 100644
--- a/metadata/cache/dev-perl/gtk2-perl-1.242.0
+++ b/metadata/cache/dev-perl/gtk2-perl-1.242.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.242.tar.gz
 http://search.cpan.org/dist/Gtk2/
 LGPL-2.1
 Perl bindings for GTK2
-~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-php/securimage-3.0.1 b/metadata/cache/dev-php/securimage-3.0.1
index d20c2b024e37..0931440c29f0 100644
--- a/metadata/cache/dev-php/securimage-3.0.1
+++ b/metadata/cache/dev-php/securimage-3.0.1
@@ -1,12 +1,12 @@
 
-virtual/httpd-php
+dev-lang/php[gd,truetype] virtual/httpd-php
 0
 http://phpcaptcha.org/securimage-3.0.1.tar.gz ftp://mirror.ohnopub.net/mirror/securimage/securimage-3.0.1.tar.gz
 
 http://phpcaptcha.org/
 BSD
 PHP captcha creator and validator library
-~amd64
+~amd64 ~x86
 
 
 
diff --git a/metadata/cache/dev-python/argparse-1.2.1 b/metadata/cache/dev-python/argparse-1.2.1
index c985b6517adb..3fac77b99880 100644
--- a/metadata/cache/dev-python/argparse-1.2.1
+++ b/metadata/cache/dev-python/argparse-1.2.1
@@ -6,7 +6,7 @@ http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz
 http://code.google.com/p/argparse/ http://pypi.python.org/pypi/argparse
 PSF-2
 Provides an easy, declarative interface for creating command line tools.
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/certifi-0.0.8 b/metadata/cache/dev-python/certifi-0.0.8
index db925eb39ead..38adb1d9b6c3 100644
--- a/metadata/cache/dev-python/certifi-0.0.8
+++ b/metadata/cache/dev-python/certifi-0.0.8
@@ -6,7 +6,7 @@ mirror://pypi/c/certifi/certifi-0.0.8.tar.gz
 http://python-requests.org/
 ISC
 SSL root certificate bundle
-~amd64 ~x86
+~amd64 ~arm ~x86
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/docutils-0.8.1 b/metadata/cache/dev-python/docutils-0.8.1
index eb8e2909d32d..b7cf21a2b161 100644
--- a/metadata/cache/dev-python/docutils-0.8.1
+++ b/metadata/cache/dev-python/docutils-0.8.1
@@ -6,7 +6,7 @@ mirror://sourceforge/docutils/docutils-0.8.1.tar.gz glep? ( mirror://gentoo/glep
 http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils
 BSD-2 GPL-3 PSF-2 public-domain
 Docutils - Python Documentation Utilities
-alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 distutils eutils multilib python toolchain-funcs user
 glep
 
diff --git a/metadata/cache/dev-python/epydoc-3.0.1-r1 b/metadata/cache/dev-python/epydoc-3.0.1-r1
index 346bc684da65..564d3b9702f5 100644
--- a/metadata/cache/dev-python/epydoc-3.0.1-r1
+++ b/metadata/cache/dev-python/epydoc-3.0.1-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/epydoc/epydoc-3.0.1.tar.gz
 http://epydoc.sourceforge.net/
 MIT
 Tool for generating API documentation for Python modules, based on their docstrings
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 distutils eutils multilib python toolchain-funcs user
 doc latex X
 
diff --git a/metadata/cache/dev-python/requests-0.10.6 b/metadata/cache/dev-python/requests-0.10.6
index bddd50b719f1..6afa5a511940 100644
--- a/metadata/cache/dev-python/requests-0.10.6
+++ b/metadata/cache/dev-python/requests-0.10.6
@@ -6,7 +6,7 @@ mirror://pypi/r/requests/requests-0.10.6.tar.gz
 http://python-requests.org/ http://pypi.python.org/pypi/requests
 ISC
 HTTP library for human beings
-~amd64 ~x86
+~amd64 ~arm ~x86
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/requests-0.11.1 b/metadata/cache/dev-python/requests-0.11.1
index b9361cabc518..e46b54403502 100644
--- a/metadata/cache/dev-python/requests-0.11.1
+++ b/metadata/cache/dev-python/requests-0.11.1
@@ -6,7 +6,7 @@ mirror://pypi/r/requests/requests-0.11.1.tar.gz
 http://python-requests.org/ http://pypi.python.org/pypi/requests
 ISC
 HTTP library for human beings
-~amd64 ~x86
+~amd64 ~arm ~x86
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/setuptools-0.6.25 b/metadata/cache/dev-python/setuptools-0.6.25
index 892a356620d9..10109bdd912b 100644
--- a/metadata/cache/dev-python/setuptools-0.6.25
+++ b/metadata/cache/dev-python/setuptools-0.6.25
@@ -6,7 +6,7 @@ mirror://pypi/d/distribute/distribute-0.6.25.tar.gz
 http://pypi.python.org/pypi/distribute
 PSF-2
 Distribute (fork of Setuptools) is a collection of extensions to Distutils
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 distutils eutils multilib python toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-python/subunit-0.0.7 b/metadata/cache/dev-python/subunit-0.0.7
index 70db8157054c..063b1c8b614f 100644
--- a/metadata/cache/dev-python/subunit-0.0.7
+++ b/metadata/cache/dev-python/subunit-0.0.7
@@ -6,7 +6,7 @@ http://launchpad.net/subunit/trunk/0.0.7/+download/subunit-0.0.7.tar.gz
 https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit
 Apache-2.0 BSD
 A streaming protocol for test results
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/testtools-0.9.14 b/metadata/cache/dev-python/testtools-0.9.14
index c1d7a5e21031..a3a954900340 100644
--- a/metadata/cache/dev-python/testtools-0.9.14
+++ b/metadata/cache/dev-python/testtools-0.9.14
@@ -6,7 +6,7 @@ http://launchpad.net/testtools/0.9/0.9.14/+download/testtools-0.9.14.tar.gz
 https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
 MIT
 Extensions to the Python unittest library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 distutils eutils multilib python toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/dev-scheme/guile-1.8.8-r1 b/metadata/cache/dev-scheme/guile-1.8.8-r1
index 3fbfbd8da7f7..9aaed22d57f6 100644
--- a/metadata/cache/dev-scheme/guile-1.8.8-r1
+++ b/metadata/cache/dev-scheme/guile-1.8.8-r1
@@ -6,7 +6,7 @@ mirror://gnu/guile/guile-1.8.8.tar.gz
 http://www.gnu.org/software/guile/
 LGPL-2.1
 Scheme interpreter
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 autotools elisp-common eutils flag-o-matic libtool multilib toolchain-funcs user
 networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads
 
diff --git a/metadata/cache/dev-util/cmake-2.8.7-r5 b/metadata/cache/dev-util/cmake-2.8.7-r5
index 0f9d1f0113a6..786d22620e72 100644
--- a/metadata/cache/dev-util/cmake-2.8.7-r5
+++ b/metadata/cache/dev-util/cmake-2.8.7-r5
@@ -6,7 +6,7 @@ http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz
 http://www.cmake.org/
 CMake
 Cross platform Make
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base cmake-utils elisp-common eutils flag-o-matic multilib toolchain-funcs user versionator virtualx
 emacs ncurses qt4 vim-syntax test
 
diff --git a/metadata/cache/dev-util/cppunit-1.12.1-r1 b/metadata/cache/dev-util/cppunit-1.12.1-r1
index b49a39a72711..ea5b65cd469e 100644
--- a/metadata/cache/dev-util/cppunit-1.12.1-r1
+++ b/metadata/cache/dev-util/cppunit-1.12.1-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz
 http://cppunit.sourceforge.net/
 LGPL-2.1
 C++ port of the famous JUnit framework for unit testing
-alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 autotools eutils libtool multilib toolchain-funcs user
 doc examples static-libs
 
diff --git a/metadata/cache/dev-util/cscope-15.7a-r1 b/metadata/cache/dev-util/cscope-15.7a-r1
index 6e11dab4c52a..863f13a66490 100644
--- a/metadata/cache/dev-util/cscope-15.7a-r1
+++ b/metadata/cache/dev-util/cscope-15.7a-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/cscope/cscope-15.7a.tar.bz2
 http://cscope.sourceforge.net/
 BSD GPL-2
 Interactively examine a C program
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 elisp-common eutils multilib toolchain-funcs user
 emacs
 
diff --git a/metadata/cache/dev-util/ctags-5.8 b/metadata/cache/dev-util/ctags-5.8
index c40c030590ae..fb18b87cf91c 100644
--- a/metadata/cache/dev-util/ctags-5.8
+++ b/metadata/cache/dev-util/ctags-5.8
@@ -6,7 +6,7 @@ mirror://sourceforge/ctags/ctags-5.8.tar.gz ada? ( mirror://sourceforge/gnuada/c
 http://ctags.sourceforge.net
 GPL-2
 Exuberant Ctags creates tags files for code browsing in editors
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils multilib toolchain-funcs user
 ada
 
diff --git a/metadata/cache/dev-util/desktop-file-utils-0.20-r1 b/metadata/cache/dev-util/desktop-file-utils-0.20-r1
index 9b3e04616786..46c08bc162e9 100644
--- a/metadata/cache/dev-util/desktop-file-utils-0.20-r1
+++ b/metadata/cache/dev-util/desktop-file-utils-0.20-r1
@@ -6,7 +6,7 @@ http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-uti
 http://freedesktop.org/wiki/Software/desktop-file-utils
 GPL-2
 Command line utilities to work with desktop menu entries
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 elisp-common eutils multilib toolchain-funcs user
 emacs
 
diff --git a/metadata/cache/dev-util/gperf-3.0.4 b/metadata/cache/dev-util/gperf-3.0.4
index 0f873a64498d..7ed5dbd49a6e 100644
--- a/metadata/cache/dev-util/gperf-3.0.4
+++ b/metadata/cache/dev-util/gperf-3.0.4
@@ -6,7 +6,7 @@ mirror://gnu/gperf/gperf-3.0.4.tar.gz
 http://www.gnu.org/software/gperf/gperf.html
 GPL-2
 A perfect hash function generator
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/dev-util/netbeans-7.1.2 b/metadata/cache/dev-util/netbeans-7.1.2
new file mode 100644
index 000000000000..f9163325915b
--- /dev/null
+++ b/metadata/cache/dev-util/netbeans-7.1.2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.1.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.1.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.1.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.1.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.1.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.1.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.1.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.1.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.1.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.1.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.1.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.1.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.1.2 ) doc? ( ~dev-java/netbeans-javadoc-7.1.2 ) >=dev-java/java-config-2.1.9-r1
+7.1
+linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ar? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_bg? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ca? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_cs? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_de? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_el? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_es? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_fr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_gl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_hi_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_id? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_it? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ja? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ko? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_lt? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_nl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_BR? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_PT? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ro? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ru? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_si? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sq? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sv? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ta_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_vi? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_CN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_TW? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 )
+
+http://netbeans.org/
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans IDE
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+doc +netbeans_modules_apisupport netbeans_modules_cnd netbeans_modules_dlight netbeans_modules_enterprise netbeans_modules_ergonomics netbeans_modules_groovy +netbeans_modules_java netbeans_modules_javacard +netbeans_modules_javafx netbeans_modules_mobility netbeans_modules_php +netbeans_modules_profiler +netbeans_modules_websvccommon linguas_af linguas_ar linguas_bg linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_gl linguas_hi_IN linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_si linguas_sq linguas_sr linguas_sv linguas_ta_IN linguas_tl linguas_tr linguas_vi linguas_zh_CN linguas_zh_TW elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.7.7 b/metadata/cache/dev-vcs/git-1.7.7.7
new file mode 100644
index 000000000000..50ae2e39693e
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-1.7.7.7
@@ -0,0 +1,22 @@
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) python? ( =dev-lang/python-2* )
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+0
+http://git-core.googlecode.com/files/git-1.7.7.7.tar.gz mirror://kernel/software/scm/git/git-1.7.7.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.7.tar.gz )
+
+http://www.git-scm.com/
+GPL-2
+GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+base bash-completion-r1 elisp-common eutils multilib perl-module python toolchain-funcs user
++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.8.6 b/metadata/cache/dev-vcs/git-1.7.8.6
new file mode 100644
index 000000000000..ea59e378dcf8
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-1.7.8.6
@@ -0,0 +1,22 @@
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) python? ( =dev-lang/python-2* )
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+0
+http://git-core.googlecode.com/files/git-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.8.6.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.8.6.tar.gz )
+
+http://www.git-scm.com/
+GPL-2
+GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+base bash-completion-r1 elisp-common eutils multilib perl-module python toolchain-funcs user
++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.9.7 b/metadata/cache/dev-vcs/git-1.7.9.7
new file mode 100644
index 000000000000..86aee1d14b7f
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-1.7.9.7
@@ -0,0 +1,22 @@
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* )
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+0
+http://git-core.googlecode.com/files/git-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.7.tar.gz )
+
+http://www.git-scm.com/
+GPL-2
+GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+
+base bash-completion-r1 elisp-common eutils multilib perl-module python toolchain-funcs user
++blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-puzzle/jag-0.3.2 b/metadata/cache/games-puzzle/jag-0.3.2
index f4770bfcbf0e..2e7766389a03 100644
--- a/metadata/cache/games-puzzle/jag-0.3.2
+++ b/metadata/cache/games-puzzle/jag-0.3.2
@@ -6,7 +6,7 @@ http://jag.xlabsoft.com/files/jag-0.3.2-src.zip http://jag.xlabsoft.com/files/ja
 http://jag.xlabsoft.com/
 GPL-3
 Arcade 2D Puzzle Game
-~amd64 ~ppc x86
+amd64 ~ppc x86
 base eutils games multilib qt4-r2 toolchain-funcs user
 editor
 
diff --git a/metadata/cache/games-server/crossfire-server-1.60.0 b/metadata/cache/games-server/crossfire-server-1.60.0
index 93fd69ec369e..73056fb8828e 100644
--- a/metadata/cache/games-server/crossfire-server-1.60.0
+++ b/metadata/cache/games-server/crossfire-server-1.60.0
@@ -6,7 +6,7 @@ test
 http://crossfire.real-time.com/
 GPL-2
 server for the crossfire clients
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 autotools base eutils games libtool multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/gnome-extra/gnome-activity-journal-0.8.0-r2 b/metadata/cache/gnome-extra/gnome-activity-journal-0.8.0-r2
new file mode 100644
index 000000000000..4094003aa228
--- /dev/null
+++ b/metadata/cache/gnome-extra/gnome-activity-journal-0.8.0-r2
@@ -0,0 +1,22 @@
+dev-python/dbus-python dev-python/libgnome-python dev-python/gconf-python dev-python/gst-python dev-python/pycairo dev-python/pygobject:2 dev-python/pygtk:2 dev-python/pyxdg gnome-extra/zeitgeist sys-apps/dbus dev-util/intltool dev-python/python-distutils-extra app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* >=sys-apps/sed-4
+dev-python/dbus-python dev-python/libgnome-python dev-python/gconf-python dev-python/gst-python dev-python/pycairo dev-python/pygobject:2 dev-python/pygtk:2 dev-python/pyxdg gnome-extra/zeitgeist sys-apps/dbus =dev-lang/python-2*
+0
+http://launchpad.net/gnome-activity-journal/0.8/0.8.0/+download/gnome-activity-journal-0.8.0.tar.gz
+
+https://launchpad.net/gnome-activity-journal/
+GPL-3 LGPL-3
+Tool for easily browsing and finding files on your computer
+~amd64 ~x86 ~amd64-linux ~x86-linux
+distutils eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
+debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-client/thunderbird-10.0 b/metadata/cache/mail-client/thunderbird-10.0
deleted file mode 100644
index c81adc363717..000000000000
--- a/metadata/cache/mail-client/thunderbird-10.0
+++ /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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1: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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ar.xpi -> thunderbird-10.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/be.xpi -> thunderbird-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bg.xpi -> thunderbird-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/br.xpi -> thunderbird-10.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ca.xpi -> thunderbird-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/cs.xpi -> thunderbird-10.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/da.xpi -> thunderbird-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/de.xpi -> thunderbird-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/el.xpi -> thunderbird-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/et.xpi -> thunderbird-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/eu.xpi -> thunderbird-10.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fi.xpi -> thunderbird-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fr.xpi -> thunderbird-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gd.xpi -> thunderbird-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gl.xpi -> thunderbird-10.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/he.xpi -> thunderbird-10.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/hu.xpi -> thunderbird-10.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/id.xpi -> thunderbird-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/is.xpi -> thunderbird-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/it.xpi -> thunderbird-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ja.xpi -> thunderbird-10.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ko.xpi -> thunderbird-10.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/lt.xpi -> thunderbird-10.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nl.xpi -> thunderbird-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pl.xpi -> thunderbird-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/rm.xpi -> thunderbird-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ro.xpi -> thunderbird-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ru.xpi -> thunderbird-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/si.xpi -> thunderbird-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sk.xpi -> thunderbird-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sl.xpi -> thunderbird-10.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sq.xpi -> thunderbird-10.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/tr.xpi -> thunderbird-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/uk.xpi -> thunderbird-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/vi.xpi -> thunderbird-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/source/thunderbird-10.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_ar 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_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-
-
-
-3
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-10.0.1 b/metadata/cache/mail-client/thunderbird-10.0.1
deleted file mode 100644
index 55af87fda2ef..000000000000
--- a/metadata/cache/mail-client/thunderbird-10.0.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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1: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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
-
-
-
-3
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-10.0.1-r1 b/metadata/cache/mail-client/thunderbird-10.0.1-r1
deleted file mode 100644
index 2cf80b0ec019..000000000000
--- a/metadata/cache/mail-client/thunderbird-10.0.1-r1
+++ /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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1: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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
-
-
-
-3
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-10.0.4 b/metadata/cache/mail-client/thunderbird-10.0.4
new file mode 100644
index 000000000000..a324b2a25723
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-10.0.4
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1: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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.4esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.4esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.4esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.4esr/source/thunderbird-10.0.4esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz
+
+http://www.mozilla.com/en-US/thunderbird/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Thunderbird Mail Client
+~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
+bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
+
+
+
+3
+
+compile configure install postinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-client/thunderbird-3.1.13 b/metadata/cache/mail-client/thunderbird-3.1.13
deleted file mode 100644
index 2bc84df79070..000000000000
--- a/metadata/cache/mail-client/thunderbird-3.1.13
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) 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
-http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/source/thunderbird-3.1.13.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/af.xpi -> thunderbird-3.1.13-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ar.xpi -> thunderbird-3.1.13-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/be.xpi -> thunderbird-3.1.13-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bg.xpi -> thunderbird-3.1.13-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ca.xpi -> thunderbird-3.1.13-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/cs.xpi -> thunderbird-3.1.13-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/da.xpi -> thunderbird-3.1.13-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/de.xpi -> thunderbird-3.1.13-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/el.xpi -> thunderbird-3.1.13-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.13-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.13-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/et.xpi -> thunderbird-3.1.13-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/eu.xpi -> thunderbird-3.1.13-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fi.xpi -> thunderbird-3.1.13-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fr.xpi -> thunderbird-3.1.13-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/he.xpi -> thunderbird-3.1.13-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/hu.xpi -> thunderbird-3.1.13-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/id.xpi -> thunderbird-3.1.13-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/is.xpi -> thunderbird-3.1.13-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/it.xpi -> thunderbird-3.1.13-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ja.xpi -> thunderbird-3.1.13-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ko.xpi -> thunderbird-3.1.13-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/lt.xpi -> thunderbird-3.1.13-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nl.xpi -> thunderbird-3.1.13-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pl.xpi -> thunderbird-3.1.13-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.13-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ro.xpi -> thunderbird-3.1.13-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ru.xpi -> thunderbird-3.1.13-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/si.xpi -> thunderbird-3.1.13-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sk.xpi -> thunderbird-3.1.13-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sl.xpi -> thunderbird-3.1.13-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sq.xpi -> thunderbird-3.1.13-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/tr.xpi -> thunderbird-3.1.13-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/uk.xpi -> thunderbird-3.1.13-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.13-zh-TW.xpi )
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils python toolchain-funcs user
-+alsa ldap +crypt bindist gnome libnotify +lightning mozdom system-sqlite wifi linguas_af linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh linguas_zh_TW custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-
-crypt? ( >=x11-plugins/enigmail-1.1 )
-
-3
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-7.0.1-r1 b/metadata/cache/mail-client/thunderbird-7.0.1-r1
deleted file mode 100644
index 40116cce62ed..000000000000
--- a/metadata/cache/mail-client/thunderbird-7.0.1-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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/thunderbird/releases//7.0.1/source/thunderbird-7.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.2.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-7.0-patches-0.4.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-7.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ar.xpi -> thunderbird-7.0.1-ar.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ca.xpi -> thunderbird-7.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/cs.xpi -> thunderbird-7.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/da.xpi -> thunderbird-7.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/de.xpi -> thunderbird-7.0.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-7.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-7.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/et.xpi -> thunderbird-7.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/eu.xpi -> thunderbird-7.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fi.xpi -> thunderbird-7.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fr.xpi -> thunderbird-7.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/he.xpi -> thunderbird-7.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/hu.xpi -> thunderbird-7.0.1-hu.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/is.xpi -> thunderbird-7.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/it.xpi -> thunderbird-7.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ja.xpi -> thunderbird-7.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ko.xpi -> thunderbird-7.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/lt.xpi -> thunderbird-7.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nl.xpi -> thunderbird-7.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pl.xpi -> thunderbird-7.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-7.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ru.xpi -> thunderbird-7.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/si.xpi -> thunderbird-7.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sk.xpi -> thunderbird-7.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sl.xpi -> thunderbird-7.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sq.xpi -> thunderbird-7.0.1-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/tr.xpi -> thunderbird-7.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/uk.xpi -> thunderbird-7.0.1-uk.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-7.0.1-zh-TW.xpi )
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha amd64 ~arm ~ia64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning mozdom linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_TW custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-
-
-
-3
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-8.0-r1 b/metadata/cache/mail-client/thunderbird-8.0-r1
deleted file mode 100644
index 8015411710b1..000000000000
--- a/metadata/cache/mail-client/thunderbird-8.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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/thunderbird/releases//8.0/source/thunderbird-8.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.3.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-8.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ar.xpi -> thunderbird-8.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/be.xpi -> thunderbird-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bg.xpi -> thunderbird-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/br.xpi -> thunderbird-8.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ca.xpi -> thunderbird-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/cs.xpi -> thunderbird-8.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/da.xpi -> thunderbird-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/de.xpi -> thunderbird-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/el.xpi -> thunderbird-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-8.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/et.xpi -> thunderbird-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/eu.xpi -> thunderbird-8.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fi.xpi -> thunderbird-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fr.xpi -> thunderbird-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gd.xpi -> thunderbird-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gl.xpi -> thunderbird-8.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/he.xpi -> thunderbird-8.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/hu.xpi -> thunderbird-8.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/id.xpi -> thunderbird-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/is.xpi -> thunderbird-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/it.xpi -> thunderbird-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ja.xpi -> thunderbird-8.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ko.xpi -> thunderbird-8.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/lt.xpi -> thunderbird-8.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nl.xpi -> thunderbird-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pl.xpi -> thunderbird-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/rm.xpi -> thunderbird-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ro.xpi -> thunderbird-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ru.xpi -> thunderbird-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/si.xpi -> thunderbird-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sk.xpi -> thunderbird-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sl.xpi -> thunderbird-8.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sq.xpi -> thunderbird-8.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/tr.xpi -> thunderbird-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/uk.xpi -> thunderbird-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/vi.xpi -> thunderbird-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi )
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-
-
-
-3
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-9.0 b/metadata/cache/mail-client/thunderbird-9.0
deleted file mode 100644
index 12b1d1d3f73e..000000000000
--- a/metadata/cache/mail-client/thunderbird-9.0
+++ /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 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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/thunderbird/releases//9.0/source/thunderbird-9.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.4.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ar.xpi -> thunderbird-9.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/be.xpi -> thunderbird-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bg.xpi -> thunderbird-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/br.xpi -> thunderbird-9.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ca.xpi -> thunderbird-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/cs.xpi -> thunderbird-9.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/da.xpi -> thunderbird-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/de.xpi -> thunderbird-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/el.xpi -> thunderbird-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/en-GB.xpi -> thunderbird-9.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/et.xpi -> thunderbird-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/eu.xpi -> thunderbird-9.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fi.xpi -> thunderbird-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fr.xpi -> thunderbird-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gd.xpi -> thunderbird-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gl.xpi -> thunderbird-9.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/he.xpi -> thunderbird-9.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/hu.xpi -> thunderbird-9.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/id.xpi -> thunderbird-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/is.xpi -> thunderbird-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/it.xpi -> thunderbird-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ja.xpi -> thunderbird-9.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ko.xpi -> thunderbird-9.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/lt.xpi -> thunderbird-9.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nl.xpi -> thunderbird-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pl.xpi -> thunderbird-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/rm.xpi -> thunderbird-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ro.xpi -> thunderbird-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ru.xpi -> thunderbird-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/si.xpi -> thunderbird-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sk.xpi -> thunderbird-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sl.xpi -> thunderbird-9.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sq.xpi -> thunderbird-9.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/tr.xpi -> thunderbird-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/uk.xpi -> thunderbird-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/vi.xpi -> thunderbird-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi )
-
-http://www.mozilla.com/en-US/thunderbird/
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Thunderbird Mail Client
-~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils python toolchain-funcs user
-bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-
-
-
-3
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/mail-client/thunderbird-bin-10.0.4 b/metadata/cache/mail-client/thunderbird-bin-10.0.4
new file mode 100644
index 000000000000..06320ad2ee88
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-bin-10.0.4
@@ -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//10.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.4esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.4esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.4esr-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-x86_64/en-US/thunderbird-10.0.4esr.tar.bz2 -> thunderbird-bin_x86_64-10.0.4.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/en-US/thunderbird-10.0.4esr.tar.bz2 -> thunderbird-bin_i686-10.0.4.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-mta/postfix-2.10_pre20120423 b/metadata/cache/mail-mta/postfix-2.10_pre20120426
similarity index 96%
rename from metadata/cache/mail-mta/postfix-2.10_pre20120423
rename to metadata/cache/mail-mta/postfix-2.10_pre20120426
index b3317575f1f4..4480ef23b69d 100644
--- a/metadata/cache/mail-mta/postfix-2.10_pre20120423
+++ b/metadata/cache/mail-mta/postfix-2.10_pre20120426
@@ -1,7 +1,7 @@
 >=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/experimental/postfix-2.10-20120423.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120426.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
 
 http://www.postfix.org/
 IBM
diff --git a/metadata/cache/media-fonts/arphicfonts-0.2.20080216.1 b/metadata/cache/media-fonts/arphicfonts-0.2.20080216.1
index 8ea5659c0b2b..4806d1086d0c 100644
--- a/metadata/cache/media-fonts/arphicfonts-0.2.20080216.1
+++ b/metadata/cache/media-fonts/arphicfonts-0.2.20080216.1
@@ -6,7 +6,7 @@ strip binchecks
 http://www.arphic.com.tw/ http://www.freedesktop.org/wiki/Software/CJKUnifonts
 Arphic
 Chinese TrueType Arphic Fonts
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/baekmuk-fonts-2.2-r2 b/metadata/cache/media-fonts/baekmuk-fonts-2.2-r2
index 36dc5a451fb9..ea099d4733ac 100644
--- a/metadata/cache/media-fonts/baekmuk-fonts-2.2-r2
+++ b/metadata/cache/media-fonts/baekmuk-fonts-2.2-r2
@@ -6,7 +6,7 @@ strip binchecks
 http://kldp.net/projects/baekmuk/
 BSD
 Korean Baekmuk Font
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils font font-ebdftopcf multilib toolchain-funcs user
 unicode X X
 
diff --git a/metadata/cache/media-fonts/dejavu-2.33 b/metadata/cache/media-fonts/dejavu-2.33
index e4fb94d4f4cc..d3fc81510041 100644
--- a/metadata/cache/media-fonts/dejavu-2.33
+++ b/metadata/cache/media-fonts/dejavu-2.33
@@ -6,7 +6,7 @@ fontforge? ( x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfont
 http://dejavu.sourceforge.net/
 BitstreamVera
 DejaVu fonts, bitstream vera with ISO-8859-2 characters
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 eutils font multilib toolchain-funcs user versionator
 fontforge X
 
diff --git a/metadata/cache/media-fonts/encodings-1.0.4 b/metadata/cache/media-fonts/encodings-1.0.4
index a8e62c6d814e..0eab56ae58c4 100644
--- a/metadata/cache/media-fonts/encodings-1.0.4
+++ b/metadata/cache/media-fonts/encodings-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org font encodings
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/media-fonts/font-util-1.3.0 b/metadata/cache/media-fonts/font-util-1.3.0
index ab9276515fb9..fe23f895e739 100644
--- a/metadata/cache/media-fonts/font-util-1.3.0
+++ b/metadata/cache/media-fonts/font-util-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org font utilities
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/media-fonts/kochi-substitute-20030809-r3 b/metadata/cache/media-fonts/kochi-substitute-20030809-r3
index c3d99bf54259..c224d0ba46b9 100644
--- a/metadata/cache/media-fonts/kochi-substitute-20030809-r3
+++ b/metadata/cache/media-fonts/kochi-substitute-20030809-r3
@@ -6,7 +6,7 @@ strip binchecks
 http://efont.sourceforge.jp/
 free-noncomm
 Kochi Japanese TrueType fonts with Wadalab Fonts
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/urw-fonts-2.4.9 b/metadata/cache/media-fonts/urw-fonts-2.4.9
index 64fbbe59fe33..677a039e23c3 100644
--- a/metadata/cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/cache/media-fonts/urw-fonts-2.4.9
@@ -6,7 +6,7 @@ mirror://gentoo/urw-fonts-2.4-9.fc13.src.rpm
 http://www.urwpp.de/
 GPL-2
 free good quality fonts gpl'd by URW++
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils font multilib rpm toolchain-funcs user versionator
 X
 
diff --git a/metadata/cache/media-gfx/ebdftopcf-2 b/metadata/cache/media-gfx/ebdftopcf-2
index 9a5245c6e026..892dcfa23093 100644
--- a/metadata/cache/media-gfx/ebdftopcf-2
+++ b/metadata/cache/media-gfx/ebdftopcf-2
@@ -6,7 +6,7 @@ mirror://gentoo/ebdftopcf-2.tar.bz2
 http://www.gentoo.org/
 GPL-2
 ebdftopcf optimially generators PCF files from BDF files
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 
 
 
diff --git a/metadata/cache/media-libs/fontconfig-2.8.0-r2 b/metadata/cache/media-libs/fontconfig-2.8.0-r2
index 0c645297097c..a8125d1d67e9 100644
--- a/metadata/cache/media-libs/fontconfig-2.8.0-r2
+++ b/metadata/cache/media-libs/fontconfig-2.8.0-r2
@@ -6,7 +6,7 @@ http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
 http://fontconfig.org/
 MIT
 A library for configuring and customizing font access
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 doc static-libs
 
diff --git a/metadata/cache/media-libs/freetype-2.4.9-r1 b/metadata/cache/media-libs/freetype-2.4.9-r1
index 77cc5143dddf..3dea5d3a61e3 100644
--- a/metadata/cache/media-libs/freetype-2.4.9-r1
+++ b/metadata/cache/media-libs/freetype-2.4.9-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourcefor
 http://www.freetype.org/
 FTL GPL-2
 A high-quality and portable font engine
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
 
diff --git a/metadata/cache/media-libs/gd-2.0.35-r3 b/metadata/cache/media-libs/gd-2.0.35-r3
index d4e610bef4c0..03d1a829b262 100644
--- a/metadata/cache/media-libs/gd-2.0.35-r3
+++ b/metadata/cache/media-libs/gd-2.0.35-r3
@@ -6,7 +6,7 @@ http://libgd.org/releases/gd-2.0.35.tar.bz2
 http://libgd.org/ http://www.boutell.com/gd/
 as-is BSD
 A graphics library for fast image creation
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 fontconfig jpeg png static-libs truetype xpm zlib
 
diff --git a/metadata/cache/media-libs/jasper-1.900.1-r4 b/metadata/cache/media-libs/jasper-1.900.1-r4
index ae2ee93f4e6c..6782709f7db3 100644
--- a/metadata/cache/media-libs/jasper-1.900.1-r4
+++ b/metadata/cache/media-libs/jasper-1.900.1-r4
@@ -6,7 +6,7 @@ http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gent
 http://www.ece.uvic.ca/~mdadams/jasper/
 JasPer2.0
 software-based implementation of the codec specified in the JPEG-2000 Part-1 standard
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils libtool multilib toolchain-funcs user
 jpeg opengl static-libs
 
diff --git a/metadata/cache/media-libs/jbig2dec-0.11-r1 b/metadata/cache/media-libs/jbig2dec-0.11-r1
index 08db907b4675..4c496928c58e 100644
--- a/metadata/cache/media-libs/jbig2dec-0.11-r1
+++ b/metadata/cache/media-libs/jbig2dec-0.11-r1
@@ -6,7 +6,7 @@ test
 http://jbig2dec.sourceforge.net/
 GPL-3
 A decoder implementation of the JBIG2 image compression format
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 png static-libs test
 
diff --git a/metadata/cache/media-libs/jbigkit-2.0-r1 b/metadata/cache/media-libs/jbigkit-2.0-r1
index 3d04acafef9d..bd78c4ced213 100644
--- a/metadata/cache/media-libs/jbigkit-2.0-r1
+++ b/metadata/cache/media-libs/jbigkit-2.0-r1
@@ -6,7 +6,7 @@ http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 GPL-2
 data compression algorithm for bi-level high-resolution images
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/lcms-1.19 b/metadata/cache/media-libs/lcms-1.19
index 2bc48bdbcf87..0901b1af50ed 100644
--- a/metadata/cache/media-libs/lcms-1.19
+++ b/metadata/cache/media-libs/lcms-1.19
@@ -6,7 +6,7 @@ http://www.littlecms.com/lcms-1.19.tar.gz
 http://www.littlecms.com/
 MIT
 A lightweight, speed optimized color management engine
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils libtool multilib python toolchain-funcs user
 jpeg python static-libs tiff zlib
 
diff --git a/metadata/cache/media-libs/lcms-2.3 b/metadata/cache/media-libs/lcms-2.3
index cd030b10b1c5..61e9fe1c86c2 100644
--- a/metadata/cache/media-libs/lcms-2.3
+++ b/metadata/cache/media-libs/lcms-2.3
@@ -6,7 +6,7 @@ mirror://sourceforge/lcms/lcms2-2.3.tar.gz
 http://www.littlecms.com/
 MIT
 A lightweight, speed optimized color management engine
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 
 doc jpeg static-libs test tiff zlib
 
diff --git a/metadata/cache/media-libs/libpng-1.5.10 b/metadata/cache/media-libs/libpng-1.5.10
index f6b07aebcb81..c09b30c87e87 100644
--- a/metadata/cache/media-libs/libpng-1.5.10
+++ b/metadata/cache/media-libs/libpng-1.5.10
@@ -6,7 +6,7 @@ mirror://sourceforge/libpng/libpng-1.5.10.tar.xz apng? ( mirror://sourceforge/li
 http://www.libpng.org/
 as-is
 Portable Network Graphics library
-~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 eutils libtool multilib toolchain-funcs user
 apng neon static-libs
 
diff --git a/metadata/cache/media-libs/openjpeg-1.5.0 b/metadata/cache/media-libs/openjpeg-1.5.0
index d84d5d4ec4f8..eaeed3bffcd2 100644
--- a/metadata/cache/media-libs/openjpeg-1.5.0
+++ b/metadata/cache/media-libs/openjpeg-1.5.0
@@ -6,7 +6,7 @@ test
 http://code.google.com/p/openjpeg/
 BSD-2
 An open-source JPEG 2000 library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 doc test
 
diff --git a/metadata/cache/media-libs/tiff-4.0.1-r1 b/metadata/cache/media-libs/tiff-4.0.1-r1
index aab696f2401c..bf51cecdf8e4 100644
--- a/metadata/cache/media-libs/tiff-4.0.1-r1
+++ b/metadata/cache/media-libs/tiff-4.0.1-r1
@@ -6,7 +6,7 @@ http://download.osgeo.org/libtiff/tiff-4.0.1.tar.gz ftp://ftp.remotesensing.org/
 http://www.remotesensing.org/libtiff/
 as-is
 Tag Image File Format (TIFF) library
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils libtool multilib toolchain-funcs user
 +cxx jbig jpeg lzma static-libs zlib
 
diff --git a/metadata/cache/media-libs/xine-lib-1.2.1-r1 b/metadata/cache/media-libs/xine-lib-1.2.1-r1
index 1c58441fe952..e2c4df4435b9 100644
--- a/metadata/cache/media-libs/xine-lib-1.2.1-r1
+++ b/metadata/cache/media-libs/xine-lib-1.2.1-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/xine/xine-lib-1.2.1.tar.xz
 http://xine.sourceforge.net/
 GPL-2
 Core libraries for Xine movie player
-amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
+amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
 eutils libtool multilib toolchain-funcs user
 a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc
 vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
diff --git a/metadata/cache/media-plugins/vdr-osdteletext-0.9.3 b/metadata/cache/media-plugins/vdr-osdteletext-0.9.3
deleted file mode 100644
index 33e50ebc5dac..000000000000
--- a/metadata/cache/media-plugins/vdr-osdteletext-0.9.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-mirror://vdr-developerorg/912/vdr-osdteletext-0.9.3.tgz
-
-http://projects.vdr-developer.org/projects/show/plg-osdteletext
-GPL-2
-VDR Plugin: Osd-Teletext displays the teletext on the OSD
-~amd64 ~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
-
-
-
-
-4
-
-compile config configure install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/bsnmp-1.12 b/metadata/cache/net-analyzer/bsnmp-1.12
new file mode 100644
index 000000000000..c24a3f125a8a
--- /dev/null
+++ b/metadata/cache/net-analyzer/bsnmp-1.12
@@ -0,0 +1,22 @@
+dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
+dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
+0
+http://people.freebsd.org/~harti/bsnmp/bsnmp-1.12.tar.gz
+
+http://people.freebsd.org/~harti/
+BSD
+Mini-SNMP Daemon and Library
+~amd64-fbsd ~x86-fbsd
+eutils flag-o-matic multilib toolchain-funcs user
+tcpd
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dns/c-ares-1.7.5 b/metadata/cache/net-dns/c-ares-1.7.5
index f88ff606ad36..1c19390a0039 100644
--- a/metadata/cache/net-dns/c-ares-1.7.5
+++ b/metadata/cache/net-dns/c-ares-1.7.5
@@ -6,7 +6,7 @@ http://c-ares.haxx.se/download/c-ares-1.7.5.tar.gz
 http://c-ares.haxx.se/
 MIT
 C library that resolves names asynchronously
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 
 static-libs
 
diff --git a/metadata/cache/net-dns/libidn-1.24 b/metadata/cache/net-dns/libidn-1.24
index 227a39f520af..92b5db2b0772 100644
--- a/metadata/cache/net-dns/libidn-1.24
+++ b/metadata/cache/net-dns/libidn-1.24
@@ -6,7 +6,7 @@ mirror://gnu/libidn/libidn-1.24.tar.gz
 http://www.gnu.org/software/libidn/
 GPL-2 GPL-3 LGPL-3
 Internationalized Domain Names (IDN) implementation
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 elisp-common eutils java-pkg-opt-2 java-utils-2 mono multilib toolchain-funcs user versionator
 doc emacs java mono nls static-libs elibc_FreeBSD java
 
diff --git a/metadata/cache/net-im/centerim-4.22.10 b/metadata/cache/net-im/centerim-4.22.10
index e691e606d6d8..50cfcd0aeb9d 100644
--- a/metadata/cache/net-im/centerim-4.22.10
+++ b/metadata/cache/net-im/centerim-4.22.10
@@ -1,5 +1,5 @@
->=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
->=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
+>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
+>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
 0
 http://www.centerim.org/download/releases/centerim-4.22.10.tar.gz
 
diff --git a/metadata/cache/net-im/centerim-4.22.9 b/metadata/cache/net-im/centerim-4.22.9
index 58398094aa25..040b28464292 100644
--- a/metadata/cache/net-im/centerim-4.22.9
+++ b/metadata/cache/net-im/centerim-4.22.9
@@ -1,5 +1,5 @@
->=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
->=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
+>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
+>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
 0
 http://www.centerim.org/download/releases/centerim-4.22.9.tar.gz
 
diff --git a/metadata/cache/net-libs/libssh2-1.4.1 b/metadata/cache/net-libs/libssh2-1.4.1
index 809c012e8863..3063c8eaaa9f 100644
--- a/metadata/cache/net-libs/libssh2-1.4.1
+++ b/metadata/cache/net-libs/libssh2-1.4.1
@@ -6,7 +6,7 @@ http://www.libssh2.org/download/libssh2-1.4.1.tar.gz
 http://www.libssh2.org/
 BSD
 Library implementing the SSH2 protocol
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-solaris
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 gcrypt static-libs test zlib
 
diff --git a/metadata/cache/net-print/cups-1.5.2-r3 b/metadata/cache/net-print/cups-1.5.2-r20
similarity index 100%
rename from metadata/cache/net-print/cups-1.5.2-r3
rename to metadata/cache/net-print/cups-1.5.2-r20
diff --git a/metadata/cache/net-print/cups-1.5.2-r4 b/metadata/cache/net-print/cups-1.5.2-r4
new file mode 100644
index 000000000000..14c473663bb9
--- /dev/null
+++ b/metadata/cache/net-print/cups-1.5.2-r4
@@ -0,0 +1,22 @@
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+0
+mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
+test
+http://www.cups.org/
+GPL-2
+The Common Unix Printing System
+~amd64 ~arm ~hppa ~ppc ~x86
+autotools base eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 libtool linux-info multilib pam perl-module python toolchain-funcs user versionator
+acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd linguas_da linguas_de linguas_es linguas_eu linguas_fi linguas_fr linguas_id linguas_it linguas_ja linguas_ko linguas_nl linguas_no linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_zh linguas_zh_TW elibc_FreeBSD java
+gnutls? ( ssl )
+app-text/ghostscript-gpl[cups] >=app-text/poppler-0.12.3-r3[utils] filters? ( net-print/foomatic-filters )
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-proxy/dante-1.3.2 b/metadata/cache/net-proxy/dante-1.3.2
index de37743703a4..1c08e1aeca2f 100644
--- a/metadata/cache/net-proxy/dante-1.3.2
+++ b/metadata/cache/net-proxy/dante-1.3.2
@@ -6,7 +6,7 @@ ftp://ftp.inet.no/pub/socks/dante-1.3.2.tar.gz
 http://www.inet.no/dante/
 BSD
 A free socks4,5 and msproxy implementation
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 debug kerberos pam selinux static-libs tcpd
 
diff --git a/metadata/cache/net-wireless/bluez-hcidump-2.3 b/metadata/cache/net-wireless/bluez-hcidump-2.3
index 3a0a038fd392..6e31648ceb9d 100644
--- a/metadata/cache/net-wireless/bluez-hcidump-2.3
+++ b/metadata/cache/net-wireless/bluez-hcidump-2.3
@@ -6,7 +6,7 @@ mirror://kernel/linux/bluetooth/bluez-hcidump-2.3.tar.xz
 http://www.bluez.org/
 GPL-2
 Bluetooth HCI packet analyzer
-amd64 hppa ~ppc x86
+amd64 ~arm hppa ~ppc x86
 
 
 
diff --git a/metadata/cache/net-wireless/bluez-hcidump-2.4 b/metadata/cache/net-wireless/bluez-hcidump-2.4
index f96a770aa4eb..94a341c36806 100644
--- a/metadata/cache/net-wireless/bluez-hcidump-2.4
+++ b/metadata/cache/net-wireless/bluez-hcidump-2.4
@@ -6,7 +6,7 @@ mirror://kernel/linux/bluetooth/bluez-hcidump-2.4.tar.xz
 http://www.bluez.org/
 GPL-2
 Bluetooth HCI packet analyzer
-~amd64 ~hppa ~ppc ~x86
+~amd64 ~arm ~hppa ~ppc ~x86
 
 
 
diff --git a/metadata/cache/perl-core/Compress-Raw-Bzip2-2.49.0 b/metadata/cache/perl-core/Compress-Raw-Bzip2-2.49.0
index dc74e3701183..18472ec3de73 100644
--- a/metadata/cache/perl-core/Compress-Raw-Bzip2-2.49.0
+++ b/metadata/cache/perl-core/Compress-Raw-Bzip2-2.49.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.049.tar.gz
 http://search.cpan.org/dist/Compress-Raw-Bzip2/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Low-Level Interface to bzip2 compression library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 alternatives base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/perl-core/Compress-Raw-Zlib-2.49.0 b/metadata/cache/perl-core/Compress-Raw-Zlib-2.49.0
index d8ff7efce280..a38171c11447 100644
--- a/metadata/cache/perl-core/Compress-Raw-Zlib-2.49.0
+++ b/metadata/cache/perl-core/Compress-Raw-Zlib-2.49.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.049.tar.gz
 http://search.cpan.org/dist/Compress-Raw-Zlib/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Low-Level Interface to zlib compression library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 alternatives base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/perl-core/IO-Compress-2.49.0 b/metadata/cache/perl-core/IO-Compress-2.49.0
index 19474d6d5bf9..307bb04bbabe 100644
--- a/metadata/cache/perl-core/IO-Compress-2.49.0
+++ b/metadata/cache/perl-core/IO-Compress-2.49.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.049.tar.gz
 http://search.cpan.org/dist/IO-Compress/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 allow reading and writing of compressed data
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 alternatives base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/perl-core/Scalar-List-Utils-1.250.0 b/metadata/cache/perl-core/Scalar-List-Utils-1.250.0
index 8323116c16e0..487bc6111da4 100644
--- a/metadata/cache/perl-core/Scalar-List-Utils-1.250.0
+++ b/metadata/cache/perl-core/Scalar-List-Utils-1.250.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.25.tar.gz
 http://search.cpan.org/dist/Scalar-List-Utils/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Scalar-List-Utils module for perl
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 alternatives base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-astronomy/sextractor-2.5.0 b/metadata/cache/sci-astronomy/sextractor-2.5.0
deleted file mode 100644
index f36b79e5711e..000000000000
--- a/metadata/cache/sci-astronomy/sextractor-2.5.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/sextractor-2.5.0.tar.gz
-
-http://terapix.iap.fr/soft/sextractor
-GPL-2
-Extract catalogs of sources from astronomical FITS images.
-~amd64 ~x86
-eutils flag-o-matic multilib toolchain-funcs user
-doc
-
-
-
-2
-
-configure install postinst
-
-
-
-
-
diff --git a/metadata/cache/sci-astronomy/sextractor-2.8.6 b/metadata/cache/sci-astronomy/sextractor-2.8.6
index 5b196bd1d014..01aeaca5eb72 100644
--- a/metadata/cache/sci-astronomy/sextractor-2.8.6
+++ b/metadata/cache/sci-astronomy/sextractor-2.8.6
@@ -1,20 +1,20 @@
-virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0
+virtual/cblas sci-libs/lapack-atlas sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/cblas sci-libs/lapack-atlas sci-libs/fftw:3.0
 0
 ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/sextractor-2.8.6.tar.gz
 
-http://astromatic.iap.fr/software/sextractor
+http://astromatic.iap.fr/software/sextractor/
 CeCILL-2
-Extract catalogs of sources from astronomical FITS images.
+Extract catalogs of sources from astronomical FITS images
 ~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
+autotools autotools-utils eutils libtool multilib toolchain-funcs user
 doc threads
 
 
 
-2
+4
 
-configure install postinst prepare
+compile configure install postinst prepare test
 
 
 
diff --git a/metadata/cache/sci-biology/bamtools-1.0.2 b/metadata/cache/sci-biology/bamtools-1.0.2
index b7c4f677c94c..6200e93b1e73 100644
--- a/metadata/cache/sci-biology/bamtools-1.0.2
+++ b/metadata/cache/sci-biology/bamtools-1.0.2
@@ -5,7 +5,7 @@ mirror://github/pezmaster31/bamtools/bamtools-1.0.2.tar.gz
 
 https://github.com/pezmaster31/bamtools
 MIT
-BamTools provides both a programmer's API and an end-user's toolkit for handling BAM files.
+A programmer's API and an end-user's toolkit for handling BAM files
 ~amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 
diff --git a/metadata/cache/sci-biology/emboss-6.1.0 b/metadata/cache/sci-biology/emboss-6.1.0
deleted file mode 100644
index 2d6e6f121c62..000000000000
--- a/metadata/cache/sci-biology/emboss-6.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-libs/libXt ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) !minimal? ( sci-biology/primer3 sci-biology/clustalw )
-X? ( x11-libs/libXt ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) !minimal? ( sci-biology/primer3 sci-biology/clustalw ) !sys-devel/cons
-0
-ftp://emboss.open-bio.org/pub/EMBOSS/old/6.1.0/EMBOSS-6.1.0.tar.gz
-
-http://emboss.sourceforge.net/
-GPL-2 LGPL-2
-The European Molecular Biology Open Software Suite - A sequence analysis package
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-X png minimal
-
-!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/prints sci-biology/prosite >=sci-biology/rebase-707 sci-biology/transfac )
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/sci-biology/pilercr-1.0 b/metadata/cache/sci-biology/pilercr-1.0
index e25134b7c4ce..e680b7dbb4fa 100644
--- a/metadata/cache/sci-biology/pilercr-1.0
+++ b/metadata/cache/sci-biology/pilercr-1.0
@@ -12,7 +12,7 @@ eutils multilib toolchain-funcs user
 
 
 
-2
+4
 
 compile install prepare
 
diff --git a/metadata/cache/sci-calculators/hexcalc-1.11 b/metadata/cache/sci-calculators/hexcalc-1.11
deleted file mode 100644
index 74dbc88ff86a..000000000000
--- a/metadata/cache/sci-calculators/hexcalc-1.11
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXaw x11-misc/imake app-text/rman
-x11-libs/libXaw
-0
-ftp://ftp.x.org/R5contrib/hexcalc.tar.Z
-
-ftp://ftp.x.org/R5contrib/
-GPL-2
-A simple hex calculator for X
-amd64 ppc x86
-
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/sci-calculators/hexcalc-1.11-r2 b/metadata/cache/sci-calculators/hexcalc-1.11-r2
index 8e7f0061592b..8e0849daef67 100644
--- a/metadata/cache/sci-calculators/hexcalc-1.11-r2
+++ b/metadata/cache/sci-calculators/hexcalc-1.11-r2
@@ -12,7 +12,7 @@ eutils multilib toolchain-funcs user
 
 
 
-3
+4
 
 compile install prepare
 
diff --git a/metadata/cache/sys-apps/findutils-4.5.10-r1 b/metadata/cache/sys-apps/findutils-4.5.10-r1
index f3bf0a967321..0483a38c0ce2 100644
--- a/metadata/cache/sys-apps/findutils-4.5.10-r1
+++ b/metadata/cache/sys-apps/findutils-4.5.10-r1
@@ -6,7 +6,7 @@ mirror://gnu-alpha/findutils/findutils-4.5.10.tar.gz
 http://www.gnu.org/software/findutils/
 GPL-2
 GNU utilities for finding files
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 nls selinux static
 
diff --git a/metadata/cache/sys-apps/help2man-1.40.8 b/metadata/cache/sys-apps/help2man-1.40.8
index da57507ecad2..577d24f11f41 100644
--- a/metadata/cache/sys-apps/help2man-1.40.8
+++ b/metadata/cache/sys-apps/help2man-1.40.8
@@ -6,7 +6,7 @@ mirror://gnu/help2man/help2man-1.40.8.tar.gz
 http://www.gnu.org/software/help2man
 GPL-2
 GNU utility to convert program --help output to a man page
-~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 nls elibc_glibc
 
diff --git a/metadata/cache/sys-apps/pciutils-3.1.9-r2 b/metadata/cache/sys-apps/pciutils-3.1.9-r2
index 528202499940..35043e5fca29 100644
--- a/metadata/cache/sys-apps/pciutils-3.1.9-r2
+++ b/metadata/cache/sys-apps/pciutils-3.1.9-r2
@@ -1,5 +1,5 @@
-zlib? ( sys-libs/zlib )
-zlib? ( sys-libs/zlib ) sys-apps/hwids
+static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) )
+static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) sys-apps/hwids
 0
 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.9.tar.gz
 
diff --git a/metadata/cache/sys-auth/pam_mktemp-1.1.1 b/metadata/cache/sys-auth/pam_mktemp-1.1.1
index a4b92a8b3ae2..fcd155462380 100644
--- a/metadata/cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/cache/sys-auth/pam_mktemp-1.1.1
@@ -6,7 +6,7 @@ http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
 http://www.openwall.com/pam/
 BSD-2
 Create per-user private temporary directories during login
-alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 eutils flag-o-matic multilib pam toolchain-funcs user
 selinux +prevent-removal
 
diff --git a/metadata/cache/sys-devel/autoconf-2.13 b/metadata/cache/sys-devel/autoconf-2.13
index 76d9d7a98b82..37335d27a876 100644
--- a/metadata/cache/sys-devel/autoconf-2.13
+++ b/metadata/cache/sys-devel/autoconf-2.13
@@ -6,7 +6,7 @@ mirror://gnu/autoconf/autoconf-2.13.tar.gz
 http://www.gnu.org/software/autoconf/autoconf.html
 GPL-2
 Used to create autoconfiguration files
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-devel/autogen-5.15 b/metadata/cache/sys-devel/autogen-5.15
index 413f8f1b845f..d9066fa74d95 100644
--- a/metadata/cache/sys-devel/autogen-5.15
+++ b/metadata/cache/sys-devel/autogen-5.15
@@ -6,7 +6,7 @@ mirror://gnu/autogen/rel5.15/autogen-5.15.tar.xz
 http://www.gnu.org/software/autogen/
 GPL-2
 Program and text file generation
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-devel/gdb-6.6-r2 b/metadata/cache/sys-devel/gdb-6.6-r2
index 7e480e4caf7a..b49ef70d3f1b 100644
--- a/metadata/cache/sys-devel/gdb-6.6-r2
+++ b/metadata/cache/sys-devel/gdb-6.6-r2
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2
 0
-http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.6.tar.bz2 mirror://gentoo/gdb-6.6-patches-1.3.tar.bz2
+mirror://gnu/gdb/gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.6.tar.bz2 mirror://gentoo/gdb-6.6-patches-1.3.tar.bz2
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-6.7.1-r3 b/metadata/cache/sys-devel/gdb-6.7.1-r3
index 7007c14f85d7..c97394750a01 100644
--- a/metadata/cache/sys-devel/gdb-6.7.1-r3
+++ b/metadata/cache/sys-devel/gdb-6.7.1-r3
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline
 0
-http://ftp.gnu.org/gnu/gdb/gdb-6.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.7.1.tar.bz2 mirror://gentoo/gdb-6.7.1-patches-1.3.tar.bz2
+mirror://gnu/gdb/gdb-6.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.7.1.tar.bz2 mirror://gentoo/gdb-6.7.1-patches-1.3.tar.bz2
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-6.8-r1 b/metadata/cache/sys-devel/gdb-6.8-r1
index d3ddf0509465..329e6ff69ed7 100644
--- a/metadata/cache/sys-devel/gdb-6.8-r1
+++ b/metadata/cache/sys-devel/gdb-6.8-r1
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline || ( app-arch/xz-utils app-arch/lzma-utils ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline
 0
-http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.4.tar.lzma
+mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.4.tar.lzma
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-6.8-r2 b/metadata/cache/sys-devel/gdb-6.8-r2
index beef3f38aaf1..02ddf07ad89d 100644
--- a/metadata/cache/sys-devel/gdb-6.8-r2
+++ b/metadata/cache/sys-devel/gdb-6.8-r2
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) || ( app-arch/xz-utils app-arch/lzma-utils ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.5.tar.lzma
+mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.5.tar.lzma
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.0.1 b/metadata/cache/sys-devel/gdb-7.0.1
index 29cf61482a1a..2e6d8fecfe00 100644
--- a/metadata/cache/sys-devel/gdb-7.0.1
+++ b/metadata/cache/sys-devel/gdb-7.0.1
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python ) || ( app-arch/xz-utils app-arch/lzma-utils ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.0.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.1.tar.bz2 mirror://gentoo/gdb-7.0.1-patches-1.tar.lzma
+mirror://gnu/gdb/gdb-7.0.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.1.tar.bz2 mirror://gentoo/gdb-7.0.1-patches-1.tar.lzma
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.1 b/metadata/cache/sys-devel/gdb-7.1
index 062ba5728d7b..d16e238b42ff 100644
--- a/metadata/cache/sys-devel/gdb-7.1
+++ b/metadata/cache/sys-devel/gdb-7.1
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python ) || ( app-arch/xz-utils app-arch/lzma-utils ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.1.tar.bz2 mirror://gentoo/gdb-7.1-patches-1.tar.lzma
+mirror://gnu/gdb/gdb-7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.1.tar.bz2 mirror://gentoo/gdb-7.1-patches-1.tar.lzma
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.2 b/metadata/cache/sys-devel/gdb-7.2
index d4200105b634..f55527e479ba 100644
--- a/metadata/cache/sys-devel/gdb-7.2
+++ b/metadata/cache/sys-devel/gdb-7.2
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 mirror://gentoo/gdb-7.2-patches-1.tar.xz
+mirror://gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 mirror://gentoo/gdb-7.2-patches-1.tar.xz
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.2.50.20101117.4.15 b/metadata/cache/sys-devel/gdb-7.2.50.20101117.4.15
index deecf0e6800f..d1fd37bf43e8 100644
--- a/metadata/cache/sys-devel/gdb-7.2.50.20101117.4.15
+++ b/metadata/cache/sys-devel/gdb-7.2.50.20101117.4.15
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) >=app-arch/rpm2targz-9.0.0.3g
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 0
-http://mirrors.kernel.org/fedora/development/source/SRPMS/gdb-7.2.50.20101117-4.fc15.src.rpm
+mirror://fedora/development/source/SRPMS/gdb-7.2.50.20101117-4.fc15.src.rpm
 
 http://sources.redhat.com/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.3 b/metadata/cache/sys-devel/gdb-7.3
index 5a3a468a59dd..60c26baddb33 100644
--- a/metadata/cache/sys-devel/gdb-7.3
+++ b/metadata/cache/sys-devel/gdb-7.3
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.3.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.tar.bz2 mirror://gentoo/gdb-7.3-patches-1.tar.xz
+mirror://gnu/gdb/gdb-7.3.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.tar.bz2 mirror://gentoo/gdb-7.3-patches-1.tar.xz
 
 http://sourceware.org/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.3.1 b/metadata/cache/sys-devel/gdb-7.3.1
index ca1c3ed45823..c31a2a0daaf7 100644
--- a/metadata/cache/sys-devel/gdb-7.3.1
+++ b/metadata/cache/sys-devel/gdb-7.3.1
@@ -1,7 +1,7 @@
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
+mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
 
 http://sourceware.org/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.3.1-r1 b/metadata/cache/sys-devel/gdb-7.3.1-r1
index 87e458ef4186..32605ef85a9a 100644
--- a/metadata/cache/sys-devel/gdb-7.3.1-r1
+++ b/metadata/cache/sys-devel/gdb-7.3.1-r1
@@ -1,7 +1,7 @@
 !dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 !dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
+mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
 
 http://sourceware.org/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.4 b/metadata/cache/sys-devel/gdb-7.4
index ad456a6bf443..f73336797bb8 100644
--- a/metadata/cache/sys-devel/gdb-7.4
+++ b/metadata/cache/sys-devel/gdb-7.4
@@ -1,7 +1,7 @@
 !dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
 !dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 0
-http://ftp.gnu.org/gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
+mirror://gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
 
 http://sourceware.org/gdb/
 GPL-2 LGPL-2
diff --git a/metadata/cache/sys-devel/gdb-7.4.1 b/metadata/cache/sys-devel/gdb-7.4.1
new file mode 100644
index 000000000000..7481b62841e9
--- /dev/null
+++ b/metadata/cache/sys-devel/gdb-7.4.1
@@ -0,0 +1,22 @@
+!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
+!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
+0
+mirror://gnu/gdb/gdb-7.4.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.1.tar.bz2 mirror://gentoo/gdb-7.4.1-patches-1.tar.xz
+
+http://sourceware.org/gdb/
+GPL-2 LGPL-2
+GNU debugger
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils flag-o-matic multilib toolchain-funcs user
++client expat multitarget nls +python +server test vanilla zlib
+
+
+
+3
+
+configure install postinst prepare test
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/glibc-2.15-r1 b/metadata/cache/sys-libs/glibc-2.15-r1
index f22f3447d1b5..88aab4746cdb 100644
--- a/metadata/cache/sys-libs/glibc-2.15-r1
+++ b/metadata/cache/sys-libs/glibc-2.15-r1
@@ -1,7 +1,7 @@
 >=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
 !sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
-mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-9.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-9.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-9.tar.bz2
+mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-10.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-10.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-10.tar.bz2
 strip
 http://www.gnu.org/software/libc/libc.html
 LGPL-2
diff --git a/metadata/cache/sys-libs/libosinfo-0.1.1 b/metadata/cache/sys-libs/libosinfo-0.1.1
new file mode 100644
index 000000000000..0be90ac76ca2
--- /dev/null
+++ b/metadata/cache/sys-libs/libosinfo-0.1.1
@@ -0,0 +1,22 @@
+dev-libs/glib:2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 >=dev-libs/libxml2-2.6.0:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) test? ( dev-libs/check ) vala? ( dev-lang/vala:0.14 ) app-arch/xz-utils >=sys-apps/sed-4
+dev-libs/glib:2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 >=dev-libs/libxml2-2.6.0:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+0
+https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.1.1.tar.gz
+
+https://fedorahosted.org/libosinfo/
+GPL-2 LGPL-2.1
+GObject library for managing information about real and virtual OSes
+~amd64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+doc +introspection +vala test
+vala? ( introspection )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-power/iasl-20111123 b/metadata/cache/sys-power/iasl-20111123
index 45fff2b91c5d..dc1089e4c40b 100644
--- a/metadata/cache/sys-power/iasl-20111123
+++ b/metadata/cache/sys-power/iasl-20111123
@@ -6,7 +6,7 @@ http://www.acpica.org/download/acpica-unix-20111123.tar.gz test? ( http://www.ac
 http://www.intel.com/technology/iapc/acpi/
 iASL
 Intel ACPI Source Language (ASL) compiler
-~amd64 ~ppc ~x86 ~x86-fbsd
+~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 test
 
diff --git a/metadata/cache/virtual/fam-0 b/metadata/cache/virtual/fam-0
index 8a19882215ef..62e9d53bed2c 100644
--- a/metadata/cache/virtual/fam-0
+++ b/metadata/cache/virtual/fam-0
@@ -6,7 +6,7 @@
 
 
 A virtual package to choose between gamin and fam
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/jpeg-0 b/metadata/cache/virtual/jpeg-0
index 08198b1039c8..0a629b8f1329 100644
--- a/metadata/cache/virtual/jpeg-0
+++ b/metadata/cache/virtual/jpeg-0
@@ -6,7 +6,7 @@
 
 
 A virtual for the JPEG implementation
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 static-libs
 
diff --git a/metadata/cache/virtual/perl-Compress-Raw-Bzip2-2.49.0 b/metadata/cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
index 2bd041397fda..d15f3f5d6e02 100644
--- a/metadata/cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
+++ b/metadata/cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
@@ -6,7 +6,7 @@
 
 
 Virtual for Compress-Raw-Bzip2
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/perl-Compress-Raw-Zlib-2.49.0 b/metadata/cache/virtual/perl-Compress-Raw-Zlib-2.49.0
index bf1f8ec64284..c22374e7e8fa 100644
--- a/metadata/cache/virtual/perl-Compress-Raw-Zlib-2.49.0
+++ b/metadata/cache/virtual/perl-Compress-Raw-Zlib-2.49.0
@@ -6,7 +6,7 @@
 
 
 Virtual for Compress-Raw-Zlib
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/perl-IO-Compress-2.49.0 b/metadata/cache/virtual/perl-IO-Compress-2.49.0
index e2e7bb513077..d7ef873745e2 100644
--- a/metadata/cache/virtual/perl-IO-Compress-2.49.0
+++ b/metadata/cache/virtual/perl-IO-Compress-2.49.0
@@ -6,7 +6,7 @@
 
 
 Virtual for IO-Compress
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/perl-Scalar-List-Utils-1.250.0 b/metadata/cache/virtual/perl-Scalar-List-Utils-1.250.0
index 7b4b5372b29e..edee2d481ee5 100644
--- a/metadata/cache/virtual/perl-Scalar-List-Utils-1.250.0
+++ b/metadata/cache/virtual/perl-Scalar-List-Utils-1.250.0
@@ -6,7 +6,7 @@
 
 
 Virtual for Scalar-List-Utils
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/ttf-fonts-1 b/metadata/cache/virtual/ttf-fonts-1
index 4c5f5f6401f7..38e0aecfb766 100644
--- a/metadata/cache/virtual/ttf-fonts-1
+++ b/metadata/cache/virtual/ttf-fonts-1
@@ -6,7 +6,7 @@
 
 
 Virtual for Serif/Sans/Monospace font packages
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/www-apps/mediawiki-1.19.0_beta2 b/metadata/cache/www-apps/mediawiki-1.18.3
similarity index 88%
rename from metadata/cache/www-apps/mediawiki-1.19.0_beta2
rename to metadata/cache/www-apps/mediawiki-1.18.3
index 157847e0159d..fdf9c14b5a83 100644
--- a/metadata/cache/www-apps/mediawiki-1.19.0_beta2
+++ b/metadata/cache/www-apps/mediawiki-1.18.3
@@ -1,7 +1,7 @@
 || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 >=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader] imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) !imagemagick? ( dev-lang/php[gd] ) sqlite? ( dev-db/sqlite:3[fts3] >=dev-lang/php-5.3[sqlite3,pdo] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-1.19.0_beta2
-http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0beta2.tar.gz
+1.18.3
+http://download.wikimedia.org/mediawiki/1.18/mediawiki-1.18.3.tar.gz
 test
 http://www.mediawiki.org
 GPL-2
diff --git a/metadata/cache/www-apps/mediawiki-1.19.0_beta1 b/metadata/cache/www-apps/mediawiki-1.19.0_rc1
similarity index 88%
rename from metadata/cache/www-apps/mediawiki-1.19.0_beta1
rename to metadata/cache/www-apps/mediawiki-1.19.0_rc1
index 742e855256e2..76b81e448d56 100644
--- a/metadata/cache/www-apps/mediawiki-1.19.0_beta1
+++ b/metadata/cache/www-apps/mediawiki-1.19.0_rc1
@@ -1,7 +1,7 @@
 || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 >=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader] imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) !imagemagick? ( dev-lang/php[gd] ) sqlite? ( dev-db/sqlite:3[fts3] >=dev-lang/php-5.3[sqlite3,pdo] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-1.19.0_beta1
-http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0beta1.tar.gz
+1.19.0_rc1
+http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0rc1.tar.gz
 test
 http://www.mediawiki.org
 GPL-2
diff --git a/metadata/cache/www-apps/roundup-1.4.19 b/metadata/cache/www-apps/roundup-1.4.19
new file mode 100644
index 000000000000..fb64eb864f74
--- /dev/null
+++ b/metadata/cache/www-apps/roundup-1.4.19
@@ -0,0 +1,22 @@
+>=sys-libs/db-3.2.9 =dev-lang/python-2*
+>=sys-libs/db-3.2.9 =dev-lang/python-2*
+0
+mirror://pypi/r/roundup/roundup-1.4.19.tar.gz
+
+http://roundup.sourceforge.net http://pypi.python.org/pypi/roundup
+MIT ZPL
+Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces.
+~amd64 ~ppc ~sparc ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/wordpress-3.3.2 b/metadata/cache/www-apps/wordpress-3.3.2
new file mode 100644
index 000000000000..25af47159751
--- /dev/null
+++ b/metadata/cache/www-apps/wordpress-3.3.2
@@ -0,0 +1,22 @@
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
+3.3.2
+http://wordpress.org/wordpress-3.3.2.tar.gz
+
+http://wordpress.org/
+GPL-2
+Wordpress php and mysql based CMS system
+~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-client/firefox-10.0 b/metadata/cache/www-client/firefox-10.0
deleted file mode 100644
index 9b6e727d9187..000000000000
--- a/metadata/cache/www-client/firefox-10.0
+++ /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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/af.xpi -> firefox-10.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ak.xpi -> firefox-10.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ar.xpi -> firefox-10.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/as.xpi -> firefox-10.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ast.xpi -> firefox-10.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/be.xpi -> firefox-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bg.xpi -> firefox-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-BD.xpi -> firefox-10.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-IN.xpi -> firefox-10.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/br.xpi -> firefox-10.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bs.xpi -> firefox-10.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ca.xpi -> firefox-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cs.xpi -> firefox-10.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/csb.xpi -> firefox-10.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cy.xpi -> firefox-10.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/da.xpi -> firefox-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/de.xpi -> firefox-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/el.xpi -> firefox-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-GB.xpi -> firefox-10.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-ZA.xpi -> firefox-10.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eo.xpi -> firefox-10.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-AR.xpi -> firefox-10.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-CL.xpi -> firefox-10.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-ES.xpi -> firefox-10.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-MX.xpi -> firefox-10.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/et.xpi -> firefox-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eu.xpi -> firefox-10.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fa.xpi -> firefox-10.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fi.xpi -> firefox-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fr.xpi -> firefox-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fy-NL.xpi -> firefox-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ga-IE.xpi -> firefox-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gd.xpi -> firefox-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gl.xpi -> firefox-10.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gu-IN.xpi -> firefox-10.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/he.xpi -> firefox-10.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hi-IN.xpi -> firefox-10.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hr.xpi -> firefox-10.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hu.xpi -> firefox-10.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hy-AM.xpi -> firefox-10.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/id.xpi -> firefox-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/is.xpi -> firefox-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/it.xpi -> firefox-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ja.xpi -> firefox-10.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kk.xpi -> firefox-10.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kn.xpi -> firefox-10.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ko.xpi -> firefox-10.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ku.xpi -> firefox-10.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lg.xpi -> firefox-10.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lt.xpi -> firefox-10.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lv.xpi -> firefox-10.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mai.xpi -> firefox-10.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mk.xpi -> firefox-10.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ml.xpi -> firefox-10.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mr.xpi -> firefox-10.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nb-NO.xpi -> firefox-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nl.xpi -> firefox-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nn-NO.xpi -> firefox-10.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nso.xpi -> firefox-10.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/or.xpi -> firefox-10.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pa-IN.xpi -> firefox-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pl.xpi -> firefox-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-BR.xpi -> firefox-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-PT.xpi -> firefox-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/rm.xpi -> firefox-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ro.xpi -> firefox-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ru.xpi -> firefox-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/si.xpi -> firefox-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sk.xpi -> firefox-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sl.xpi -> firefox-10.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/son.xpi -> firefox-10.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sq.xpi -> firefox-10.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sr.xpi -> firefox-10.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sv-SE.xpi -> firefox-10.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta.xpi -> firefox-10.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta-LK.xpi -> firefox-10.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/te.xpi -> firefox-10.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/th.xpi -> firefox-10.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/tr.xpi -> firefox-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/uk.xpi -> firefox-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/vi.xpi -> firefox-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-CN.xpi -> firefox-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-TW.xpi -> firefox-10.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zu.xpi -> firefox-10.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0/source/firefox-10.0.source.tar.bz2
-
-http://www.mozilla.com/firefox
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Firefox Web Browser
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user virtualx
-bindist +crashreporter +ipc pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/firefox-10.0.1 b/metadata/cache/www-client/firefox-10.0.1
deleted file mode 100644
index a554840ce00f..000000000000
--- a/metadata/cache/www-client/firefox-10.0.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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
-
-http://www.mozilla.com/firefox
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Firefox Web Browser
-~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user virtualx
-bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/firefox-10.0.1-r1 b/metadata/cache/www-client/firefox-10.0.1-r1
deleted file mode 100644
index a7082710242f..000000000000
--- a/metadata/cache/www-client/firefox-10.0.1-r1
+++ /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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
-
-http://www.mozilla.com/firefox
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Firefox Web Browser
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user virtualx
-bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/firefox-10.0.4 b/metadata/cache/www-client/firefox-10.0.4
new file mode 100644
index 000000000000..5a53fb493202
--- /dev/null
+++ b/metadata/cache/www-client/firefox-10.0.4
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/af.xpi -> firefox-10.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ak.xpi -> firefox-10.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> firefox-10.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/as.xpi -> firefox-10.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> firefox-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/be.xpi -> firefox-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> firefox-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/br.xpi -> firefox-10.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bs.xpi -> firefox-10.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> firefox-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> firefox-10.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/csb.xpi -> firefox-10.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cy.xpi -> firefox-10.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/da.xpi -> firefox-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/de.xpi -> firefox-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/el.xpi -> firefox-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eo.xpi -> firefox-10.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/et.xpi -> firefox-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> firefox-10.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fa.xpi -> firefox-10.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> firefox-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> firefox-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> firefox-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> firefox-10.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/he.xpi -> firefox-10.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hr.xpi -> firefox-10.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> firefox-10.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/id.xpi -> firefox-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/is.xpi -> firefox-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/it.xpi -> firefox-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> firefox-10.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kk.xpi -> firefox-10.0.4esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kn.xpi -> firefox-10.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> firefox-10.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ku.xpi -> firefox-10.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lg.xpi -> firefox-10.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> firefox-10.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lv.xpi -> firefox-10.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mai.xpi -> firefox-10.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mk.xpi -> firefox-10.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ml.xpi -> firefox-10.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mr.xpi -> firefox-10.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> firefox-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nso.xpi -> firefox-10.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/or.xpi -> firefox-10.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> firefox-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> firefox-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> firefox-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> firefox-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/si.xpi -> firefox-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> firefox-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> firefox-10.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/son.xpi -> firefox-10.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> firefox-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> firefox-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta.xpi -> firefox-10.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/te.xpi -> firefox-10.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/th.xpi -> firefox-10.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> firefox-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> firefox-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> firefox-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zu.xpi -> firefox-10.0.4esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/source/firefox-10.0.4esr.source.tar.bz2
+
+http://www.mozilla.com/firefox
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Firefox Web Browser
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user virtualx
+bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
+
+
+
+3
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/firefox-8.0 b/metadata/cache/www-client/firefox-8.0
deleted file mode 100644
index 58e75a853ec8..000000000000
--- a/metadata/cache/www-client/firefox-8.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) 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
-http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//8.0/source/firefox-8.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/af.xpi -> firefox-8.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ak.xpi -> firefox-8.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ar.xpi -> firefox-8.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ast.xpi -> firefox-8.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/be.xpi -> firefox-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bg.xpi -> firefox-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/br.xpi -> firefox-8.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bs.xpi -> firefox-8.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ca.xpi -> firefox-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cs.xpi -> firefox-8.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cy.xpi -> firefox-8.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/da.xpi -> firefox-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/de.xpi -> firefox-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/el.xpi -> firefox-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-GB.xpi -> firefox-8.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-ZA.xpi -> firefox-8.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eo.xpi -> firefox-8.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/et.xpi -> firefox-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eu.xpi -> firefox-8.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fa.xpi -> firefox-8.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fi.xpi -> firefox-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fr.xpi -> firefox-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gd.xpi -> firefox-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gl.xpi -> firefox-8.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/he.xpi -> firefox-8.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hr.xpi -> firefox-8.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hu.xpi -> firefox-8.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/id.xpi -> firefox-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/is.xpi -> firefox-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/it.xpi -> firefox-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ja.xpi -> firefox-8.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kk.xpi -> firefox-8.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kn.xpi -> firefox-8.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ko.xpi -> firefox-8.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ku.xpi -> firefox-8.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lg.xpi -> firefox-8.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lt.xpi -> firefox-8.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lv.xpi -> firefox-8.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mai.xpi -> firefox-8.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mk.xpi -> firefox-8.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ml.xpi -> firefox-8.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mr.xpi -> firefox-8.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nl.xpi -> firefox-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nso.xpi -> firefox-8.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/or.xpi -> firefox-8.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pl.xpi -> firefox-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/rm.xpi -> firefox-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ro.xpi -> firefox-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ru.xpi -> firefox-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/si.xpi -> firefox-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sk.xpi -> firefox-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sl.xpi -> firefox-8.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/son.xpi -> firefox-8.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sq.xpi -> firefox-8.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sr.xpi -> firefox-8.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta.xpi -> firefox-8.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta-LK.xpi -> firefox-8.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/te.xpi -> firefox-8.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/th.xpi -> firefox-8.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/tr.xpi -> firefox-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/uk.xpi -> firefox-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/vi.xpi -> firefox-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zu.xpi -> firefox-8.0-zu.xpi )
-
-http://www.mozilla.com/firefox
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Firefox Web Browser
-amd64 ~arm x86 ~amd64-linux ~x86-linux
-autotools eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils python toolchain-funcs user versionator virtualx
-bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy 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_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/firefox-9.0 b/metadata/cache/www-client/firefox-9.0
deleted file mode 100644
index e041aea50322..000000000000
--- a/metadata/cache/www-client/firefox-9.0
+++ /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:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) 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
-http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//9.0/source/firefox-9.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/af.xpi -> firefox-9.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ak.xpi -> firefox-9.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ar.xpi -> firefox-9.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ast.xpi -> firefox-9.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/be.xpi -> firefox-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bg.xpi -> firefox-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/br.xpi -> firefox-9.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bs.xpi -> firefox-9.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ca.xpi -> firefox-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cs.xpi -> firefox-9.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cy.xpi -> firefox-9.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/da.xpi -> firefox-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/de.xpi -> firefox-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/el.xpi -> firefox-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-GB.xpi -> firefox-9.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-ZA.xpi -> firefox-9.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eo.xpi -> firefox-9.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/et.xpi -> firefox-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eu.xpi -> firefox-9.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fa.xpi -> firefox-9.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fi.xpi -> firefox-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fr.xpi -> firefox-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gd.xpi -> firefox-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gl.xpi -> firefox-9.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/he.xpi -> firefox-9.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hr.xpi -> firefox-9.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hu.xpi -> firefox-9.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/id.xpi -> firefox-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/is.xpi -> firefox-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/it.xpi -> firefox-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ja.xpi -> firefox-9.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kk.xpi -> firefox-9.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kn.xpi -> firefox-9.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ko.xpi -> firefox-9.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ku.xpi -> firefox-9.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lg.xpi -> firefox-9.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lt.xpi -> firefox-9.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lv.xpi -> firefox-9.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mai.xpi -> firefox-9.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mk.xpi -> firefox-9.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ml.xpi -> firefox-9.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mr.xpi -> firefox-9.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nl.xpi -> firefox-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nso.xpi -> firefox-9.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/or.xpi -> firefox-9.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pl.xpi -> firefox-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/rm.xpi -> firefox-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ro.xpi -> firefox-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ru.xpi -> firefox-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/si.xpi -> firefox-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sk.xpi -> firefox-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sl.xpi -> firefox-9.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/son.xpi -> firefox-9.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sq.xpi -> firefox-9.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sr.xpi -> firefox-9.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta.xpi -> firefox-9.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta-LK.xpi -> firefox-9.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/te.xpi -> firefox-9.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/th.xpi -> firefox-9.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/tr.xpi -> firefox-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/uk.xpi -> firefox-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/vi.xpi -> firefox-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zu.xpi -> firefox-9.0-zu.xpi )
-
-http://www.mozilla.com/firefox
-|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-Firefox Web Browser
-~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension multilib nsplugins pax-utils python toolchain-funcs user versionator virtualx
-bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy 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_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/firefox-bin-10.0.4 b/metadata/cache/www-client/firefox-bin-10.0.4
new file mode 100644
index 000000000000..b0e1cf0b932f
--- /dev/null
+++ b/metadata/cache/www-client/firefox-bin-10.0.4
@@ -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//10.0.4esr/linux-i686/xpi/af.xpi -> firefox-10.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ak.xpi -> firefox-10.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> firefox-10.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/as.xpi -> firefox-10.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> firefox-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/be.xpi -> firefox-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> firefox-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/br.xpi -> firefox-10.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bs.xpi -> firefox-10.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> firefox-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> firefox-10.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/csb.xpi -> firefox-10.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/cy.xpi -> firefox-10.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/da.xpi -> firefox-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/de.xpi -> firefox-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/el.xpi -> firefox-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/eo.xpi -> firefox-10.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/et.xpi -> firefox-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> firefox-10.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fa.xpi -> firefox-10.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> firefox-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> firefox-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> firefox-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> firefox-10.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/he.xpi -> firefox-10.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hr.xpi -> firefox-10.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> firefox-10.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/id.xpi -> firefox-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/is.xpi -> firefox-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/it.xpi -> firefox-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> firefox-10.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/kk.xpi -> firefox-10.0.4esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/kn.xpi -> firefox-10.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> firefox-10.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ku.xpi -> firefox-10.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lg.xpi -> firefox-10.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> firefox-10.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lv.xpi -> firefox-10.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mai.xpi -> firefox-10.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mk.xpi -> firefox-10.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ml.xpi -> firefox-10.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mr.xpi -> firefox-10.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> firefox-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nso.xpi -> firefox-10.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/or.xpi -> firefox-10.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> firefox-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> firefox-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> firefox-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> firefox-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/si.xpi -> firefox-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> firefox-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> firefox-10.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/son.xpi -> firefox-10.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> firefox-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> firefox-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ta.xpi -> firefox-10.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/te.xpi -> firefox-10.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/th.xpi -> firefox-10.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> firefox-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> firefox-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> firefox-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zu.xpi -> firefox-10.0.4esr-zu.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.4esr/linux-x86_64/en-US/firefox-10.0.4esr.tar.bz2 -> firefox-bin_x86_64-10.0.4.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.4esr/linux-i686/en-US/firefox-10.0.4esr.tar.bz2 -> firefox-bin_i686-10.0.4.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/lynx-2.8.7_p1 b/metadata/cache/www-client/lynx-2.8.7_p1
index 799753686d38..bbea5d49d158 100644
--- a/metadata/cache/www-client/lynx-2.8.7_p1
+++ b/metadata/cache/www-client/lynx-2.8.7_p1
@@ -14,7 +14,7 @@ bzip2 cjk gnutls ipv6 nls ssl unicode
 
 2
 
-configure install prepare setup
+compile configure install prepare setup
 
 
 
diff --git a/metadata/cache/www-client/seamonkey-2.9 b/metadata/cache/www-client/seamonkey-2.9
index 093e916e29cf..43ab62bea883 100644
--- a/metadata/cache/www-client/seamonkey-2.9
+++ b/metadata/cache/www-client/seamonkey-2.9
@@ -1,7 +1,7 @@
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.2 >=dev-libs/nspr-4.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 ) ) 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.1: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.2 >=dev-libs/nspr-4.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 ) 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.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/source/seamonkey-2.9.source.tar.bz2 -> seamonkey-2.9.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz )
+linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/source/seamonkey-2.9.source.tar.bz2 -> seamonkey-2.9.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz )
 
 http://www.seamonkey-project.org
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
diff --git a/metadata/cache/x11-apps/bdftopcf-1.0.3 b/metadata/cache/x11-apps/bdftopcf-1.0.3
index 906f6b298bc0..7da2ea7029dd 100644
--- a/metadata/cache/x11-apps/bdftopcf-1.0.3
+++ b/metadata/cache/x11-apps/bdftopcf-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org bdftopcf application
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/fstobdf-1.0.5 b/metadata/cache/x11-apps/fstobdf-1.0.5
new file mode 100644
index 000000000000..9f436197aee6
--- /dev/null
+++ b/metadata/cache/x11-apps/fstobdf-1.0.5
@@ -0,0 +1,22 @@
+x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
+x11-libs/libX11 x11-libs/libFS
+0
+http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+generate BDF font from X font server
+~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
+
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-apps/mkfontdir-1.0.7 b/metadata/cache/x11-apps/mkfontdir-1.0.7
index 594c65653eec..8fcc5a80b070 100644
--- a/metadata/cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/cache/x11-apps/mkfontdir-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 create an index of X font files in a directory
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/mkfontscale-1.1.0 b/metadata/cache/x11-apps/mkfontscale-1.1.0
index 36fbbf0ea0ee..afcbb4bfdfbe 100644
--- a/metadata/cache/x11-apps/mkfontscale-1.1.0
+++ b/metadata/cache/x11-apps/mkfontscale-1.1.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 create an index of scalable font files for X
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xmodmap-1.0.7 b/metadata/cache/x11-apps/xmodmap-1.0.7
new file mode 100644
index 000000000000..065bb35901b0
--- /dev/null
+++ b/metadata/cache/x11-apps/xmodmap-1.0.7
@@ -0,0 +1,22 @@
+x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
+x11-libs/libX11
+0
+http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+utility for modifying keymaps and pointer button mappings in X
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
+
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.10 b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.14
similarity index 91%
rename from metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.10
rename to metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.14
index 165bc8ac6437..ed980d8c2bb5 100644
--- a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.10
+++ b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.14
@@ -1,7 +1,7 @@
 x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 0
-http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 
 http://www.virtualbox.org/
 GPL-2
diff --git a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4 b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4
deleted file mode 100644
index 8d7eca0206bd..000000000000
--- a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
-0
-http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox video driver
-amd64 x86
-eutils linux-info linux-mod multilib python toolchain-funcs user versionator
-dri kernel_linux
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.8 b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.8
deleted file mode 100644
index b351e0bf7ea3..000000000000
--- a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.8
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
-0
-http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox video driver
-amd64 x86
-eutils linux-info linux-mod multilib python toolchain-funcs user versionator
-dri kernel_linux
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/cairo-1.10.2-r2 b/metadata/cache/x11-libs/cairo-1.10.2-r2
index 94c50207b828..8b36f1494023 100644
--- a/metadata/cache/x11-libs/cairo-1.10.2-r2
+++ b/metadata/cache/x11-libs/cairo-1.10.2-r2
@@ -6,7 +6,7 @@ test
 http://cairographics.org/
 || ( LGPL-2.1 MPL-1.1 )
 A vector graphics library with cross-device output support
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb
 
diff --git a/metadata/cache/x11-libs/cairo-1.12.0 b/metadata/cache/x11-libs/cairo-1.12.0
index fb3805c55a56..f25d4f484e6c 100644
--- a/metadata/cache/x11-libs/cairo-1.12.0
+++ b/metadata/cache/x11-libs/cairo-1.12.0
@@ -6,7 +6,7 @@ test
 http://cairographics.org/
 || ( LGPL-2.1 MPL-1.1 )
 A vector graphics library with cross-device output support
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb
 drm? ( X ) gallium? ( drm )
diff --git a/metadata/cache/x11-libs/libICE-1.0.8 b/metadata/cache/x11-libs/libICE-1.0.8
index 1e0512c581c0..52895ab3b4f7 100644
--- a/metadata/cache/x11-libs/libICE-1.0.8
+++ b/metadata/cache/x11-libs/libICE-1.0.8
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org ICE library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libSM-1.2.1 b/metadata/cache/x11-libs/libSM-1.2.1
index 241b04dd4335..38414226c400 100644
--- a/metadata/cache/x11-libs/libSM-1.2.1
+++ b/metadata/cache/x11-libs/libSM-1.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org SM library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc ipv6 +uuid static-libs doc
 
diff --git a/metadata/cache/x11-libs/libX11-1.4.4 b/metadata/cache/x11-libs/libX11-1.4.4
index 8220353bfae6..ae2414653c8a 100644
--- a/metadata/cache/x11-libs/libX11-1.4.4
+++ b/metadata/cache/x11-libs/libX11-1.4.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org X11 library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 ipv6 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/libX11-1.4.99.901 b/metadata/cache/x11-libs/libX11-1.4.99.901
index b7f13f5fd892..9ed789cbf067 100644
--- a/metadata/cache/x11-libs/libX11-1.4.99.901
+++ b/metadata/cache/x11-libs/libX11-1.4.99.901
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.99.901.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org X11 library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 ipv6 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
index e6e3c1db2bb9..aa9194774693 100644
--- a/metadata/cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XScrnSaver library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXau-1.0.7 b/metadata/cache/x11-libs/libXau-1.0.7
index b29aaf7d22b8..3533977567d4 100644
--- a/metadata/cache/x11-libs/libXau-1.0.7
+++ b/metadata/cache/x11-libs/libXau-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xau library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXaw-1.0.10 b/metadata/cache/x11-libs/libXaw-1.0.10
index 3c1621a98f27..f91639120cbe 100644
--- a/metadata/cache/x11-libs/libXaw-1.0.10
+++ b/metadata/cache/x11-libs/libXaw-1.0.10
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.10.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xaw library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXdmcp-1.1.1 b/metadata/cache/x11-libs/libXdmcp-1.1.1
index f0a5251f2ee5..7411648da59e 100644
--- a/metadata/cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/cache/x11-libs/libXdmcp-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xdmcp library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXext-1.3.1 b/metadata/cache/x11-libs/libXext-1.3.1
index 2708939ba940..696afdf53411 100644
--- a/metadata/cache/x11-libs/libXext-1.3.1
+++ b/metadata/cache/x11-libs/libXext-1.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xext library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXfont-1.4.5 b/metadata/cache/x11-libs/libXfont-1.4.5
index bb3917bc6697..b13a6df34ebf 100644
--- a/metadata/cache/x11-libs/libXfont-1.4.5
+++ b/metadata/cache/x11-libs/libXfont-1.4.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xfont library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXft-2.3.0-r1 b/metadata/cache/x11-libs/libXft-2.3.0-r1
index 4c24d1289f8e..c970e594dec2 100644
--- a/metadata/cache/x11-libs/libXft-2.3.0-r1
+++ b/metadata/cache/x11-libs/libXft-2.3.0-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xft library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXmu-1.1.1 b/metadata/cache/x11-libs/libXmu-1.1.1
index 579f88c8cce4..7e855fc2071f 100644
--- a/metadata/cache/x11-libs/libXmu-1.1.1
+++ b/metadata/cache/x11-libs/libXmu-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xmu library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 ipv6 static-libs doc
 
diff --git a/metadata/cache/x11-libs/libXpm-3.5.10 b/metadata/cache/x11-libs/libXpm-3.5.10
index 0970e2cdf3fc..18338747dc04 100644
--- a/metadata/cache/x11-libs/libXpm-3.5.10
+++ b/metadata/cache/x11-libs/libXpm-3.5.10
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xpm library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXrender-0.9.7 b/metadata/cache/x11-libs/libXrender-0.9.7
index 858043909f8f..a71a49c5366c 100644
--- a/metadata/cache/x11-libs/libXrender-0.9.7
+++ b/metadata/cache/x11-libs/libXrender-0.9.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xrender library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libXt-1.1.3 b/metadata/cache/x11-libs/libXt-1.1.3
index 35f3decda0bb..a34464c2c868 100644
--- a/metadata/cache/x11-libs/libXt-1.1.3
+++ b/metadata/cache/x11-libs/libXt-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Xt library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libfontenc-1.1.1 b/metadata/cache/x11-libs/libfontenc-1.1.1
index 85f4587a186d..3f176d588530 100644
--- a/metadata/cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/cache/x11-libs/libfontenc-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org fontenc library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 static-libs
 
diff --git a/metadata/cache/x11-libs/libxcb-1.8.1 b/metadata/cache/x11-libs/libxcb-1.8.1
index f8b4891c16dc..4b202017989d 100644
--- a/metadata/cache/x11-libs/libxcb-1.8.1
+++ b/metadata/cache/x11-libs/libxcb-1.8.1
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 selinux static-libs doc
 
diff --git a/metadata/cache/x11-libs/pixman-0.24.4 b/metadata/cache/x11-libs/pixman-0.24.4
index 9a2b1dd3ad39..6530cfb624e7 100644
--- a/metadata/cache/x11-libs/pixman-0.24.4
+++ b/metadata/cache/x11-libs/pixman-0.24.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/pixman-0.24.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Low-level pixel manipulation routines
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user versionator xorg-2
 altivec iwmmxt mmx neon sse2 static-libs
 
diff --git a/metadata/cache/x11-libs/xcb-util-0.3.8 b/metadata/cache/x11-libs/xcb-util-0.3.8
index b19cb3405d30..ec3a7f1836db 100644
--- a/metadata/cache/x11-libs/xcb-util-0.3.8
+++ b/metadata/cache/x11-libs/xcb-util-0.3.8
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-0.3.8.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings sample implementations
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/xcb-util-image-0.3.8 b/metadata/cache/x11-libs/xcb-util-image-0.3.8
index 9dd1e85666da..f238f71ff231 100644
--- a/metadata/cache/x11-libs/xcb-util-image-0.3.8
+++ b/metadata/cache/x11-libs/xcb-util-image-0.3.8
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-image-0.3.8.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings sample implementations
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/xcb-util-keysyms-0.3.8 b/metadata/cache/x11-libs/xcb-util-keysyms-0.3.8
index 1ba5c4473afe..6cf04fe8ab40 100644
--- a/metadata/cache/x11-libs/xcb-util-keysyms-0.3.8
+++ b/metadata/cache/x11-libs/xcb-util-keysyms-0.3.8
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.8.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings sample implementations
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/xcb-util-renderutil-0.3.8 b/metadata/cache/x11-libs/xcb-util-renderutil-0.3.8
index 3019558f7ec0..7ed9f2d2dbaa 100644
--- a/metadata/cache/x11-libs/xcb-util-renderutil-0.3.8
+++ b/metadata/cache/x11-libs/xcb-util-renderutil-0.3.8
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.8.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings sample implementations
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/xcb-util-wm-0.3.8 b/metadata/cache/x11-libs/xcb-util-wm-0.3.8
index ed99abef313a..c45b73bf823b 100644
--- a/metadata/cache/x11-libs/xcb-util-wm-0.3.8
+++ b/metadata/cache/x11-libs/xcb-util-wm-0.3.8
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.8.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings sample implementations
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 test static-libs doc
 
diff --git a/metadata/cache/x11-libs/xtrans-1.2.7 b/metadata/cache/x11-libs/xtrans-1.2.7
index efe23cc98703..ee3b370d5dd0 100644
--- a/metadata/cache/x11-libs/xtrans-1.2.7
+++ b/metadata/cache/x11-libs/xtrans-1.2.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xtrans library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc
 
diff --git a/metadata/cache/x11-misc/util-macros-1.17 b/metadata/cache/x11-misc/util-macros-1.17
index 2ef29efd7043..eaa165ff3c2d 100644
--- a/metadata/cache/x11-misc/util-macros-1.17
+++ b/metadata/cache/x11-misc/util-macros-1.17
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org autotools utility macros
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/fontsproto-2.1.2 b/metadata/cache/x11-proto/fontsproto-2.1.2
index d01d99e2e0e8..5506aeaeed95 100644
--- a/metadata/cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/cache/x11-proto/fontsproto-2.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Fonts protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc
 
diff --git a/metadata/cache/x11-proto/inputproto-2.2 b/metadata/cache/x11-proto/inputproto-2.2
index 140b22af0e8f..8e9754ec0a03 100644
--- a/metadata/cache/x11-proto/inputproto-2.2
+++ b/metadata/cache/x11-proto/inputproto-2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Input protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/kbproto-1.0.6 b/metadata/cache/x11-proto/kbproto-1.0.6
index f0cfd2f2dcb1..92f43663bfb6 100644
--- a/metadata/cache/x11-proto/kbproto-1.0.6
+++ b/metadata/cache/x11-proto/kbproto-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org KB protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/renderproto-0.11.1 b/metadata/cache/x11-proto/renderproto-0.11.1
index 4051c2d79123..8a303e64352f 100644
--- a/metadata/cache/x11-proto/renderproto-0.11.1
+++ b/metadata/cache/x11-proto/renderproto-0.11.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Render protocol headers
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/scrnsaverproto-1.2.2 b/metadata/cache/x11-proto/scrnsaverproto-1.2.2
index 350a5c4820b7..8b504ccd5043 100644
--- a/metadata/cache/x11-proto/scrnsaverproto-1.2.2
+++ b/metadata/cache/x11-proto/scrnsaverproto-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.b
 http://xorg.freedesktop.org/
 MIT
 X.Org ScrnSaver protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc
 
diff --git a/metadata/cache/x11-proto/xcb-proto-1.7.1 b/metadata/cache/x11-proto/xcb-proto-1.7.1
index 0e274bf3b9e7..291304f55868 100644
--- a/metadata/cache/x11-proto/xcb-proto-1.7.1
+++ b/metadata/cache/x11-proto/xcb-proto-1.7.1
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
 http://xcb.freedesktop.org/
 MIT
 X C-language Bindings protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib python toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/xextproto-7.2.1 b/metadata/cache/x11-proto/xextproto-7.2.1
index 20ce40b90059..bede7140fd7a 100644
--- a/metadata/cache/x11-proto/xextproto-7.2.1
+++ b/metadata/cache/x11-proto/xextproto-7.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org XExt protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc
 
diff --git a/metadata/cache/x11-proto/xf86bigfontproto-1.2.0 b/metadata/cache/x11-proto/xf86bigfontproto-1.2.0
index 97e2cec1572a..0baa5ece335b 100644
--- a/metadata/cache/x11-proto/xf86bigfontproto-1.2.0
+++ b/metadata/cache/x11-proto/xf86bigfontproto-1.2.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar
 http://xorg.freedesktop.org/
 MIT
 X.Org XF86BigFont protocol headers
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-proto/xproto-7.0.23 b/metadata/cache/x11-proto/xproto-7.0.23
index c2b63a030f7f..37414e3082d3 100644
--- a/metadata/cache/x11-proto/xproto-7.0.23
+++ b/metadata/cache/x11-proto/xproto-7.0.23
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xproto protocol headers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 doc
 
diff --git a/metadata/cache/x11-themes/gtk-engines-qtcurve-1.8.15 b/metadata/cache/x11-themes/gtk-engines-qtcurve-1.8.15
new file mode 100644
index 000000000000..ea4fa3675fd3
--- /dev/null
+++ b/metadata/cache/x11-themes/gtk-engines-qtcurve-1.8.15
@@ -0,0 +1,22 @@
+x11-libs/gtk+:2 dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+x11-libs/gtk+:2 mozilla? ( || ( >=www-client/firefox-3.0 >=www-client/firefox-bin-3.0 >=www-client/icecat-3.0 ) )
+0
+http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-1.8.15.tar.bz2
+
+http://www.kde-look.org/content/show.php?content=40492
+GPL-2
+A set of widget styles for GTK2 based apps, also available for Qt4/KDE4
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+mozilla
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-themes/qtcurve-qt4-1.8.12 b/metadata/cache/x11-themes/qtcurve-qt4-1.8.12
new file mode 100644
index 000000000000..cd3431719328
--- /dev/null
+++ b/metadata/cache/x11-themes/qtcurve-qt4-1.8.12
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+0
+http://craigd.wikispaces.com/file/view/QtCurve-KDE4-1.8.12.tar.bz2
+
+http://www.kde-look.org/content/show.php?content=40492
+GPL-2
+A set of widget styles for Qt4 based apps, also available for GTK2
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+kde windeco aqua kde
+windeco? ( kde )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8876166f6aad..9f3a22edd5a8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Apr 2012 16:36:59 +0000
+Fri, 27 Apr 2012 05:36:58 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8876166f6aad..9f3a22edd5a8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Apr 2012 16:36:59 +0000
+Fri, 27 Apr 2012 05:36:58 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-ctags-1.13 b/metadata/md5-cache/app-admin/eselect-ctags-1.13
index 1f7cd44ddd84..f3d75952ef72 100644
--- a/metadata/md5-cache/app-admin/eselect-ctags-1.13
+++ b/metadata/md5-cache/app-admin/eselect-ctags-1.13
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Manages ctags implementations
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 !<=app-admin/eselect-emacs-1.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-emacs-1.13.tar.bz2
-_md5_=515a0c53900be9a035ce7ef40ac3b83a
+_md5_=32f3a56d69152d9163fab7837523d7f3
diff --git a/metadata/md5-cache/app-admin/eselect-fontconfig-1.1 b/metadata/md5-cache/app-admin/eselect-fontconfig-1.1
index e9cac88a41ee..88ccd217d387 100644
--- a/metadata/md5-cache/app-admin/eselect-fontconfig-1.1
+++ b/metadata/md5-cache/app-admin/eselect-fontconfig-1.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks.
 HOMEPAGE=http://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
 SLOT=0
 SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=21bd3f2462084270ed0150d4ce29530a
+_md5_=225353c108e907b63c89f17df0686527
diff --git a/metadata/md5-cache/app-admin/eselect-ruby-20120106 b/metadata/md5-cache/app-admin/eselect-ruby-20120106
index 6ca0656de437..ed0a4ec6bbb6 100644
--- a/metadata/md5-cache/app-admin/eselect-ruby-20120106
+++ b/metadata/md5-cache/app-admin/eselect-ruby-20120106
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 HOMEPAGE=http://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=http://dev.a3li.li/gentoo/distfiles/ruby.eselect-20120106.bz2
-_md5_=f065e50a359290df8f8a1b3dc9644ff1
+_md5_=e0c0394bda1f43b552ae90835ee3299e
diff --git a/metadata/md5-cache/app-admin/eselect-vi-1.1.7-r1 b/metadata/md5-cache/app-admin/eselect-vi-1.1.7-r1
index 1539c637ec46..b5ae37568846 100644
--- a/metadata/md5-cache/app-admin/eselect-vi-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/eselect-vi-1.1.7-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.6
 SLOT=0
 SRC_URI=mirror://gentoo/vi.eselect-1.1.7.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a7b002e5c7aca686ce80c6ae0c276c95
+_md5_=25cfc0655ae6eccf7221e9e302cad1d0
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10 b/metadata/md5-cache/app-admin/gam-server-0.1.10
index b6cdd4c8fc2f..58e81b70e98c 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=3
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=11a3d734b548757b4e7798dff5291899
+_md5_=c2b581aec68a525f1210796f6063efe0
diff --git a/metadata/md5-cache/app-admin/gamin-0.1.10 b/metadata/md5-cache/app-admin/gamin-0.1.10
index dc0aa8c86a49..ce7ad987530d 100644
--- a/metadata/md5-cache/app-admin/gamin-0.1.10
+++ b/metadata/md5-cache/app-admin/gamin-0.1.10
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta package providing the File Alteration Monitor API & Server
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=>=app-admin/gam-server-0.1.10
 RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10
 SLOT=0
-_md5_=e781382d83c34423912fee9fdd550aab
+_md5_=189be4a1406972c043c73f30826139cf
diff --git a/metadata/md5-cache/app-arch/gzip-1.4 b/metadata/md5-cache/app-arch/gzip-1.4
index 337b55623295..0d0ea7d43364 100644
--- a/metadata/md5-cache/app-arch/gzip-1.4
+++ b/metadata/md5-cache/app-arch/gzip-1.4
@@ -3,9 +3,9 @@ DEPEND=nls? ( sys-devel/gettext )
 DESCRIPTION=Standard GNU compressor
 HOMEPAGE=http://www.gnu.org/software/gzip/
 IUSE=nls pic static
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.4.tar.gz mirror://gnu/gzip/gzip-1.4.tar.gz mirror://gentoo/gzip-1.4.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a58137100cda9ee88dc2cdbec72ee7f7
+_md5_=feda10ec14bc7a8b735bfb334899211f
diff --git a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.4g b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.4g
index e4b683c96adc..98093759023c 100644
--- a/metadata/md5-cache/app-arch/rpm2targz-9.0.0.4g
+++ b/metadata/md5-cache/app-arch/rpm2targz-9.0.0.4g
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DEPEND=app-arch/xz-utils
 DESCRIPTION=Convert a .rpm file to a .tar.gz archive
 HOMEPAGE=http://www.slackware.com/config/packages.php
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=as-is
 RDEPEND=app-arch/cpio
 SLOT=0
 SRC_URI=mirror://gentoo/rpm2targz-9.0.0.4g.tar.lzma
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=358c728354094790e8702435e3b5cf19
+_md5_=deb064084362a12ff6fa1a7688eb15b8
diff --git a/metadata/md5-cache/app-arch/unzip-6.0-r3 b/metadata/md5-cache/app-arch/unzip-6.0-r3
index 662574d44c6b..a025775d67ce 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0-r3
+++ b/metadata/md5-cache/app-arch/unzip-6.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=unzipper for pkzip-compressed files
 EAPI=2
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 natspec unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3dbced04dd4a5c9f9191970930e6930c
+_md5_=c5e0819c61338adbe636fe2bf291bda5
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.72.4 b/metadata/md5-cache/app-cdr/dvdisaster-0.72.4
new file mode 100644
index 000000000000..45999ef39367
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.72.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2 dev-util/pkgconfig virtual/os-headers >=sys-apps/sed-4
+DESCRIPTION=Data-protection and recovery tool for DVDs
+EAPI=4
+HOMEPAGE=http://dvdisaster.sourceforge.net/
+IUSE=debug nls linguas_cs linguas_de linguas_it linguas_pt_BR linguas_ru linguas_sv
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dvdisaster/dvdisaster_0.72.4.orig.tar.bz2
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=564f040d8dbc76cb09444f3e358738db
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.12 b/metadata/md5-cache/app-crypt/p11-kit-0.12
index d51fa199ed4a..a2c22f1bf71a 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.12
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.12
@@ -3,9 +3,9 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11.
 EAPI=4
 HOMEPAGE=http://p11-glue.freedesktop.org/p11-kit.html
 IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.12.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7053d496e87fe6bc9c74410e2bea251a
+_md5_=56c8b114afd256790fc036c6a83c1b8f
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.0 b/metadata/md5-cache/app-doc/doxygen-1.8.0
index aad0eb489da5..182fcc4217e1 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.0
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.0
@@ -3,12 +3,12 @@ DEPEND=sys-apps/sed sys-devel/flex sys-devel/bison doc? ( =dev-lang/python-2* )
 DESCRIPTION=Documentation system for most programming languages
 EAPI=4
 HOMEPAGE=http://www.doxygen.org/
-IUSE=debug doc dot qt4 latex elibc_FreeBSD linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+IUSE=debug doc dot qt4 latex elibc_FreeBSD userland_GNU linguas_hy linguas_ar linguas_pt_BR linguas_ca linguas_zh linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_el linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_mk linguas_nl linguas_nb linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_vi linguas_af
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=qt4? ( x11-libs/qt-gui:4 ) latex? ( app-text/texlive[extra] ) dev-lang/perl virtual/libiconv media-libs/libpng app-text/ghostscript-gpl dot? ( media-gfx/graphviz media-libs/freetype )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.0.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e277a0103d991d1f146f7f265b93e0f6
+_md5_=a61d92b474eb8ea039a7a7bfea484977
diff --git a/metadata/md5-cache/app-editors/vim-7.3.502 b/metadata/md5-cache/app-editors/vim-7.3.502
index fe8988f1ccb1..854c4eb16146 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-7.3.502
@@ -4,10 +4,10 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=3
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl cscope debug gpm perl python ruby X minimal vim-pager
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( =dev-lang/ruby-1.8* ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.502 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	aea439a7bd4d88292031a6fbae139d1d	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=bdc6743aab88b5e7f561e40ef81a7e61
+_md5_=2f51f8669d329e773bc95e714fbbf133
diff --git a/metadata/md5-cache/app-editors/vim-core-7.3.502 b/metadata/md5-cache/app-editors/vim-core-7.3.502
index 96f5c10d76a0..72cea821ab88 100644
--- a/metadata/md5-cache/app-editors/vim-core-7.3.502
+++ b/metadata/md5-cache/app-editors/vim-core-7.3.502
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=3
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl livecd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.502.patch.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	aea439a7bd4d88292031a6fbae139d1d	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=b3e9d75db7613b9e1465343dd1d25242
+_md5_=e16c0d02c308be2eb4387c8da3827abe
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.17.21 b/metadata/md5-cache/app-emulation/libguestfs-1.17.21
deleted file mode 100644
index bf3fe5f49198..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.17.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
-DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=4
-HOMEPAGE=http://libguestfs.org/
-IUSE=bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
-SLOT=0
-SRC_URI=http://libguestfs.org/download/1.17-development/libguestfs-1.17.21.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cb0ccc6fcc08d7d6af9019d3b5fbe351
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.17.26 b/metadata/md5-cache/app-emulation/libguestfs-1.17.26
deleted file mode 100644
index 6d5abd62ebfe..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-1.17.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
-DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
-EAPI=4
-HOMEPAGE=http://libguestfs.org/
-IUSE=bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
-SLOT=0
-SRC_URI=http://libguestfs.org/download/1.17-development/libguestfs-1.17.26.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4f45613672507d36197e2348c49390be
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.17.32 b/metadata/md5-cache/app-emulation/libguestfs-1.17.32
index bc7c37b6b67f..9830d378f647 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.17.32
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.17.32
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl dev-util/gtk-doc app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=4
 HOMEPAGE=http://libguestfs.org/
 IUSE=bash-completion erlang +fuse debug ocaml doc +perl nls ruby static-libs selinux systemtap introspection
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
+RDEPEND=>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl dev-util/gtk-doc app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=http://libguestfs.org/download/1.17-development/libguestfs-1.17.32.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=11436ba3f38239a01e3fd24d57efd81c
+_md5_=db01d12386199ca20e572cdcbf3c164e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-4.1.14
similarity index 60%
rename from metadata/md5-cache/app-emulation/virtualbox-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-4.1.14
index d22b842992f5..7cb9b01361c3 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
 EAPI=4
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.10 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.10 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.10 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.14 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.14 )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a33d7c865fa0ef9dfedb5cf96ede466b
+_md5_=075dbe9959a9333f609ce8aea0fba5b4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.4 b/metadata/md5-cache/app-emulation/virtualbox-4.1.4
deleted file mode 100644
index d7838da97110..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.5 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=4
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.4 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.4 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.4 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2fe0353dc2cb5865653b750f43b7db9f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-4.1.8
deleted file mode 100644
index 00f2d314dcc0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=4
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.8 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.8 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5c1f96d9f1ecb375ee89f3e95970d817
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.8-r1 b/metadata/md5-cache/app-emulation/virtualbox-4.1.8-r1
deleted file mode 100644
index 222235252cbd..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=4
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.8 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.8 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.8 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=980da148328d63101a49b663ae7ec8a0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.14
similarity index 77%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-additions-4.1.14
index 5f6d41464c19..bbcecec00966 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.14
@@ -7,6 +7,6 @@ LICENSE=PUEL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/VBoxGuestAdditions_4.1.10.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.14/VBoxGuestAdditions_4.1.14.iso
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=38115de9d16b620c94f2975d16ef83db
+_md5_=d30fc4d183199ba7b0a4d1af3bd1c0e5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.4 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.4
deleted file mode 100644
index 938a26f1b0f8..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.4/VBoxGuestAdditions_4.1.4.iso
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a334596aeec16d1220b8d7e441950d94
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.8
deleted file mode 100644
index 1cae8cc508cb..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/VBoxGuestAdditions_4.1.8.iso
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fab15b9908f4f90d380a7e26d7662cdb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.14
similarity index 78%
rename from metadata/md5-cache/app-emulation/virtualbox-bin-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-bin-4.1.14
index 1e32b52abe3f..4dc4a7d32960 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.14
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.10 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.14 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10-76795-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10-76795-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.10/VirtualBoxSDK-4.1.10-76795.zip ) http://download.virtualbox.org/virtualbox/4.1.10/Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14-77440-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14-77440-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.14/VirtualBoxSDK-4.1.14-77440.zip ) http://download.virtualbox.org/virtualbox/4.1.14/Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	1a29d4db2138f0996c1071b0b67e91a1	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0311a57a96d96e53e0170e1ca877cead
+_md5_=849b89f7fbb28eba3e28464c2d77bc77
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.4 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.4
deleted file mode 100644
index 7d868b5fac08..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.4 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4-74291-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4-74291-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.4/VirtualBoxSDK-4.1.4-74291.zip ) http://download.virtualbox.org/virtualbox/4.1.4/Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	1a29d4db2138f0996c1071b0b67e91a1	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=94a6e398a62a56773aa228e5837fbe16
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.8
deleted file mode 100644
index 7d33b8e4382f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.8 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8-75467-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8-75467-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.8/VirtualBoxSDK-4.1.8-75467.zip ) http://download.virtualbox.org/virtualbox/4.1.8/Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	1a29d4db2138f0996c1071b0b67e91a1	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4667cb46e47103dc8c39d6dbf0326b71
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.14
similarity index 57%
rename from metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.14
index ea1932890551..d42ddde84723 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.14
@@ -4,9 +4,9 @@ EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.1.10
+RDEPEND=~app-emulation/virtualbox-4.1.14
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.14/Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.14-77440.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6d66a215e72da67e2b2482085446d090
+_md5_=e2f7c48a560466367f24a4ee1c72c3b4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.4 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.4
deleted file mode 100644
index 04fff49d8814..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.1.4
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.4/Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0657defcb3d3bdb0e43a9ae922cd1db2
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.8
deleted file mode 100644
index 06b7d43454bc..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-KEYWORDS=amd64 x86
-LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.1.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e8227d6e1e267b3a253d627f3003e2b1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.14
similarity index 83%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.14
index 9d274dd09eac..0f02863e98db 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
 EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=X kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.10 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.14 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=44b8aad43e775d64bf1f90fe0aea7404
+_md5_=ad99c2fe906935e0ee245531a6d39281
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.4-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
deleted file mode 100644
index 58faf8f4c4d1..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.4 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.4 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e722fe12097a83e917fd661483d6b01c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.8
deleted file mode 100644
index 80125c11fc40..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.8 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.8 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eb4f194067511706ad5614c758c98b44
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.14
similarity index 92%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-4.1.10
rename to metadata/md5-cache/app-emulation/virtualbox-modules-4.1.14
index 8693a9401102..ec219b882dc6 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.14
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.10.tar.xz
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.14.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6976c47e15e6572acfaf0ca0acb2679a
+_md5_=2219f3dddf27fe54d69d575a6e18dcf6
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.4 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.4
deleted file mode 100644
index bb1d63035cb1..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.4.tar.bz2
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e4da15d12fb3ead41fbe1cb84bf645f7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.8 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.8
deleted file mode 100644
index 26a797ba5587..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=4
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.8.tar.xz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ec4027ea355c337b64b92c34b45a145c
diff --git a/metadata/md5-cache/app-i18n/unicode-data-6.0.0 b/metadata/md5-cache/app-i18n/unicode-data-6.0.0
index 22ab965a3707..ad3ed322d021 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-6.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-6.0.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Unicode data from unicode.org
 HOMEPAGE=http://unicode.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=unicode
 SLOT=0
 SRC_URI=mirror://debian/pool/main/u/unicode-data/unicode-data_6.0.0.orig.tar.gz
-_md5_=fedbd5f3cf3d7593e1c905b4efebaea8
+_md5_=891c802c73890e713b501f677303f4d0
diff --git a/metadata/md5-cache/app-misc/getopt-1.1.4 b/metadata/md5-cache/app-misc/getopt-1.1.4
index 740d4a7854f0..07645f09760d 100644
--- a/metadata/md5-cache/app-misc/getopt-1.1.4
+++ b/metadata/md5-cache/app-misc/getopt-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=getopt(1) replacement supporting GNU-style long options
 EAPI=3
 HOMEPAGE=http://software.frodo.looijaard.name/getopt/
 IUSE=nls
-KEYWORDS=~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://software.frodo.looijaard.name/getopt/files/getopt-1.1.4.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5b0d871abdb000fe388c0966d6011909
+_md5_=c9dd57595d864daeae0cbf6998978ce9
diff --git a/metadata/md5-cache/app-office/calligra-2.4.1 b/metadata/md5-cache/app-office/calligra-2.4.1
new file mode 100644
index 000000000000..0381f6e98a31
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-2.4.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base =dev-libs/libpqxx-3* ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DESCRIPTION=KDE Office Suite
+EAPI=4
+HOMEPAGE=http://www.calligra.org/
+IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base =dev-libs/libpqxx-3* ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
+RESTRICT=test
+SLOT=4
+SRC_URI=mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	kde4-base	3924a969e2ee84757f8a3f6dd8dc2d8c	kde4-functions	3fc7b5d60204b49948f87741ba8cea55	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=9582f2cb9989ab4f9fd97e56f5e5c02c
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.3.92 b/metadata/md5-cache/app-office/calligra-l10n-2.3.92
deleted file mode 100644
index 6f38ea55ef19..000000000000
--- a/metadata/md5-cache/app-office/calligra-l10n-2.3.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Calligra localization package
-EAPI=4
-HOMEPAGE=http://www.kde.org/
-IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=linguas_ca? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ca-2.3.92.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ca@valencia-2.3.92.tar.bz2 ) linguas_cs? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-cs-2.3.92.tar.bz2 ) linguas_da? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-da-2.3.92.tar.bz2 ) linguas_de? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-de-2.3.92.tar.bz2 ) linguas_el? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-el-2.3.92.tar.bz2 ) linguas_en_GB? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-en_GB-2.3.92.tar.bz2 ) linguas_es? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-es-2.3.92.tar.bz2 ) linguas_et? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-et-2.3.92.tar.bz2 ) linguas_fr? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-fr-2.3.92.tar.bz2 ) linguas_it? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-it-2.3.92.tar.bz2 ) linguas_kk? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-kk-2.3.92.tar.bz2 ) linguas_nb? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nb-2.3.92.tar.bz2 ) linguas_nds? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nds-2.3.92.tar.bz2 ) linguas_nl? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-nl-2.3.92.tar.bz2 ) linguas_pl? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pl-2.3.92.tar.bz2 ) linguas_pt? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pt-2.3.92.tar.bz2 ) linguas_pt_BR? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-pt_BR-2.3.92.tar.bz2 ) linguas_ru? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-ru-2.3.92.tar.bz2 ) linguas_sv? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-sv-2.3.92.tar.bz2 ) linguas_uk? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-uk-2.3.92.tar.bz2 ) linguas_zh_CN? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-zh_CN-2.3.92.tar.bz2 ) linguas_zh_TW? ( mirror://kde/unstable/calligra-2.3.92/calligra-l10n//calligra-l10n-zh_TW-2.3.92.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	kde4-base	3924a969e2ee84757f8a3f6dd8dc2d8c	kde4-functions	3fc7b5d60204b49948f87741ba8cea55	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=6c998f85454c8f708c002b001cb6a694
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.1 b/metadata/md5-cache/app-office/calligra-l10n-2.4.1
new file mode 100644
index 000000000000..d0c21563389d
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Calligra localization package
+EAPI=4
+HOMEPAGE=http://www.kde.org/
+IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca-2.4.1.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca@valencia-2.4.1.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-cs-2.4.1.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-da-2.4.1.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-de-2.4.1.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-el-2.4.1.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-en_GB-2.4.1.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-es-2.4.1.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-et-2.4.1.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fi-2.4.1.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fr-2.4.1.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-hu-2.4.1.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-it-2.4.1.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-kk-2.4.1.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nb-2.4.1.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nds-2.4.1.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nl-2.4.1.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pl-2.4.1.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt-2.4.1.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt_BR-2.4.1.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ru-2.4.1.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sk-2.4.1.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sv-2.4.1.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-uk-2.4.1.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_CN-2.4.1.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_TW-2.4.1.tar.bz2 )
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	kde4-base	3924a969e2ee84757f8a3f6dd8dc2d8c	kde4-functions	3fc7b5d60204b49948f87741ba8cea55	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=45f0971d8893053261def8855226ace0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6
index bf2f08776ba3..9198461158ef 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6
@@ -3,10 +3,10 @@ DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
 DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep dev-lang/python[xml] dev-lang/python
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=539bf687c3a770fa2f21718d5e8196eb
+_md5_=af885b422c9f3073f5a3558ceda9f1ff
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.7 b/metadata/md5-cache/app-text/asciidoc-8.6.7
index 6e3e114e13c0..017f7a244bad 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.7
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=A text document format for writing short documents, articles, books
 EAPI=3
 HOMEPAGE=http://www.methods.co.nz/asciidoc/
 IUSE=examples graphviz highlight test vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-python/pygments dev-util/source-highlight ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=751517bae626a203bbf86d9313000b9c
+_md5_=d1691768cc5452ea4427070810d03244
diff --git a/metadata/md5-cache/app-text/asciidoc-9999 b/metadata/md5-cache/app-text/asciidoc-9999
index 88a9e0999d2d..e58e486eb7d5 100644
--- a/metadata/md5-cache/app-text/asciidoc-9999
+++ b/metadata/md5-cache/app-text/asciidoc-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	mercurial	add64e64d758a9618d46a08a95f77483	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d0cf0a0262040a05595d190ff2c78b89
+_md5_=93d6b25323dfc16b5c44f0b010c5cac0
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-1.19 b/metadata/md5-cache/app-text/build-docbook-catalog-1.19
index fe9b886853b8..3bc25dbaf1bc 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-1.19
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-1.19
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=4
 HOMEPAGE=http://sources.gentoo.org/gentoo-src/build-docbook-catalog/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1
 SLOT=0
 SRC_URI=mirror://gentoo/build-docbook-catalog-1.19.tar.xz http://dev.gentoo.org/~vapier/dist/build-docbook-catalog-1.19.tar.xz
-_md5_=41521923f4528ae438e2e9de61a5753e
+_md5_=7ffee3e6fee866ab2e548f6c0d4435b5
diff --git a/metadata/md5-cache/app-text/djvu-3.5.24-r1 b/metadata/md5-cache/app-text/djvu-3.5.24-r1
index 48610c5f9b78..972f3c52390c 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.24-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.24-r1
@@ -4,10 +4,10 @@ DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/
 IUSE=debug doc jpeg nls tiff xml linguas_ja
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.24.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a0626be480919dc807652288dd457eb6
+_md5_=c8b2bb99ac85a15e657f4d891a11b473
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
index b2d610e70b7c..009874530ae9 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 3.0
 HOMEPAGE=http://www.docbook.org/sgml/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=as-is
 RDEPEND=app-text/sgml-common
 SLOT=3.0
 SRC_URI=http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d74317af10157a636e3274c32d4fd063
+_md5_=1e9d7a3ed978dd809e8d5d2aefed3ff9
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
index 062ef69c0018..fb4502792ad8 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook SGML DTD 3.1
 HOMEPAGE=http://www.docbook.org/sgml/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=as-is
 RDEPEND=app-text/sgml-common
 SLOT=3.1
 SRC_URI=http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=10bb1970ba0c625800d3e29377d8ff4b
+_md5_=3cab1500f69fffdf794dec3b8f289461
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
index 32f25fad08d9..6c9a75567438 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 SLOT=4.1.2
 SRC_URI=http://www.docbook.org/xml/4.1.2/docbkx412.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6550065abfd5d365b57e9ae0fd0a3cb0
+_md5_=ac80055891eb866ce96ad191588b9ca1
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
index e9f160f88003..32803c2424e1 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 SLOT=4.2
 SRC_URI=http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b1c8d9d7236d24961bee6b98ea4fda16
+_md5_=ac7ecc7e960ace57246515803e060ffc
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r1 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r1
index e94857e5e6c4..ebbb69d5a9f7 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r1
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 SLOT=4.3
 SRC_URI=http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6b4a78108ad4a30d4fb32513673f9edc
+_md5_=8bccbd0e26670b839edc8fc2b05cbf90
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
index 62ed2e6e6c77..94df15f9939c 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 SLOT=4.4
 SRC_URI=http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a9eb73dde86a80ba29ab1a41a4382be9
+_md5_=8227e1e3af4e9349b69736995640c1fc
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
index 8bb21fa15d76..4f4e5cbb4104 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst postrm prerm unpack
 DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=Docbook DTD for XML
 HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 SLOT=4.5
 SRC_URI=http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=424799aed1f936c2d03819849805c7f4
+_md5_=29165926d4815a8cdbf081f3c2952e90
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.76.1 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.76.1
index 5a4dbf04c7af..60d5b5d978d2 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.76.1
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.76.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst postrm test
 DESCRIPTION=XSL Stylesheets for Docbook
 HOMEPAGE=http://wiki.docbook.org/topic/DocBookXslStylesheets
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.76.1.tar.bz2
-_md5_=b7b0b97cf032c19cff142f1ede9de7ec
+_md5_=afaf085555df791862bcf903058efe25
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.05 b/metadata/md5-cache/app-text/ghostscript-gpl-9.05
index 8b24e910b723..b01507f516f0 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.05
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.05
@@ -4,10 +4,10 @@ DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PD
 EAPI=3
 HOMEPAGE=http://ghostscript.com/
 IUSE=bindist cups dbus djvu gtk idn jpeg2k static-libs X linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bba284dbdf88515720b24b8abc994396
+_md5_=5fb629837da66e97d09b57ca3417d5f0
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10
index e5b7f5b470f0..e6e6488b260d 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12[python] >=dev-libs/libxslt-1.1.8 >=sys-apps/gaw
 DESCRIPTION=A collection of documentation utilities for the Gnome project
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GnomeDocUtils
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.6.12[python] >=dev-libs/libxslt-1.1.8 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=58d3bdc96b0c167a0f5f07b2da9ef7e0
+_md5_=e737b898711e7a017519aedb103c039a
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24-r1 b/metadata/md5-cache/app-text/libpaper-1.1.24-r1
index 984163a05dc7..03d7870d1b9f 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24-r1
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24-r1
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=Library for handling paper characteristics
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c3dbbc548828b548fe5411efacad42a5
+_md5_=92f6bc1a96d86cab6964fbee235eb2e9
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r4 b/metadata/md5-cache/app-text/openjade-1.3.2-r4
index 32867b8dd97d..6c798302fe94 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r4
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Jade is an implementation of DSSSL - an ISO standard for formatting
 EAPI=2
 HOMEPAGE=http://openjade.sourceforge.net
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=as-is
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	sgml-catalog	764d8fba98220f915e0bb4f622873fb8	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e3d3b479e9d1922a2103beb1637e1cb7
+_md5_=045306c081258ba069089fece1723c76
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index 97eb41a05b71..3a4be95fd19c 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity manageme
 EAPI=2
 HOMEPAGE=http://openjade.sourceforge.net/
 IUSE=doc nls static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=JamesClark
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bb6f79e1e34f9ab286b4ab2f377098ad
+_md5_=53d3d057764060addd086b47c35bcf41
diff --git a/metadata/md5-cache/app-text/poppler-0.18.4-r1 b/metadata/md5-cache/app-text/poppler-0.18.4-r1
index 63b402b9996e..ff780c6098f5 100644
--- a/metadata/md5-cache/app-text/poppler-0.18.4-r1
+++ b/metadata/md5-cache/app-text/poppler-0.18.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=4
 HOMEPAGE=http://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) lcms? ( =media-libs/lcms-1* ) png? ( >=media-libs/libpng-1.4:0 ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) tiff? ( media-libs/tiff:0 ) !dev-libs/poppler !dev-libs/poppler-glib !dev-libs/poppler-qt3 !dev-libs/poppler-qt4 !app-text/poppler-utils cjk? ( >=app-text/poppler-data-0.4.4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://poppler.freedesktop.org/poppler-0.18.4.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=373d0ee55449c19735b666fe9b35376d
+_md5_=eb27de24c14cd9002c21d311190716a5
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.5-r1 b/metadata/md5-cache/app-text/poppler-data-0.4.5-r1
index 214cd6c2671f..bfd031e80ef5 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.5-r1
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.5-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
 EAPI=4
 HOMEPAGE=http://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2 MIT
 SLOT=0
 SRC_URI=http://poppler.freedesktop.org/poppler-data-0.4.5.tar.gz
-_md5_=e4fb312dfc872efe89bc3b13a74ea564
+_md5_=c72c63b0528afd65b00148d6925b7e0b
diff --git a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0 b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
index 6eb1edcc8225..baf8e051c406 100644
--- a/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
+++ b/metadata/md5-cache/app-text/scrollkeeper-dtd-1.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libxml2-2.4.19 !<app-text/scrollkeeper-9999-r1
 DESCRIPTION=DTD from the Scrollkeeper package
 EAPI=3
 HOMEPAGE=http://scrollkeeper.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1
 RDEPEND=>=dev-libs/libxml2-2.4.19
 SLOT=1.0
 SRC_URI=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
-_md5_=53b11188b96968449ab52cec0279dc7b
+_md5_=b2c54875641f5b794eef782c72d4f03a
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r5 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r5
index 60670f7f1af3..39524a9f7936 100644
--- a/metadata/md5-cache/app-text/sgml-common-0.6.3-r5
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r5
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=Base ISO character entities and utilities for SGML
 EAPI=3
 HOMEPAGE=http://www.iso.ch/cate/3524030.html
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kde/devel/docbook/SOURCES/sgml-common-0.6.3.tgz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dcc6760a4feba7fd1050cf3571e17b31
+_md5_=8cf2aefb76a28e367c7048f2f888bda0
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.25 b/metadata/md5-cache/app-text/xmlto-0.0.25
index 32533fb9b51c..9c28e5a6c00b 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.25
+++ b/metadata/md5-cache/app-text/xmlto-0.0.25
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook formatted documents to a varie
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/xmlto/
 IUSE=latex
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash dev-libs/libxslt sys-apps/grep || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.25.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7d0422073008254c8a8aa64bebcf2276
+_md5_=530e01adcd2a1da38c96cf4a2cead723
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20120109 b/metadata/md5-cache/app-vim/gentoo-syntax-20120109
index 213c4a7908ae..29d544afd0b6 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20120109
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20120109
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 IUSE=ignore-glep31
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-syntax-20120109.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	af7939f5d748a2ceeff320440e8905b1
-_md5_=43b4856aa78af743572dcbaa3be51438
+_md5_=2cb1f32223ae2da0fec2c195a8a7cdd1
diff --git a/metadata/md5-cache/app-vim/pam-syntax-20060424 b/metadata/md5-cache/app-vim/pam-syntax-20060424
index 71a4b168232c..fb2880e155b8 100644
--- a/metadata/md5-cache/app-vim/pam-syntax-20060424
+++ b/metadata/md5-cache/app-vim/pam-syntax-20060424
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 DESCRIPTION=vim plugin: PAM configuration syntax highlighting
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=735
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=as-is
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/pam-syntax-20060424.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	af7939f5d748a2ceeff320440e8905b1
-_md5_=263406a67354f0e6604f16540f0249f1
+_md5_=3c02b3fdcb611b9e55078488b57295c9
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.11 b/metadata/md5-cache/dev-db/sqlite-3.7.11
index a6e8a200dbc3..a5179d72534e 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.11
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.11
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=4
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 RDEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/sqlite-doc-3071100.zip ) tcl? ( http://sqlite.org/sqlite-src-3071100.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071100.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071100.tar.gz ) )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=02828376b2b7d8d462bc64d894844c41
+_md5_=affbc576ddd26a4e4bc1f40c50b50c6d
diff --git a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1 b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
index 2a8fae552f7e..ecaa53d1d033 100644
--- a/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
+++ b/metadata/md5-cache/dev-games/ggz-client-libs-0.0.14.1
@@ -10,4 +10,4 @@ RDEPEND=~dev-games/libggz-0.0.14.1 dev-libs/expat virtual/libintl
 SLOT=0
 SRC_URI=mirror://ggz/0.0.14.1/ggz-client-libs-0.0.14.1.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	games-ggz	1ff63c742d105768266d878da0c5c4e7	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=245c72e651b507e4ec3e25d10e3cbb6f
+_md5_=3af3fd451d6a4a23f4f831ee670071a9
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
new file mode 100644
index 000000000000..cad143c099d0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans API Support Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/apisupport
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0522ad4a415dfa5a4ce5b35ffec50632
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2 b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
new file mode 100644
index 000000000000..8f9a673d4ed2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans CND Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/cnd
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=de927784e564cec62619017286055a0c
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2 b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
new file mode 100644
index 000000000000..47013b1b01d7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans D-Light Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=68b89f2b059ec21fe24d65b88a2245c1
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
new file mode 100644
index 000000000000..a853ea1ff558
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload:0 dev-java/glassfish-deployment-api:1.2 dev-java/jakarta-jstl:0 dev-java/javahelp:0 >=dev-java/junit-4.4:4 dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Enterprise cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload:0 dev-java/glassfish-deployment-api:1.2 dev-java/jakarta-jstl:0 dev-java/antlr:0[java] dev-java/asm:3 dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 dev-java/jettison:0 dev-java/jsr311-api:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=85445ebb197c2d3641023fa8fc8581c6
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
new file mode 100644
index 000000000000..0cb3c7f58ce4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Ergonomics Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7340d6287ef1aa72628e8a7d2d48ae42
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2 b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
new file mode 100644
index 000000000000..3f2dc6791363
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Groovy Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/groovy
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f3aab575a98aac2bcb0b0a069ec340cd
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.1.2 b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
new file mode 100644
index 000000000000..9fac0ef8dcad
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/junit-4.4:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Harness
+EAPI=4
+HOMEPAGE=http://netbeans.org/features/platform/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=340ca0a8470a4b3d3ceade2ad64f8b56
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
new file mode 100644
index 000000000000..ad039bd30e56
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip dev-java/commons-codec:0 dev-java/jsch:0 dev-java/jzlib:0 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 dev-vcs/subversion:0[java] dev-java/javacc:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans IDE Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/ide
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 dev-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=865a822f7e2dc139456c9b1bd4edc670
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.2 b/metadata/md5-cache/dev-java/netbeans-java-7.1.2
new file mode 100644
index 000000000000..eb946323bd71
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Java Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/java
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7e31d921f21eda6293337e558092059a
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
new file mode 100644
index 000000000000..bd0bb6dbcc14
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans JavaCard Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/javacard
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=92a4e064cdc75abd692d4f15098b779f
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
new file mode 100644
index 000000000000..3d045d93cd68
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip dev-java/javahelp:0 dev-java/junit:4 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-cnd-7.1.2 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ergonomics-7.1.2 ~dev-java/netbeans-groovy-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-javacard-7.1.2 ~dev-java/netbeans-javafx-7.1.2 ~dev-java/netbeans-mobility-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-php-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans JavaDocs
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0bb4ade0c4328111c72dd9a7fb7938b2
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
new file mode 100644
index 000000000000..6fba6b578ccc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans JavaFX Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/javafx
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f8ab827cb36fa2725d797c90ebdedec1
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2 b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
new file mode 100644
index 000000000000..90e194aacf03
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Mobility Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/features/platform/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=fb1bf34c0a26c760fa8bc2ac25ec4bba
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.1.2 b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
new file mode 100644
index 000000000000..a7143e55d471
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans IDE Branding
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=keychain elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d71e0743c187acc7ef8ad3c8a35557cb
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.1.2 b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
new file mode 100644
index 000000000000..fc43e663248c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans PHP Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/php
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eaa40c723b0a7fe1cec0eb1b409b2d9b
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.1.2 b/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
new file mode 100644
index 000000000000..9676e3063180
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Platform
+EAPI=4
+HOMEPAGE=http://netbeans.org/features/platform/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=df22f123692ed673fa4524e57cad328e
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2 b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
new file mode 100644
index 000000000000..8f1fe13496a7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Profiler Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/profiler
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=bebfd884ae8d914b04967d4cc10a4df6
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
new file mode 100644
index 000000000000..25f636bb9a4f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Web Services Common Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=096a9bac61ff92b6b0773b30034158a3
diff --git a/metadata/md5-cache/dev-lang/nasm-2.10 b/metadata/md5-cache/dev-lang/nasm-2.10
index 3c8b8c102813..ba86cd5762ff 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.10
+++ b/metadata/md5-cache/dev-lang/nasm-2.10
@@ -4,9 +4,9 @@ DESCRIPTION=groovy little assembler
 EAPI=2
 HOMEPAGE=http://nasm.sourceforge.net/
 IUSE=doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.10/nasm-2.10.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a4e5b9d2fa216c93dac66d5a589a7b97
+_md5_=9814ef52a8b95ac7110b29c621dee1a4
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8 b/metadata/md5-cache/dev-lang/python-2.6.8
new file mode 100644
index 000000000000..84effa0d9637
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-2.6.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.61 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language.
+EAPI=2
+HOMEPAGE=http://www.python.org/
+IUSE=-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=app-admin/python-updater
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
+SLOT=2.6
+SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=c9b925810e75210d0a575240296f0858
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r1 b/metadata/md5-cache/dev-lang/python-2.7.3-r1
new file mode 100644
index 000000000000..084197fa636d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language.
+EAPI=2
+HOMEPAGE=http://www.python.org/
+IUSE=-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=app-admin/python-updater
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230
+SLOT=2.7
+SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=99bb2fa7446fe2f94504c267c754ebba
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5 b/metadata/md5-cache/dev-lang/python-3.1.5
new file mode 100644
index 000000000000..f9cae6d98bff
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.61 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language.
+EAPI=3
+HOMEPAGE=http://www.python.org/
+IUSE=build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=app-admin/python-updater
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
+SLOT=3.1
+SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=7d21922e3db3d733d440fc512b2d281b
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3 b/metadata/md5-cache/dev-lang/python-3.2.3
new file mode 100644
index 000000000000..2e4915a2ca82
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) dev-util/pkgconfig sys-apps/paxctl >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 >=app-admin/eselect-python-20091230
+DESCRIPTION=Python is an interpreted, interactive, object-oriented programming language.
+EAPI=3
+HOMEPAGE=http://www.python.org/
+IUSE=build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=app-admin/python-updater
+RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
+SLOT=3.2
+SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=f7c1add1e8c5531a7b4a6a67b718a55f
diff --git a/metadata/md5-cache/dev-lang/ruby-1.8.7_p358 b/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
index f39b136156a2..508e5a3b918f 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
+++ b/metadata/md5-cache/dev-lang/ruby-1.8.7_p358
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=2
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby GPL-2 )
 PDEPEND=xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2
 SLOT=1.8
 SRC_URI=mirror://ruby/1.8/ruby-1.8.7-p358.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p358.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9f3e905158ca7cf2938d8ecf19fb612f
+_md5_=89e726b711f17687909c77a23a12b803
diff --git a/metadata/md5-cache/dev-lang/swig-2.0.4-r1 b/metadata/md5-cache/dev-lang/swig-2.0.4-r1
index 1f366de5b29b..7d452b8a9b3e 100644
--- a/metadata/md5-cache/dev-lang/swig-2.0.4-r1
+++ b/metadata/md5-cache/dev-lang/swig-2.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simplified Wrapper and Interface Generator
 EAPI=3
 HOMEPAGE=http://www.swig.org/
 IUSE=ccache doc pcre
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 as-is
 RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/swig/swig-2.0.4.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4c34183bee036c159698f26a1f2b9659
+_md5_=9d0664987e89b1341dbdd77c159640cf
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.11 b/metadata/md5-cache/dev-lang/tk-8.5.11
index ffc96e6ca73b..d27ea8b1d146 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.11
+++ b/metadata/md5-cache/dev-lang/tk-8.5.11
@@ -4,10 +4,10 @@ DESCRIPTION=Tk Widget Set
 EAPI=4
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads truetype aqua xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.11
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tk8.5.11-src.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b0a53eea8f3bfc6e29c63ec2b55d4da0
+_md5_=c24a385351c11577c3c21f1163164b54
diff --git a/metadata/md5-cache/dev-libs/check-0.9.8-r1 b/metadata/md5-cache/dev-libs/check-0.9.8-r1
index e78a7112ffc1..f8464a169ad3 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.8-r1
+++ b/metadata/md5-cache/dev-libs/check-0.9.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.8.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c6391243605fb3d51850452794d30624
+_md5_=f5bfc66d4dbae29114ab3628b96b9b29
diff --git a/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10 b/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
index d3d8c073e79e..88319e25dc34 100644
--- a/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
+++ b/metadata/md5-cache/dev-libs/cloog-ppl-0.15.10
@@ -4,10 +4,10 @@ DESCRIPTION=Port of CLooG (Chunky LOOp Generator) to PPL (Parma Polyhedra Librar
 EAPI=4
 HOMEPAGE=http://repo.or.cz/w/cloog-ppl.git
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/ppl dev-libs/gmp
 SLOT=0
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.10.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=37fe1a0a17221210bfb6b2af39f91216
+_md5_=76848275842aa9c1548e3e9f29914a19
diff --git a/metadata/md5-cache/dev-libs/gmime-2.2.27-r1 b/metadata/md5-cache/dev-libs/gmime-2.2.27-r1
index cc9601db9889..2f747153b6d0 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.2.27-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.2.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=4
 HOMEPAGE=http://spruce.sourceforge.net/gmime/
 IUSE=doc mono
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.4.0:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gmime/2.2/gmime-2.2.27.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gmime-sharp.snk
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9217fad0fe01bbd05273588492ea4886
+_md5_=d0a8a9c753f5ad593d48957e93309e85
diff --git a/metadata/md5-cache/dev-libs/gmime-2.4.32 b/metadata/md5-cache/dev-libs/gmime-2.4.32
index 04b3df0bafb3..27ccc53fccae 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.4.32
+++ b/metadata/md5-cache/dev-libs/gmime-2.4.32
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=4
 HOMEPAGE=http://spruce.sourceforge.net/gmime/
 IUSE=doc mono static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.12:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gmime/2.4/gmime-2.4.32.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b47ed6b8092bfe6f9df085a7cd372dc0
+_md5_=1c74ccbd75f09f4c038253bfdc337575
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.7 b/metadata/md5-cache/dev-libs/gmime-2.6.7
index 5d44eb7d31c7..5980ecc3ab86 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.7
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=4
 HOMEPAGE=http://spruce.sourceforge.net/gmime/
 IUSE=doc mono static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18.0:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.7.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=37ab41c1f9feabf622ec9da0e4db0f84
+_md5_=ad86fc6d196d72e897a977dcc77bbb0f
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
index 8566c7e910ff..7c83ff0633a2 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.32.1
@@ -4,11 +4,11 @@ DESCRIPTION=Introspection infrastructure for generating gobject library bindings
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
 IUSE=doc doctool test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 PDEPEND=x11-libs/cairo[glib]
 RDEPEND=>=dev-libs/gobject-introspection-common-1.32.1 >=dev-libs/glib-2.31.22:2 doctool? ( dev-python/mako ) virtual/libffi =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b7076954af431118b9876e36c31b4eea
+_md5_=b2237c08fa412dae8ae493c36814798b
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.32.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.32.1
index c1dffc3725bd..448c5d78d456 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.32.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.32.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 RDEPEND=!<dev-libs/gobject-introspection-1.32.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.32/gobject-introspection-1.32.1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8f9242902f6c9985cf878c3d6f739b08
+_md5_=177e6f03452aa8de7e23b92c550e60c7
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.0.1_p20110705 b/metadata/md5-cache/dev-libs/kpathsea-6.0.1_p20110705
index 6f9fbab1fef2..8cd6a0013bdb 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.0.1_p20110705
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.0.1_p20110705
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing generic path searching, configuration, and TeX-
 EAPI=3
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<app-text/texlive-core-2010 !app-text/ptex
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/kpathsea-texmf.d-3.tar.xz mirror://gentoo/texlive-module-kpathsea-2011.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2011.tar.xz )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	texlive-common	273a6e678b05051f2101ab6d8b19c894	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2f27019d92a60c0db7c9312dd3556050
+_md5_=40c9daa0f5a8b33ad46320aeb0de7c06
diff --git a/metadata/md5-cache/dev-libs/libbegemot-1.11 b/metadata/md5-cache/dev-libs/libbegemot-1.11
index 47bc2507a0d9..9b2c74b4a514 100644
--- a/metadata/md5-cache/dev-libs/libbegemot-1.11
+++ b/metadata/md5-cache/dev-libs/libbegemot-1.11
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=begemot utility function library
 HOMEPAGE=http://people.freebsd.org/~harti/
-KEYWORDS=~amd64 ~x86-fbsd
+KEYWORDS=~amd64 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://people.freebsd.org/~harti/libbegemot/libbegemot-1.11.tar.gz
 _eclasses_=libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=0f95465682e3ecb0f511262f3df0d66d
+_md5_=fa41bf8fe1c922ac5d3e12a588bfb17e
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
index aa3961b1dc1a..872fdb12f3af 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing the FAM File Alteration Monitor API
 EAPI=3
 HOMEPAGE=http://www.gnome.org/~veillard/gamin/
 IUSE=debug kernel_linux python static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3f3d62e4a66e38f829ec8be5aa9badfb
+_md5_=de803591a8b3acf8a64a64af1a823d7d
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
index a81cc248d9e4..963ecab90ff9 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6
@@ -4,10 +4,10 @@ DESCRIPTION=library to smooth charset/localization issues
 EAPI=2
 HOMEPAGE=http://natspec.sourceforge.net/
 IUSE=doc python
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=python? ( >=dev-lang/python-2.3 ) dev-libs/popt
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ea5d624ba5f4178fdd34689bde37ff58
+_md5_=e5ff1c8848424b4cfea280248fc014da
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
index 3ea3eb61361b..9d7c731a290c 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3
@@ -4,9 +4,9 @@ DESCRIPTION=Pthread functions stubs for platforms missing them
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=6ec7bcbfba8231c95bacd5fe5d34af16
+_md5_=55ffbbea5ea6294361b3d504fd04145c
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.26-r3 b/metadata/md5-cache/dev-libs/libxslt-1.1.26-r3
index d9375ab884da..bd2a1a70f6ac 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.26-r3
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.26-r3
@@ -4,10 +4,10 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=4
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug python static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0ad9cc9034f620d11b8700c920580907
+_md5_=20e2b5fe93f938a6954506916e9c3a24
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9 b/metadata/md5-cache/dev-libs/nspr-4.9
index e94b708ab982..4ee0f305af48 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9
+++ b/metadata/md5-cache/dev-libs/nspr-4.9
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=863f8668f1f964b385a76e82e09fd7da
+_md5_=cbefd621679b338f7a2ccea855d2ac1b
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.3 b/metadata/md5-cache/dev-libs/nss-3.13.3
index b39047dc97fe..5d5af58fd6bb 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.3
+++ b/metadata/md5-cache/dev-libs/nss-3.13.3
@@ -4,10 +4,10 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=utils
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-3.13.3.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f958df330ff7b1617453173ee822384a
+_md5_=b0bf17d578a7b2100c3d5bc3d6ad664e
diff --git a/metadata/md5-cache/dev-libs/ppl-0.12 b/metadata/md5-cache/dev-libs/ppl-0.12
index f15691bd66e4..3f2942f95282 100644
--- a/metadata/md5-cache/dev-libs/ppl-0.12
+++ b/metadata/md5-cache/dev-libs/ppl-0.12
@@ -4,10 +4,10 @@ DESCRIPTION=The Parma Polyhedra Library provides numerical abstractions for anal
 EAPI=3
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=doc lpsol pch static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) !<dev-libs/cloog-ppl-0.15.10
 SLOT=0
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/0.12/ppl-0.12.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f340f33d898009166e69cd28334c3556
+_md5_=17f928dea5bfbdfa2e0013d6605eee26
diff --git a/metadata/md5-cache/dev-perl/Font-TTF-0.480.0 b/metadata/md5-cache/dev-perl/Font-TTF-0.480.0
index 12a0fe22a5cd..1d521887ea6a 100644
--- a/metadata/md5-cache/dev-perl/Font-TTF-0.480.0
+++ b/metadata/md5-cache/dev-perl/Font-TTF-0.480.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-IO-Compress dev-perl/XML-Parser dev-lang/perl[-build]
 DESCRIPTION=module for compiling and altering fonts
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Font-TTF/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Artistic
 RDEPEND=virtual/perl-IO-Compress dev-perl/XML-Parser dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.48.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3a9d3068e7de310ec587738c03f32bc4
+_md5_=9c12e2ebdc5b5a3fa4f2dfe72dbb1b66
diff --git a/metadata/md5-cache/dev-perl/PPI-1.215.0 b/metadata/md5-cache/dev-perl/PPI-1.215.0
index 81dff29e87d7..ed0f031669ff 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.215.0
+++ b/metadata/md5-cache/dev-perl/PPI-1.215.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
 EAPI=3
 HOMEPAGE=http://search.cpan.org/dist/PPI/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.20 >=dev-perl/Params-Util-1.00 >=dev-perl/Clone-0.30 >=virtual/perl-Digest-MD5-2.35 dev-perl/IO-String >=dev-perl/List-MoreUtils-0.16 >=virtual/perl-Storable-2.17 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bd2c89b38a8cebaa3cb0b53acda8c796
+_md5_=65152c152b858e556cbb04740ee75cb6
diff --git a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.26.0 b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.26.0
index 1d79cdaa78c1..32f510d47417 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.26.0
+++ b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.26.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/List-MoreUtils dev-perl/PPI virtual/perl-Scalar-List-Utils virtu
 DESCRIPTION=Represent a regular expression of some sort
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/PPIx-Regexp/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/List-MoreUtils dev-perl/PPI virtual/perl-Scalar-List-Utils dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.026.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fbe782d96ad6d8d1c16b08e6272700a8
+_md5_=3dfed8635aadfe7c5b2723eb31dc7d4f
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.117.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.117.0
index f79cd958251d..21e1aad258e8 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.117.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.117.0
@@ -4,10 +4,10 @@ DESCRIPTION=Critique Perl source code for best-practices
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Perl-Critic/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-Module-Pluggable-3.1 >=dev-perl/Config-Tiny-2 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String dev-perl/perltidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.22.0 dev-perl/Pod-Spell >=dev-perl/set-scalar-1.20 dev-perl/File-Which dev-perl/B-Keywords dev-perl/Readonly dev-perl/Exception-Class dev-perl/String-Format >=virtual/perl-version-0.77 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.117.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a714a24e1a2e44c8cbc15252415d79bb
+_md5_=a4fec1b49ac1eeec6fa054a73c1d7c6b
diff --git a/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0 b/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0
index 95e00afa1abe..f9699a1015d4 100644
--- a/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0
+++ b/metadata/md5-cache/dev-perl/Pod-Spell-1.10.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Escapes virtual/perl-PodParser dev-lang/perl[-build]
 DESCRIPTION=A formatter for spellchecking Pod
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Pod-Spell/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Pod-Escapes virtual/perl-PodParser dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/Pod-Spell-1.01.tar.gz mirror://gentoo/podspell.1.gz http://dev.gentoo.org/~tove/files/podspell.1.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2a872c6b6e8b97e607e0bc355d67ae2f
+_md5_=f0c4241ee10164ab472673ff1637d2e2
diff --git a/metadata/md5-cache/dev-perl/gtk2-perl-1.242.0 b/metadata/md5-cache/dev-perl/gtk2-perl-1.242.0
index c432fc691ec0..b446182bacbe 100644
--- a/metadata/md5-cache/dev-perl/gtk2-perl-1.242.0
+++ b/metadata/md5-cache/dev-perl/gtk2-perl-1.242.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 dev-perl/Cairo >=dev-perl/glib-perl-1.240.0 >=dev-perl/Pa
 DESCRIPTION=Perl bindings for GTK2
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Gtk2/
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 dev-perl/Cairo >=dev-perl/glib-perl-1.240.0 >=dev-perl/Pango-1.220.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.242.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=298d441d1bfe75cdcb20613ba02615a6
+_md5_=b36f079c8cb541bc67c946d8ea9072be
diff --git a/metadata/md5-cache/dev-php/securimage-3.0.1 b/metadata/md5-cache/dev-php/securimage-3.0.1
index fbe76e09ea18..b2abf2ba5f11 100644
--- a/metadata/md5-cache/dev-php/securimage-3.0.1
+++ b/metadata/md5-cache/dev-php/securimage-3.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=PHP captcha creator and validator library
 EAPI=4
 HOMEPAGE=http://phpcaptcha.org/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=virtual/httpd-php
+RDEPEND=dev-lang/php[gd,truetype] virtual/httpd-php
 SLOT=0
 SRC_URI=http://phpcaptcha.org/securimage-3.0.1.tar.gz ftp://mirror.ohnopub.net/mirror/securimage/securimage-3.0.1.tar.gz
-_md5_=89dd8fdc231712272e2956e0ee174f3f
+_md5_=4ceee7e6d1e1cd5a96129055419c35f3
diff --git a/metadata/md5-cache/dev-python/argparse-1.2.1 b/metadata/md5-cache/dev-python/argparse-1.2.1
index 2060c12839f6..4c66cc33edfb 100644
--- a/metadata/md5-cache/dev-python/argparse-1.2.1
+++ b/metadata/md5-cache/dev-python/argparse-1.2.1
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools dev-lang/python
 DESCRIPTION=Provides an easy, declarative interface for creating command line tools.
 EAPI=3
 HOMEPAGE=http://code.google.com/p/argparse/ http://pypi.python.org/pypi/argparse
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=37a6cae8bf33da30d3c2f61af7049cbd
+_md5_=3174fd11e5f6e8090b7f4704394d9301
diff --git a/metadata/md5-cache/dev-python/certifi-0.0.8 b/metadata/md5-cache/dev-python/certifi-0.0.8
index 132edf740f83..322dfd4d657f 100644
--- a/metadata/md5-cache/dev-python/certifi-0.0.8
+++ b/metadata/md5-cache/dev-python/certifi-0.0.8
@@ -3,10 +3,10 @@ DEPEND=dev-lang/python
 DESCRIPTION=SSL root certificate bundle
 EAPI=4
 HOMEPAGE=http://python-requests.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 RDEPEND=app-misc/ca-certificates dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-0.0.8.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=8551e959b8ad7e16a8b3ddf0a2c329a0
+_md5_=8057e5ae81afad3337f45a4d26887eb5
diff --git a/metadata/md5-cache/dev-python/docutils-0.8.1 b/metadata/md5-cache/dev-python/docutils-0.8.1
index 4ccf39b2a39f..f6561954b416 100644
--- a/metadata/md5-cache/dev-python/docutils-0.8.1
+++ b/metadata/md5-cache/dev-python/docutils-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Docutils - Python Documentation Utilities
 EAPI=3
 HOMEPAGE=http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils
 IUSE=glep
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 PSF-2 public-domain
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.8.1.tar.gz glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=63dae447441a5addbd0d89d757c16848
+_md5_=eda6c899ede3851b6bb161316f496814
diff --git a/metadata/md5-cache/dev-python/epydoc-3.0.1-r1 b/metadata/md5-cache/dev-python/epydoc-3.0.1-r1
index 92ece9a6edc9..cda61207d117 100644
--- a/metadata/md5-cache/dev-python/epydoc-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/epydoc-3.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for generating API documentation for Python modules, based on t
 EAPI=3
 HOMEPAGE=http://epydoc.sourceforge.net/
 IUSE=doc latex X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/docutils latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) =dev-lang/python-2* X? ( =dev-lang/python-2*[tk] )
 SLOT=0
 SRC_URI=mirror://sourceforge/epydoc/epydoc-3.0.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=965c6c7421606386f06a1f125f00a34a
+_md5_=b27ef5bed27f3aa3c32a927367c6a786
diff --git a/metadata/md5-cache/dev-python/requests-0.10.6 b/metadata/md5-cache/dev-python/requests-0.10.6
index ff222a334941..5eeac8822320 100644
--- a/metadata/md5-cache/dev-python/requests-0.10.6
+++ b/metadata/md5-cache/dev-python/requests-0.10.6
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =d
 DESCRIPTION=HTTP library for human beings
 EAPI=4
 HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 RDEPEND=>=dev-python/certifi-0.0.7 >=dev-python/chardet-1.0.0 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-0.10.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=74ab24e06048d65caad5b30ae17d93b5
+_md5_=555b1569d03df715e73ab7c75b57206b
diff --git a/metadata/md5-cache/dev-python/requests-0.11.1 b/metadata/md5-cache/dev-python/requests-0.11.1
index 0f9325d29b88..428c7512db4d 100644
--- a/metadata/md5-cache/dev-python/requests-0.11.1
+++ b/metadata/md5-cache/dev-python/requests-0.11.1
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =d
 DESCRIPTION=HTTP library for human beings
 EAPI=4
 HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
 RDEPEND=>=dev-python/certifi-0.0.7 >=dev-python/chardet-1.0.0 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-0.11.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=e2dd216ceb50514c3689f7bfb358df9e
+_md5_=a6d56ab8501484321e9c9771afed4604
diff --git a/metadata/md5-cache/dev-python/setuptools-0.6.25 b/metadata/md5-cache/dev-python/setuptools-0.6.25
index 84468fceb15d..bcac7789599d 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.6.25
+++ b/metadata/md5-cache/dev-python/setuptools-0.6.25
@@ -3,10 +3,10 @@ DEPEND=dev-lang/python
 DESCRIPTION=Distribute (fork of Setuptools) is a collection of extensions to Distutils
 EAPI=4
 HOMEPAGE=http://pypi.python.org/pypi/distribute
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/d/distribute/distribute-0.6.25.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8b2b9c7666888b9c782bdb8e791e3fd4
+_md5_=df6e90a6bbe797860203c0b983826f0a
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.7 b/metadata/md5-cache/dev-python/subunit-0.0.7
index 857c7dc32e9b..7cc280d71bef 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.7
+++ b/metadata/md5-cache/dev-python/subunit-0.0.7
@@ -3,10 +3,10 @@ DEPEND=>=dev-python/testtools-0.9.4 dev-lang/perl dev-libs/check dev-util/cppuni
 DESCRIPTION=A streaming protocol for test results
 EAPI=3
 HOMEPAGE=https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-python/testtools-0.9.4 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.7/+download/subunit-0.0.7.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=8ff5d3f2bed2e08e02766c63116159fd
+_md5_=85534c0078a7ba275a261d67b1f4371d
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.14 b/metadata/md5-cache/dev-python/testtools-0.9.14
index e9657a1c4784..d966290007b7 100644
--- a/metadata/md5-cache/dev-python/testtools-0.9.14
+++ b/metadata/md5-cache/dev-python/testtools-0.9.14
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=Extensions to the Python unittest library
 EAPI=3
 HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://launchpad.net/testtools/0.9/0.9.14/+download/testtools-0.9.14.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b04dcacb06a94112820422a9e9113a64
+_md5_=d9da7b19271cbe20307386795944f885
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
index ea4676a94302..e5a0a2f16854 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scheme interpreter
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/guile/
 IUSE=networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 RESTRICT=!regex? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=cec521989c6187f68229837b2a1c723c
+_md5_=7d5f913c0f0a85cd109106f58f65a102
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.7-r5 b/metadata/md5-cache/dev-util/cmake-2.8.7-r5
index 868667df3405..cbc04456cb6b 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.7-r5
+++ b/metadata/md5-cache/dev-util/cmake-2.8.7-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=4
 HOMEPAGE=http://www.cmake.org/
 IUSE=emacs ncurses qt4 vim-syntax test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 dev-util/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=a6981429464d68e212e3829ff327d97c
+_md5_=d7da29b6a3a15addcf04302af6014a18
diff --git a/metadata/md5-cache/dev-util/cppunit-1.12.1-r1 b/metadata/md5-cache/dev-util/cppunit-1.12.1-r1
index 170590482c18..820c25468b17 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.12.1-r1
+++ b/metadata/md5-cache/dev-util/cppunit-1.12.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ port of the famous JUnit framework for unit testing
 EAPI=4
 HOMEPAGE=http://cppunit.sourceforge.net/
 IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c2e9bbe3d966ca3a0d523985eb955030
+_md5_=4d438badc43fcfb46af600782934cc56
diff --git a/metadata/md5-cache/dev-util/cscope-15.7a-r1 b/metadata/md5-cache/dev-util/cscope-15.7a-r1
index 7ffdd8dda1f0..0638bcd0a7ee 100644
--- a/metadata/md5-cache/dev-util/cscope-15.7a-r1
+++ b/metadata/md5-cache/dev-util/cscope-15.7a-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Interactively examine a C program
 EAPI=4
 HOMEPAGE=http://cscope.sourceforge.net/
 IUSE=emacs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.7a.tar.bz2
 _eclasses_=elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=37847845163a19ce0344a0cf686b5379
+_md5_=85f8ee6426f36f2946ecda24b25f77a8
diff --git a/metadata/md5-cache/dev-util/ctags-5.8 b/metadata/md5-cache/dev-util/ctags-5.8
index f02310b8b265..0b2e4c0349e1 100644
--- a/metadata/md5-cache/dev-util/ctags-5.8
+++ b/metadata/md5-cache/dev-util/ctags-5.8
@@ -4,9 +4,9 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=4
 HOMEPAGE=http://ctags.sourceforge.net
 IUSE=ada
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ctags/ctags-5.8.tar.gz ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=547aeac02cb15aa4052aac7688ed07c3
+_md5_=fd7c9512dfd47b4222c493a8fdc6c10b
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1
index 6a6384a3bf13..e48b87ce9cef 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/desktop-file-utils
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.20.tar.xz
 _eclasses_=elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=464e315167e98134d48fbb403ad48a7b
+_md5_=56f3413c195e8aad28ee3899e0b9a33b
diff --git a/metadata/md5-cache/dev-util/gperf-3.0.4 b/metadata/md5-cache/dev-util/gperf-3.0.4
index a80df8dccd1a..35c938f43000 100644
--- a/metadata/md5-cache/dev-util/gperf-3.0.4
+++ b/metadata/md5-cache/dev-util/gperf-3.0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A perfect hash function generator
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/gperf/gperf.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/gperf/gperf-3.0.4.tar.gz
-_md5_=09050e3a8074526827bc09a95788e422
+_md5_=c2741bc13ad373ab745c6940e346d403
diff --git a/metadata/md5-cache/dev-util/netbeans-7.1.2 b/metadata/md5-cache/dev-util/netbeans-7.1.2
new file mode 100644
index 000000000000..f0eeb3eaf822
--- /dev/null
+++ b/metadata/md5-cache/dev-util/netbeans-7.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans IDE
+EAPI=4
+HOMEPAGE=http://netbeans.org/
+IUSE=doc +netbeans_modules_apisupport netbeans_modules_cnd netbeans_modules_dlight netbeans_modules_enterprise netbeans_modules_ergonomics netbeans_modules_groovy +netbeans_modules_java netbeans_modules_javacard +netbeans_modules_javafx netbeans_modules_mobility netbeans_modules_php +netbeans_modules_profiler +netbeans_modules_websvccommon linguas_af linguas_ar linguas_bg linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_gl linguas_hi_IN linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_si linguas_sq linguas_sr linguas_sv linguas_ta_IN linguas_tl linguas_tr linguas_vi linguas_zh_CN linguas_zh_TW elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.1.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.1.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.1.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.1.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.1.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.1.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.1.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.1.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.1.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.1.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.1.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.1.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.1.2 ) doc? ( ~dev-java/netbeans-javadoc-7.1.2 ) >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ar? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_bg? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ca? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_cs? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_de? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_el? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_es? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_fr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_gl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_hi_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_id? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_it? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ja? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ko? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_lt? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_nl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_BR? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_PT? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ro? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ru? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_si? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sq? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sv? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ta_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_vi? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_CN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_TW? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 )
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eaff49d2f8f049b10b9a792a7048b2d1
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.7.7 b/metadata/md5-cache/dev-vcs/git-1.7.7.7
new file mode 100644
index 000000000000..d581116af1aa
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-1.7.7.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) python? ( =dev-lang/python-2* )
+DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+EAPI=4
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+SLOT=0
+SRC_URI=http://git-core.googlecode.com/files/git-1.7.7.7.tar.gz mirror://kernel/software/scm/git/git-1.7.7.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.7.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.7.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.7.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.7.7.tar.gz )
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=3fa8c2a422139231ea356d85670bf702
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.8.6 b/metadata/md5-cache/dev-vcs/git-1.7.8.6
new file mode 100644
index 000000000000..bf8b81813395
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-1.7.8.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) python? ( =dev-lang/python-2* )
+DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+EAPI=4
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+SLOT=0
+SRC_URI=http://git-core.googlecode.com/files/git-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.8.6.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.8.6.tar.gz )
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=494819f1345905246e0dc66c94bc6da2
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.7 b/metadata/md5-cache/dev-vcs/git-1.7.9.7
new file mode 100644
index 000000000000..80f318c905bf
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* )
+DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+EAPI=4
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+LICENSE=GPL-2
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+SLOT=0
+SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.7.tar.gz )
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=9006e9e78bf4f09a89f5526b79644200
diff --git a/metadata/md5-cache/games-puzzle/jag-0.3.2 b/metadata/md5-cache/games-puzzle/jag-0.3.2
index e76255b4fc74..58be2511b30c 100644
--- a/metadata/md5-cache/games-puzzle/jag-0.3.2
+++ b/metadata/md5-cache/games-puzzle/jag-0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Arcade 2D Puzzle Game
 EAPI=2
 HOMEPAGE=http://jag.xlabsoft.com/
 IUSE=editor
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/libXrandr media-libs/libsdl[audio,video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=http://jag.xlabsoft.com/files/jag-0.3.2-src.zip http://jag.xlabsoft.com/files/jag-0.3.2-data.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dcd00c1c7455b826f5708bae0fcf0cdf
+_md5_=40cca0fb2a4a92aae52824ad0178ffb2
diff --git a/metadata/md5-cache/games-server/crossfire-server-1.60.0 b/metadata/md5-cache/games-server/crossfire-server-1.60.0
index d6bbe1ad6d54..0c6874eed2aa 100644
--- a/metadata/md5-cache/games-server/crossfire-server-1.60.0
+++ b/metadata/md5-cache/games-server/crossfire-server-1.60.0
@@ -4,11 +4,11 @@ DESCRIPTION=server for the crossfire clients
 EAPI=2
 HOMEPAGE=http://crossfire.real-time.com/
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-1.60.0.tar.gz mirror://sourceforge/crossfire/crossfire-1.60.0.maps.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	games	f75cdbfdf1760e514ca65e2f6c6a7c72	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f88ba3659d6b74fbdb205e21e43fd964
+_md5_=3c828f33fd18d383e214c4b184054210
diff --git a/metadata/md5-cache/gnome-extra/gnome-activity-journal-0.8.0-r2 b/metadata/md5-cache/gnome-extra/gnome-activity-journal-0.8.0-r2
new file mode 100644
index 000000000000..5e76ee750656
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-activity-journal-0.8.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-python/dbus-python dev-python/libgnome-python dev-python/gconf-python dev-python/gst-python dev-python/pycairo dev-python/pygobject:2 dev-python/pygtk:2 dev-python/pyxdg gnome-extra/zeitgeist sys-apps/dbus dev-util/intltool dev-python/python-distutils-extra app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* >=sys-apps/sed-4
+DESCRIPTION=Tool for easily browsing and finding files on your computer
+EAPI=4
+HOMEPAGE=https://launchpad.net/gnome-activity-journal/
+IUSE=debug
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-python/dbus-python dev-python/libgnome-python dev-python/gconf-python dev-python/gst-python dev-python/pycairo dev-python/pygobject:2 dev-python/pygtk:2 dev-python/pyxdg gnome-extra/zeitgeist sys-apps/dbus =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://launchpad.net/gnome-activity-journal/0.8/0.8.0/+download/gnome-activity-journal-0.8.0.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dab0b615bbcf4c786d2cecc1955fac11
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0 b/metadata/md5-cache/mail-client/thunderbird-10.0
deleted file mode 100644
index 9d60ad8f50e1..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_ar 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_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ar.xpi -> thunderbird-10.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/be.xpi -> thunderbird-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bg.xpi -> thunderbird-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/br.xpi -> thunderbird-10.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ca.xpi -> thunderbird-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/cs.xpi -> thunderbird-10.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/da.xpi -> thunderbird-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/de.xpi -> thunderbird-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/el.xpi -> thunderbird-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/et.xpi -> thunderbird-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/eu.xpi -> thunderbird-10.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fi.xpi -> thunderbird-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fr.xpi -> thunderbird-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gd.xpi -> thunderbird-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gl.xpi -> thunderbird-10.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/he.xpi -> thunderbird-10.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/hu.xpi -> thunderbird-10.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/id.xpi -> thunderbird-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/is.xpi -> thunderbird-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/it.xpi -> thunderbird-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ja.xpi -> thunderbird-10.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ko.xpi -> thunderbird-10.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/lt.xpi -> thunderbird-10.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nl.xpi -> thunderbird-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pl.xpi -> thunderbird-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/rm.xpi -> thunderbird-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ro.xpi -> thunderbird-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ru.xpi -> thunderbird-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/si.xpi -> thunderbird-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sk.xpi -> thunderbird-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sl.xpi -> thunderbird-10.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sq.xpi -> thunderbird-10.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/tr.xpi -> thunderbird-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/uk.xpi -> thunderbird-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/vi.xpi -> thunderbird-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/source/thunderbird-10.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ad16b147bd26be997bdf6ac639705e3a
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0.1 b/metadata/md5-cache/mail-client/thunderbird-10.0.1
deleted file mode 100644
index f04da357e705..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-10.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e1e9b8c59bd67394354991cb71ff78fa
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0.1-r1 b/metadata/md5-cache/mail-client/thunderbird-10.0.1-r1
deleted file mode 100644
index e6c6a60a62bc..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-10.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c21bd8791f784d8fd3ed9f387e2a8661
diff --git a/metadata/md5-cache/mail-client/thunderbird-10.0.4 b/metadata/md5-cache/mail-client/thunderbird-10.0.4
new file mode 100644
index 000000000000..c95e92faac95
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-10.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=3
+HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
+IUSE=bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi 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
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
+SLOT=0
+SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.4esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.4esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.4esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.4esr/source/thunderbird-10.0.4esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=3e86aa077091e8b28d7e4d52220750fd
diff --git a/metadata/md5-cache/mail-client/thunderbird-3.1.13 b/metadata/md5-cache/mail-client/thunderbird-3.1.13
deleted file mode 100644
index 0945dc226f94..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-3.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=+alsa ldap +crypt bindist gnome libnotify +lightning mozdom system-sqlite wifi linguas_af linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh linguas_zh_TW custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-PDEPEND=crypt? ( >=x11-plugins/enigmail-1.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) 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 )
-SLOT=0
-SRC_URI=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/source/thunderbird-3.1.13.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/af.xpi -> thunderbird-3.1.13-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ar.xpi -> thunderbird-3.1.13-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/be.xpi -> thunderbird-3.1.13-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bg.xpi -> thunderbird-3.1.13-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ca.xpi -> thunderbird-3.1.13-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/cs.xpi -> thunderbird-3.1.13-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/da.xpi -> thunderbird-3.1.13-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/de.xpi -> thunderbird-3.1.13-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/el.xpi -> thunderbird-3.1.13-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.13-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.13-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/et.xpi -> thunderbird-3.1.13-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/eu.xpi -> thunderbird-3.1.13-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fi.xpi -> thunderbird-3.1.13-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fr.xpi -> thunderbird-3.1.13-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/he.xpi -> thunderbird-3.1.13-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/hu.xpi -> thunderbird-3.1.13-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/id.xpi -> thunderbird-3.1.13-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/is.xpi -> thunderbird-3.1.13-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/it.xpi -> thunderbird-3.1.13-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ja.xpi -> thunderbird-3.1.13-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ko.xpi -> thunderbird-3.1.13-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/lt.xpi -> thunderbird-3.1.13-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nl.xpi -> thunderbird-3.1.13-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pl.xpi -> thunderbird-3.1.13-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.13-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ro.xpi -> thunderbird-3.1.13-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ru.xpi -> thunderbird-3.1.13-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/si.xpi -> thunderbird-3.1.13-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sk.xpi -> thunderbird-3.1.13-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sl.xpi -> thunderbird-3.1.13-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sq.xpi -> thunderbird-3.1.13-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/tr.xpi -> thunderbird-3.1.13-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/uk.xpi -> thunderbird-3.1.13-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.13-zh-TW.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=48c76aef034eb5baf340d3c275d4cd47
diff --git a/metadata/md5-cache/mail-client/thunderbird-7.0.1-r1 b/metadata/md5-cache/mail-client/thunderbird-7.0.1-r1
deleted file mode 100644
index f6e149826839..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-7.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning mozdom linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_TW custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/source/thunderbird-7.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.2.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-7.0-patches-0.4.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-7.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ar.xpi -> thunderbird-7.0.1-ar.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ca.xpi -> thunderbird-7.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/cs.xpi -> thunderbird-7.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/da.xpi -> thunderbird-7.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/de.xpi -> thunderbird-7.0.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-7.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-7.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/et.xpi -> thunderbird-7.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/eu.xpi -> thunderbird-7.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fi.xpi -> thunderbird-7.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fr.xpi -> thunderbird-7.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/he.xpi -> thunderbird-7.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/hu.xpi -> thunderbird-7.0.1-hu.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/is.xpi -> thunderbird-7.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/it.xpi -> thunderbird-7.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ja.xpi -> thunderbird-7.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ko.xpi -> thunderbird-7.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/lt.xpi -> thunderbird-7.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nl.xpi -> thunderbird-7.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pl.xpi -> thunderbird-7.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-7.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ru.xpi -> thunderbird-7.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/si.xpi -> thunderbird-7.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sk.xpi -> thunderbird-7.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sl.xpi -> thunderbird-7.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sq.xpi -> thunderbird-7.0.1-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/tr.xpi -> thunderbird-7.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/uk.xpi -> thunderbird-7.0.1-uk.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-7.0.1-zh-TW.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ced43886a481b7cde4da79d2b0ea7828
diff --git a/metadata/md5-cache/mail-client/thunderbird-8.0-r1 b/metadata/md5-cache/mail-client/thunderbird-8.0-r1
deleted file mode 100644
index 6b3f37c90b78..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-KEYWORDS=~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/source/thunderbird-8.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.3.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-8.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ar.xpi -> thunderbird-8.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/be.xpi -> thunderbird-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bg.xpi -> thunderbird-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/br.xpi -> thunderbird-8.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ca.xpi -> thunderbird-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/cs.xpi -> thunderbird-8.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/da.xpi -> thunderbird-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/de.xpi -> thunderbird-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/el.xpi -> thunderbird-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-8.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/et.xpi -> thunderbird-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/eu.xpi -> thunderbird-8.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fi.xpi -> thunderbird-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fr.xpi -> thunderbird-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gd.xpi -> thunderbird-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gl.xpi -> thunderbird-8.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/he.xpi -> thunderbird-8.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/hu.xpi -> thunderbird-8.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/id.xpi -> thunderbird-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/is.xpi -> thunderbird-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/it.xpi -> thunderbird-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ja.xpi -> thunderbird-8.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ko.xpi -> thunderbird-8.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/lt.xpi -> thunderbird-8.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nl.xpi -> thunderbird-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pl.xpi -> thunderbird-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/rm.xpi -> thunderbird-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ro.xpi -> thunderbird-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ru.xpi -> thunderbird-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/si.xpi -> thunderbird-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sk.xpi -> thunderbird-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sl.xpi -> thunderbird-8.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sq.xpi -> thunderbird-8.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/tr.xpi -> thunderbird-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/uk.xpi -> thunderbird-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/vi.xpi -> thunderbird-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ab3ccbe6deb719fadc8d4d493f659ab4
diff --git a/metadata/md5-cache/mail-client/thunderbird-9.0 b/metadata/md5-cache/mail-client/thunderbird-9.0
deleted file mode 100644
index 293e67acdfd2..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) 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 ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
-DESCRIPTION=Thunderbird Mail Client
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
-IUSE=bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_es_AR linguas_es linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_ta_LK linguas_ta linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
-KEYWORDS=~alpha amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) 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 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/source/thunderbird-9.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.4.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ar.xpi -> thunderbird-9.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/be.xpi -> thunderbird-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bg.xpi -> thunderbird-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/br.xpi -> thunderbird-9.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ca.xpi -> thunderbird-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/cs.xpi -> thunderbird-9.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/da.xpi -> thunderbird-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/de.xpi -> thunderbird-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/el.xpi -> thunderbird-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/en-GB.xpi -> thunderbird-9.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/et.xpi -> thunderbird-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/eu.xpi -> thunderbird-9.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fi.xpi -> thunderbird-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fr.xpi -> thunderbird-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gd.xpi -> thunderbird-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gl.xpi -> thunderbird-9.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/he.xpi -> thunderbird-9.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/hu.xpi -> thunderbird-9.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/id.xpi -> thunderbird-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/is.xpi -> thunderbird-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/it.xpi -> thunderbird-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ja.xpi -> thunderbird-9.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ko.xpi -> thunderbird-9.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/lt.xpi -> thunderbird-9.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nl.xpi -> thunderbird-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pl.xpi -> thunderbird-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/rm.xpi -> thunderbird-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ro.xpi -> thunderbird-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ru.xpi -> thunderbird-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/si.xpi -> thunderbird-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sk.xpi -> thunderbird-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sl.xpi -> thunderbird-9.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sq.xpi -> thunderbird-9.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/tr.xpi -> thunderbird-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/uk.xpi -> thunderbird-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/vi.xpi -> thunderbird-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e607fe4df81b9175fd97d0194f9920dc
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-10.0.4 b/metadata/md5-cache/mail-client/thunderbird-bin-10.0.4
new file mode 100644
index 000000000000..43c759186644
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-10.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=4
+HOMEPAGE=http://www.mozilla.com/thunderbird
+IUSE=+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
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+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 )
+RESTRICT=strip mirror binchecks
+SLOT=0
+SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.4esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.4esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.4esr-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-x86_64/en-US/thunderbird-10.0.4esr.tar.bz2 -> thunderbird-bin_x86_64-10.0.4.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.4esr/linux-i686/en-US/thunderbird-10.0.4esr.tar.bz2 -> thunderbird-bin_i686-10.0.4.tar.bz2 )
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5392b11ac2ff2c7e9b7406eba05d601c
diff --git a/metadata/md5-cache/mail-mta/postfix-2.10_pre20120423 b/metadata/md5-cache/mail-mta/postfix-2.10_pre20120426
similarity index 95%
rename from metadata/md5-cache/mail-mta/postfix-2.10_pre20120423
rename to metadata/md5-cache/mail-mta/postfix-2.10_pre20120426
index 7184e699175b..91933c50b36d 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.10_pre20120423
+++ b/metadata/md5-cache/mail-mta/postfix-2.10_pre20120426
@@ -9,6 +9,6 @@ LICENSE=IBM
 RDEPEND=>=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
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120423.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120426.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.1.patch )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f0c1f3c94a13b15d8232c458b473b356
+_md5_=f9649c2a230783b95f420f03d3582285
diff --git a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1 b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1
index 63fc1a00000a..96d7dd1044ef 100644
--- a/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1
+++ b/metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1
@@ -3,10 +3,10 @@ DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2
 DESCRIPTION=Chinese TrueType Arphic Fonts
 HOMEPAGE=http://www.arphic.com.tw/ http://www.freedesktop.org/wiki/Software/CJKUnifonts
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Arphic
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bkai00mp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/bsmi00lp.ttf.gz mirror://gnu/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz mirror://ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz mirror://ubuntu/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e6e1b98d93dca8385ce5a766caef60d3
+_md5_=3eb396cbb8f90679142c217e1128ba7f
diff --git a/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2 b/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
index 0cfac056278d..fca400e98390 100644
--- a/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
+++ b/metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
@@ -3,10 +3,10 @@ DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2
 DESCRIPTION=Korean Baekmuk Font
 HOMEPAGE=http://kldp.net/projects/baekmuk/
 IUSE=unicode X X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://kldp.net/download.php/1429/baekmuk-ttf-2.2.tar.gz http://kldp.net/download.php/1428/baekmuk-bdf-2.2.tar.gz unicode? ( http://chem.skku.ac.kr/~wkpark/baekmuk/iso10646/20020418.tar.bz2 )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	font	9aa70ebc5cefbdd9056687b550a2fdc4	font-ebdftopcf	cfc12172831c46e51665e6ec2d3e918a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ba2d1291c66c7e8168fc138d4e0f6d84
+_md5_=f222621078cede41907d7f5d23aa0c2e
diff --git a/metadata/md5-cache/media-fonts/dejavu-2.33 b/metadata/md5-cache/media-fonts/dejavu-2.33
index fadcaf5a140b..706502f84036 100644
--- a/metadata/md5-cache/media-fonts/dejavu-2.33
+++ b/metadata/md5-cache/media-fonts/dejavu-2.33
@@ -4,9 +4,9 @@ DESCRIPTION=DejaVu fonts, bitstream vera with ISO-8859-2 characters
 EAPI=4
 HOMEPAGE=http://dejavu.sourceforge.net/
 IUSE=fontforge X
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=!fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-ttf-2.33.tar.bz2 ) fontforge? ( mirror://sourceforge/dejavu/dejavu-fonts-2.33.tar.bz2 )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9c95d93aa5464bed745c8e5f3c88e2c9
+_md5_=0b47728990bb556c2e7b08376212fd70
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.4 b/metadata/md5-cache/media-fonts/encodings-1.0.4
index 48b0df13f5a9..b58126fd77bd 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.4
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.4
@@ -3,9 +3,9 @@ DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 || ( >=sys-devel/au
 DESCRIPTION=X.Org font encodings
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/encodings-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=627838062b73cc046f88c4744eb3289b
+_md5_=973176f1e58eda58b88604dacd6d2f06
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.0 b/metadata/md5-cache/media-fonts/font-util-1.3.0
index 06813f01aa38..cbda309581bb 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.0
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=X.Org font utilities
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=0cb7cfb0dc112fffdb76826f8eabb6dc
+_md5_=bb0a4c77555263323bfa9e6506457bd6
diff --git a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3 b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
index c50ecb4d080c..4b6ba6c56613 100644
--- a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
+++ b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
@@ -3,10 +3,10 @@ DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2
 DESCRIPTION=Kochi Japanese TrueType fonts with Wadalab Fonts
 HOMEPAGE=http://efont.sourceforge.jp/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/5411/kochi-substitute-20030809.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bee2b4c26fc801b73de54087506ee1ed
+_md5_=b6eab0acbc9b2f8b0abb0e2c5a0acd06
diff --git a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9 b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
index d8509791ee57..e8eef0e1ed19 100644
--- a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g X? ( x11-apps/mkfontdir media-fonts/encodin
 DESCRIPTION=free good quality fonts gpl'd by URW++
 HOMEPAGE=http://www.urwpp.de/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!media-fonts/gnu-gs-fonts-std !media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://gentoo/urw-fonts-2.4-9.fc13.src.rpm
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=33d446d2b183c9cf7a2a44a05cd4a0ab
+_md5_=6b14d8cd42b80cc18625337416798e45
diff --git a/metadata/md5-cache/media-gfx/ebdftopcf-2 b/metadata/md5-cache/media-gfx/ebdftopcf-2
index 1814f00389a5..74dd12c5e85c 100644
--- a/metadata/md5-cache/media-gfx/ebdftopcf-2
+++ b/metadata/md5-cache/media-gfx/ebdftopcf-2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=ebdftopcf optimially generators PCF files from BDF files
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=x11-apps/bdftopcf app-arch/gzip
 SLOT=0
 SRC_URI=mirror://gentoo/ebdftopcf-2.tar.bz2
-_md5_=c18ce51a367af8fbdb3d0f0fa0106c47
+_md5_=7400d492538819672e84ebb951d356dc
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2 b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
index c2160c14711b..c0779eb6bef1 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.8.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=4
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d54108043564106a00811e08741ac6db
+_md5_=925d9a90553bcc9ccb70e69d5a5199fa
diff --git a/metadata/md5-cache/media-libs/freetype-2.4.9-r1 b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
index 5ae45e6e62db..9dea0531a757 100644
--- a/metadata/md5-cache/media-libs/freetype-2.4.9-r1
+++ b/metadata/md5-cache/media-libs/freetype-2.4.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=4
 HOMEPAGE=http://www.freetype.org/
 IUSE=X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=FTL GPL-2
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9e6b08d6dd4226e836d4110b5f0fb609
+_md5_=d27c573b40f64bd493c65019eb264ad4
diff --git a/metadata/md5-cache/media-libs/gd-2.0.35-r3 b/metadata/md5-cache/media-libs/gd-2.0.35-r3
index 00d483242d90..384732e0462c 100644
--- a/metadata/md5-cache/media-libs/gd-2.0.35-r3
+++ b/metadata/md5-cache/media-libs/gd-2.0.35-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=2
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs truetype xpm zlib
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=as-is BSD
 RDEPEND=fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib )
 SLOT=2
 SRC_URI=http://libgd.org/releases/gd-2.0.35.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=38e927105d72399c615acb0f1749385b
+_md5_=20dafdd86f382a50d687095c839818a8
diff --git a/metadata/md5-cache/media-libs/jasper-1.900.1-r4 b/metadata/md5-cache/media-libs/jasper-1.900.1-r4
index fb366f168ed8..532865884f15 100644
--- a/metadata/md5-cache/media-libs/jasper-1.900.1-r4
+++ b/metadata/md5-cache/media-libs/jasper-1.900.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=software-based implementation of the codec specified in the JPEG-200
 EAPI=3
 HOMEPAGE=http://www.ece.uvic.ca/~mdadams/jasper/
 IUSE=jpeg opengl static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=JasPer2.0
 RDEPEND=jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl media-libs/freeglut )
 SLOT=0
 SRC_URI=http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gentoo/jasper-1.900.1-fixes-20081208.patch.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=602fea4dcf15732e661aa4eec12842ed
+_md5_=f4efefc1449abb6cc8c4eaa675f67810
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.11-r1 b/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
index d681e637c358..1b88a63405ba 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A decoder implementation of the JBIG2 image compression format
 EAPI=4
 HOMEPAGE=http://jbig2dec.sourceforge.net/
 IUSE=png static-libs test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=png? ( >=media-libs/libpng-1.2:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9ffa33f5c2ebce02657f15051f324d4c
+_md5_=db18e3fc19e93d6d2fec164ba855bfba
diff --git a/metadata/md5-cache/media-libs/jbigkit-2.0-r1 b/metadata/md5-cache/media-libs/jbigkit-2.0-r1
index 00668413e3cf..24a78ca26d99 100644
--- a/metadata/md5-cache/media-libs/jbigkit-2.0-r1
+++ b/metadata/md5-cache/media-libs/jbigkit-2.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=data compression algorithm for bi-level high-resolution images
 EAPI=4
 HOMEPAGE=http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=000c89579b0111ac175b225f625c5239
+_md5_=01e9f170aeb257a591194542b9956372
diff --git a/metadata/md5-cache/media-libs/lcms-1.19 b/metadata/md5-cache/media-libs/lcms-1.19
index f53d6d61cd8f..64403979dc04 100644
--- a/metadata/md5-cache/media-libs/lcms-1.19
+++ b/metadata/md5-cache/media-libs/lcms-1.19
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=3
 HOMEPAGE=http://www.littlecms.com/
 IUSE=jpeg python static-libs tiff zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.littlecms.com/lcms-1.19.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=28e408bd83b9a3fb4a21cef69fe6ea89
+_md5_=7b85783ee29456a22f5e91d0a8967b86
diff --git a/metadata/md5-cache/media-libs/lcms-2.3 b/metadata/md5-cache/media-libs/lcms-2.3
index 1e67b9fba34e..33d1216fffd6 100644
--- a/metadata/md5-cache/media-libs/lcms-2.3
+++ b/metadata/md5-cache/media-libs/lcms-2.3
@@ -4,9 +4,9 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=4
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs test tiff zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) zlib? ( sys-libs/zlib )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.3.tar.gz
-_md5_=4037a0e24b703a2c0278286dd7fc4230
+_md5_=6ef475dacce4dbe8cbbacb81c0a54b5a
diff --git a/metadata/md5-cache/media-libs/libpng-1.5.10 b/metadata/md5-cache/media-libs/libpng-1.5.10
index c4f1c959a415..3d3df760297d 100644
--- a/metadata/md5-cache/media-libs/libpng-1.5.10
+++ b/metadata/md5-cache/media-libs/libpng-1.5.10
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=4
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon static-libs
-KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=as-is
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libpng/libpng-1.5.10.tar.xz apng? ( mirror://sourceforge/libpng-apng/libpng-1.5.10-apng.patch.gz )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=08bb3c78db4129239e79399fd52b5dd2
+_md5_=acf758bfe079b48bd5f5138b66529378
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.0 b/metadata/md5-cache/media-libs/openjpeg-1.5.0
index aef671d08e4b..74900f6b9196 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.0
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=4
 HOMEPAGE=http://code.google.com/p/openjpeg/
 IUSE=doc test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fae2155bf4ef7daefb43920fca3e2e52
+_md5_=6ed92f4a91086ef97015eac7f27f4406
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.1-r1 b/metadata/md5-cache/media-libs/tiff-4.0.1-r1
index df3008649c89..1132a3469ec5 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.1-r1
+++ b/metadata/md5-cache/media-libs/tiff-4.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=4
 HOMEPAGE=http://www.remotesensing.org/libtiff/
 IUSE=+cxx jbig jpeg lzma static-libs zlib
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=as-is
 RDEPEND=jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.1.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.1.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=aae9d5c9b48db199d3536b9cf0a709ef
+_md5_=982cc6d388ef63dcd6ab1c5a914209ec
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1 b/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
index 6f3809934826..7ebb461aaff8 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=4
 HOMEPAGE=http://xine.sourceforge.net/
 IUSE=a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/ffmpeg virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nls? ( virtual/libintl ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) real? ( amd64? ( media-libs/amd64codecs ) x86? ( media-libs/win32codecs ) x86-fbsd? ( media-libs/win32codecs ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5448b0b17fbe7a08ef440754981bc8d2
+_md5_=bcfb695ad68a70ba28528cab019eddb2
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.3 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.3
deleted file mode 100644
index 870460dce99b..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext on the OSD
-EAPI=4
-HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-osdteletext
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/912/vdr-osdteletext-0.9.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=06666c6db377cf0b2b92d16ac723aab9
diff --git a/metadata/md5-cache/net-analyzer/bsnmp-1.12 b/metadata/md5-cache/net-analyzer/bsnmp-1.12
new file mode 100644
index 000000000000..695dd6cef17f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bsnmp-1.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Mini-SNMP Daemon and Library
+HOMEPAGE=http://people.freebsd.org/~harti/
+IUSE=tcpd
+KEYWORDS=~amd64-fbsd ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-libs/libbegemot tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=http://people.freebsd.org/~harti/bsnmp/bsnmp-1.12.tar.gz
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=a6168798848a09e60d4cd14631f42606
diff --git a/metadata/md5-cache/net-dns/c-ares-1.7.5 b/metadata/md5-cache/net-dns/c-ares-1.7.5
index 3ff96d7216aa..6592e1b8d956 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.7.5
+++ b/metadata/md5-cache/net-dns/c-ares-1.7.5
@@ -3,8 +3,8 @@ DESCRIPTION=C library that resolves names asynchronously
 EAPI=4
 HOMEPAGE=http://c-ares.haxx.se/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://c-ares.haxx.se/download/c-ares-1.7.5.tar.gz
-_md5_=ede63ec82049ae184b13cc647465e054
+_md5_=f16be938225afeae614b8c08c5380bde
diff --git a/metadata/md5-cache/net-dns/libidn-1.24 b/metadata/md5-cache/net-dns/libidn-1.24
index e897b3b4133d..8c45ef6421ab 100644
--- a/metadata/md5-cache/net-dns/libidn-1.24
+++ b/metadata/md5-cache/net-dns/libidn-1.24
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2 GPL-3 LGPL-3
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( virtual/libintl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.24.tar.gz
 _eclasses_=elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	74d9118e657da5b1db0c36f5dea88e57	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3abe5d2fe3730b5bda2dc97becd922be
+_md5_=77da675220925472850618bd140f5818
diff --git a/metadata/md5-cache/net-im/centerim-4.22.10 b/metadata/md5-cache/net-im/centerim-4.22.10
index b4db8b897a09..3bd9241d1231 100644
--- a/metadata/md5-cache/net-im/centerim-4.22.10
+++ b/metadata/md5-cache/net-im/centerim-4.22.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
+DEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
 DESCRIPTION=CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client
 EAPI=2
 HOMEPAGE=http://www.centerim.org/
 IUSE=+aim gadu +icq +irc +jabber lj +msn rss +yahoo bidi nls ssl crypt jpeg otr
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
+RDEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://www.centerim.org/download/releases/centerim-4.22.10.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=eee419ad5b4cd4f33153c32afb3d9377
+_md5_=513aae8a2dd9cc580b76f1d9fcd7413a
diff --git a/metadata/md5-cache/net-im/centerim-4.22.9 b/metadata/md5-cache/net-im/centerim-4.22.9
index 67e1a6db475a..3f5c29ca0fbf 100644
--- a/metadata/md5-cache/net-im/centerim-4.22.9
+++ b/metadata/md5-cache/net-im/centerim-4.22.9
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
+DEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) )
 DESCRIPTION=CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client
 EAPI=2
 HOMEPAGE=http://www.centerim.org/
 IUSE=+aim gadu +icq +irc +jabber lj +msn rss +yahoo bidi nls ssl crypt jpeg otr
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
+RDEPEND=>=sys-libs/ncurses-5.2 bidi? ( dev-libs/fribidi ) ssl? ( >=dev-libs/openssl-0.9.6g ) jpeg? ( virtual/jpeg ) jabber? ( otr? ( net-libs/libotr ) crypt? ( >=app-crypt/gpgme-1.0.2 ) ) msn? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) yahoo? ( || ( >=net-misc/curl-7.25.0-r1[ssl] >=net-misc/curl-7.19.6[ssl] >=net-misc/curl-7.19.6[gnutls] >=net-misc/curl-7.19.6[nss] ) ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=http://www.centerim.org/download/releases/centerim-4.22.9.tar.gz
-_md5_=104f1fec9b27f2ca619ded84c954e7e8
+_md5_=0545d699efcdf264d89bf853a31a562a
diff --git a/metadata/md5-cache/net-libs/libssh2-1.4.1 b/metadata/md5-cache/net-libs/libssh2-1.4.1
index 85f1ff639e16..1fe87a02adae 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.4.1
+++ b/metadata/md5-cache/net-libs/libssh2-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=4
 HOMEPAGE=http://www.libssh2.org/
 IUSE=gcrypt static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( dev-libs/openssl ) gcrypt? ( dev-libs/libgcrypt ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.4.1.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=144cd23760dbac8578474927f14aaba0
+_md5_=2efb8e55e74e7ccaaa35a442f13a2a36
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r3 b/metadata/md5-cache/net-print/cups-1.5.2-r20
similarity index 98%
rename from metadata/md5-cache/net-print/cups-1.5.2-r3
rename to metadata/md5-cache/net-print/cups-1.5.2-r20
index d0ee4865dac2..dea09a5c7c83 100644
--- a/metadata/md5-cache/net-print/cups-1.5.2-r3
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r20
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	5f623f5a211fb1b2d84d88ee49959a54	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9937ab5fe72cae2bf66b2025f7b06e46
+_md5_=a8c46a0f96b24c65b7a296b50de34160
diff --git a/metadata/md5-cache/net-print/cups-1.5.2-r4 b/metadata/md5-cache/net-print/cups-1.5.2-r4
new file mode 100644
index 000000000000..9c6b145b3d29
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-1.5.2-r4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=The Common Unix Printing System
+EAPI=4
+HOMEPAGE=http://www.cups.org/
+IUSE=acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd linguas_da linguas_de linguas_es linguas_eu linguas_fi linguas_fr linguas_id linguas_it linguas_ja linguas_ko linguas_nl linguas_no linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sv linguas_zh linguas_zh_TW elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=app-text/ghostscript-gpl[cups] >=app-text/poppler-0.12.3-r3[utils] filters? ( net-print/foomatic-filters )
+RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+REQUIRED_USE=gnutls? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-avahi.patch.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	5f623f5a211fb1b2d84d88ee49959a54	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c521b35b60aa534b06ab9ddd9a4b1638
diff --git a/metadata/md5-cache/net-proxy/dante-1.3.2 b/metadata/md5-cache/net-proxy/dante-1.3.2
index c818315999ce..341dd13d39b5 100644
--- a/metadata/md5-cache/net-proxy/dante-1.3.2
+++ b/metadata/md5-cache/net-proxy/dante-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=4
 HOMEPAGE=http://www.inet.no/dante/
 IUSE=debug kerberos pam selinux static-libs tcpd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.3.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c5baf7de3934a574cc61b30100c6ec12
+_md5_=38f5c62726d926e434135b031d5dfc93
diff --git a/metadata/md5-cache/net-wireless/bluez-hcidump-2.3 b/metadata/md5-cache/net-wireless/bluez-hcidump-2.3
index 86ba1d9f3fd3..cb13bc184b30 100644
--- a/metadata/md5-cache/net-wireless/bluez-hcidump-2.3
+++ b/metadata/md5-cache/net-wireless/bluez-hcidump-2.3
@@ -3,9 +3,9 @@ DEPEND=>=net-wireless/bluez-4.98 dev-util/pkgconfig app-arch/xz-utils
 DESCRIPTION=Bluetooth HCI packet analyzer
 EAPI=4
 HOMEPAGE=http://www.bluez.org/
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 ~arm hppa ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-4.98
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-hcidump-2.3.tar.xz
-_md5_=7ef2ab460e3baaefc1e126aa86501dea
+_md5_=003c92e2eb9141ab8da634502d124cc4
diff --git a/metadata/md5-cache/net-wireless/bluez-hcidump-2.4 b/metadata/md5-cache/net-wireless/bluez-hcidump-2.4
index f926a7c9de92..ed5eb2a582a9 100644
--- a/metadata/md5-cache/net-wireless/bluez-hcidump-2.4
+++ b/metadata/md5-cache/net-wireless/bluez-hcidump-2.4
@@ -3,9 +3,9 @@ DEPEND=>=net-wireless/bluez-4.98 dev-util/pkgconfig app-arch/xz-utils
 DESCRIPTION=Bluetooth HCI packet analyzer
 EAPI=4
 HOMEPAGE=http://www.bluez.org/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-4.98
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-hcidump-2.4.tar.xz
-_md5_=378dda4748f38f3ce2365cd1b455cfb9
+_md5_=98925871c4e4810df463600ceb167e49
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.49.0 b/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.49.0
index 91fd6e365884..728545e39333 100644
--- a/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.49.0
+++ b/metadata/md5-cache/perl-core/Compress-Raw-Bzip2-2.49.0
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2 dev-lang/perl[-build]
 DESCRIPTION=Low-Level Interface to bzip2 compression library
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Compress-Raw-Bzip2/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=app-arch/bzip2 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.049.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=de33b955cb48075606cad1cf1c30ddb8
+_md5_=1c99786cf57611a937096a043600f8ee
diff --git a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.49.0 b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.49.0
index 9c3446f1ee03..e5a99a7798dc 100644
--- a/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.49.0
+++ b/metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.49.0
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/zlib-1.2.5 dev-lang/perl[-build]
 DESCRIPTION=Low-Level Interface to zlib compression library
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Compress-Raw-Zlib/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=sys-libs/zlib-1.2.5 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.049.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9b9b1458e76418052bd38555a7fc7b64
+_md5_=c537ef2af3ad2e6212c55ba1bc04375e
diff --git a/metadata/md5-cache/perl-core/IO-Compress-2.49.0 b/metadata/md5-cache/perl-core/IO-Compress-2.49.0
index 6a4c105c6acd..8bd569752bdd 100644
--- a/metadata/md5-cache/perl-core/IO-Compress-2.49.0
+++ b/metadata/md5-cache/perl-core/IO-Compress-2.49.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-Compress-Raw-Zlib-2.49.0 >=
 DESCRIPTION=allow reading and writing of compressed data
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/IO-Compress/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-Compress-Raw-Zlib-2.49.0 >=virtual/perl-Compress-Raw-Bzip2-2.49.0 !perl-core/Compress-Zlib !perl-core/IO-Compress-Zlib !perl-core/IO-Compress-Bzip2 !perl-core/IO-Compress-Base dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.049.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7847b338c829e5b08cb2325bcafc42a3
+_md5_=0fa0a6d9d525b8eefc5bbd3e53704888
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.250.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.250.0
index 9b5734179f3e..8bae140cb540 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.250.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.250.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Scalar-List-Utils module for perl
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Scalar-List-Utils/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.25.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9bccd4a0c35571a84c2583debda89861
+_md5_=652f6ae2be7c8c9c0c5249e426edbbc4
diff --git a/metadata/md5-cache/sci-astronomy/sextractor-2.5.0 b/metadata/md5-cache/sci-astronomy/sextractor-2.5.0
deleted file mode 100644
index 9953ceb6170d..000000000000
--- a/metadata/md5-cache/sci-astronomy/sextractor-2.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DESCRIPTION=Extract catalogs of sources from astronomical FITS images.
-EAPI=2
-HOMEPAGE=http://terapix.iap.fr/soft/sextractor
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/sextractor-2.5.0.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ce14cad24c388130cc8b6348b73d0ccc
diff --git a/metadata/md5-cache/sci-astronomy/sextractor-2.8.6 b/metadata/md5-cache/sci-astronomy/sextractor-2.8.6
index bb86d0e134d5..4bb078a7a322 100644
--- a/metadata/md5-cache/sci-astronomy/sextractor-2.8.6
+++ b/metadata/md5-cache/sci-astronomy/sextractor-2.8.6
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Extract catalogs of sources from astronomical FITS images.
-EAPI=2
-HOMEPAGE=http://astromatic.iap.fr/software/sextractor
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/cblas sci-libs/lapack-atlas sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Extract catalogs of sources from astronomical FITS images
+EAPI=4
+HOMEPAGE=http://astromatic.iap.fr/software/sextractor/
 IUSE=doc threads
 KEYWORDS=~amd64 ~x86
 LICENSE=CeCILL-2
-RDEPEND=virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0
+RDEPEND=virtual/cblas sci-libs/lapack-atlas sci-libs/fftw:3.0
 SLOT=0
 SRC_URI=ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/sextractor-2.8.6.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1204170bfed5f9678669892bb5c6e9de
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=9df0fb1ee5c7a45e66460eb4ac35b017
diff --git a/metadata/md5-cache/sci-biology/bamtools-1.0.2 b/metadata/md5-cache/sci-biology/bamtools-1.0.2
index 532c82953ecb..15757a958022 100644
--- a/metadata/md5-cache/sci-biology/bamtools-1.0.2
+++ b/metadata/md5-cache/sci-biology/bamtools-1.0.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=BamTools provides both a programmer's API and an end-user's toolkit for handling BAM files.
+DESCRIPTION=A programmer's API and an end-user's toolkit for handling BAM files
 EAPI=4
 HOMEPAGE=https://github.com/pezmaster31/bamtools
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://github/pezmaster31/bamtools/bamtools-1.0.2.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9d3e8a62cf18d953800155ff882755f6
+_md5_=ce906838d02edfddd68cf1c6f3433108
diff --git a/metadata/md5-cache/sci-biology/emboss-6.1.0 b/metadata/md5-cache/sci-biology/emboss-6.1.0
deleted file mode 100644
index f39549f2bdfe..000000000000
--- a/metadata/md5-cache/sci-biology/emboss-6.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=X? ( x11-libs/libXt ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) !minimal? ( sci-biology/primer3 sci-biology/clustalw )
-DESCRIPTION=The European Molecular Biology Open Software Suite - A sequence analysis package
-HOMEPAGE=http://emboss.sourceforge.net/
-IUSE=X png minimal
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2
-PDEPEND=!minimal? ( sci-biology/aaindex sci-biology/cutg sci-biology/prints sci-biology/prosite >=sci-biology/rebase-707 sci-biology/transfac )
-RDEPEND=X? ( x11-libs/libXt ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) !minimal? ( sci-biology/primer3 sci-biology/clustalw ) !sys-devel/cons
-SLOT=0
-SRC_URI=ftp://emboss.open-bio.org/pub/EMBOSS/old/6.1.0/EMBOSS-6.1.0.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d4c036cbed8d8d0bad9c19cfece5c119
diff --git a/metadata/md5-cache/sci-biology/pilercr-1.0 b/metadata/md5-cache/sci-biology/pilercr-1.0
index 0456a4cca265..478cf1f29e8a 100644
--- a/metadata/md5-cache/sci-biology/pilercr-1.0
+++ b/metadata/md5-cache/sci-biology/pilercr-1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Analysis of Clustered Regularly Interspaced Short Palindromic Repeats (CRISPRs)
-EAPI=2
+EAPI=4
 HOMEPAGE=http://www.drive5.com/pilercr/
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://gentoo/pilercr-1.0.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9593da6d18b226b4c6fccb1ade0f3675
+_md5_=4cb59866079b2434675d5949e6d61072
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11 b/metadata/md5-cache/sci-calculators/hexcalc-1.11
deleted file mode 100644
index f0d73a433161..000000000000
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXaw x11-misc/imake app-text/rman
-DESCRIPTION=A simple hex calculator for X
-HOMEPAGE=ftp://ftp.x.org/R5contrib/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXaw
-SLOT=0
-SRC_URI=ftp://ftp.x.org/R5contrib/hexcalc.tar.Z
-_md5_=76d8438fcabdd19b17febd4adaaeb0e0
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r2 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r2
index 704f8708fbde..1f8ecb389c24 100644
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r2
+++ b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libXaw x11-misc/imake app-text/rman
 DESCRIPTION=A simple hex calculator for X
-EAPI=3
+EAPI=4
 HOMEPAGE=ftp://ftp.x.org/R5contrib/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXaw
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/hexcalc.tar.Z
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=54d359e21f8ae92f09228323e0dff066
+_md5_=a8f2639bc0bb1a29232bb31fc9d51d3d
diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.10-r1 b/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
index 451b52d71c33..40f333974b6f 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.5.10-r1
@@ -3,10 +3,10 @@ DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) nls? ( sys-deve
 DESCRIPTION=GNU utilities for finding files
 HOMEPAGE=http://www.gnu.org/software/findutils/
 IUSE=nls selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.10.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c14e35cf29b297cfba633ec7f543fe5e
+_md5_=9edfda7b7fd6ee1c57bbb4ab7b952c4a
diff --git a/metadata/md5-cache/sys-apps/help2man-1.40.8 b/metadata/md5-cache/sys-apps/help2man-1.40.8
index a6456d0e8aef..868b50660548 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.40.8
+++ b/metadata/md5-cache/sys-apps/help2man-1.40.8
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/help2man
 IUSE=nls elibc_glibc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl elibc_glibc? ( nls? ( dev-perl/Locale-gettext ) )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.40.8.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2866038bdb699e648536026e9b66f030
+_md5_=25df57ac7c97e373740651737e2c0b3a
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.1.9-r2 b/metadata/md5-cache/sys-apps/pciutils-3.1.9-r2
index ae2d9e4a426e..4e264f4e8f00 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.1.9-r2
+++ b/metadata/md5-cache/sys-apps/pciutils-3.1.9-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=zlib? ( sys-libs/zlib )
+DEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=4
 HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html
 IUSE=static-libs zlib
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib ) sys-apps/hwids
+RDEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) sys-apps/hwids
 SLOT=0
 SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.9.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a75f1db5f1cfb7de81bc3e1504634ada
+_md5_=971a29a718f697b1a4bead20df57f522
diff --git a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1 b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
index 824e6b5ab0eb..06981f383abe 100644
--- a/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
+++ b/metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Create per-user private temporary directories during login
 EAPI=4
 HOMEPAGE=http://www.openwall.com/pam/
 IUSE=selinux +prevent-removal
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=virtual/pam selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=http://www.openwall.com/pam/modules/pam_mktemp/pam_mktemp-1.1.1.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=26f6cf452449aedeaaca59f4aa7c8c20
+_md5_=31f77478ca6e14c0d61e654331bde14b
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.13 b/metadata/md5-cache/sys-devel/autoconf-2.13
index 3d60ad8f988d..7f646cc291f4 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.13
+++ b/metadata/md5-cache/sys-devel/autoconf-2.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=>=sys-apps/texinfo-4.3 sys-devel/autoconf-wrapper =sys-devel/m4-1.4* dev-lang/perl
 DESCRIPTION=Used to create autoconfiguration files
 HOMEPAGE=http://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/texinfo-4.3 sys-devel/autoconf-wrapper =sys-devel/m4-1.4* dev-lang/perl
 SLOT=2.1
 SRC_URI=mirror://gnu/autoconf/autoconf-2.13.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bba2083b28080b2d5b30db6c6f6f7a67
+_md5_=662a59c2dc4079658a263c63b08c456c
diff --git a/metadata/md5-cache/sys-devel/autogen-5.15 b/metadata/md5-cache/sys-devel/autogen-5.15
index 15ced397e86d..57890374e147 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.15
+++ b/metadata/md5-cache/sys-devel/autogen-5.15
@@ -3,10 +3,10 @@ DEPEND=>=dev-scheme/guile-1.8 dev-libs/libxml2
 DESCRIPTION=Program and text file generation
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/autogen/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.15/autogen-5.15.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a329e6118ce6042709b713664f817901
+_md5_=1240f9835c52703a08e5d71afb1dea3f
diff --git a/metadata/md5-cache/sys-devel/gdb-6.6-r2 b/metadata/md5-cache/sys-devel/gdb-6.6-r2
index 50dfae9d4163..257a91251d9d 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.6-r2
+++ b/metadata/md5-cache/sys-devel/gdb-6.6-r2
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.6.tar.bz2 mirror://gentoo/gdb-6.6-patches-1.3.tar.bz2
+SRC_URI=mirror://gnu/gdb/gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.6.tar.bz2 mirror://gentoo/gdb-6.6-patches-1.3.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9fc9cbcdf5813ba56462b4691bd26388
+_md5_=b16e5c6f5a7ab7f568c3543230313247
diff --git a/metadata/md5-cache/sys-devel/gdb-6.7.1-r3 b/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
index 8f5188c3db4a..a8b1bef44214 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
+++ b/metadata/md5-cache/sys-devel/gdb-6.7.1-r3
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-6.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.7.1.tar.bz2 mirror://gentoo/gdb-6.7.1-patches-1.3.tar.bz2
+SRC_URI=mirror://gnu/gdb/gdb-6.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.7.1.tar.bz2 mirror://gentoo/gdb-6.7.1-patches-1.3.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7973919b0511f0b36e9c50280a33b36d
+_md5_=318efe6224ae772cd2764d1c86670c3e
diff --git a/metadata/md5-cache/sys-devel/gdb-6.8-r1 b/metadata/md5-cache/sys-devel/gdb-6.8-r1
index 8d5a32edf03b..538dd68e6f1c 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.8-r1
+++ b/metadata/md5-cache/sys-devel/gdb-6.8-r1
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.4.tar.lzma
+SRC_URI=mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.4.tar.lzma
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a260e7cb5a979c0db566ff15f4034550
+_md5_=99c4ab604f111279889c9837b37cda0c
diff --git a/metadata/md5-cache/sys-devel/gdb-6.8-r2 b/metadata/md5-cache/sys-devel/gdb-6.8-r2
index 98987120feb0..ceaa2b3ba830 100644
--- a/metadata/md5-cache/sys-devel/gdb-6.8-r2
+++ b/metadata/md5-cache/sys-devel/gdb-6.8-r2
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.5.tar.lzma
+SRC_URI=mirror://gnu/gdb/gdb-6.8.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-6.8.tar.bz2 mirror://gentoo/gdb-6.8-patches-1.5.tar.lzma
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2fb3c5b8937d09fbe1a2653f6f995c0a
+_md5_=7aa26b6d055ee23f61104b1b79ec028f
diff --git a/metadata/md5-cache/sys-devel/gdb-7.0.1 b/metadata/md5-cache/sys-devel/gdb-7.0.1
index fd777071ba2a..bc2ff536401c 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.0.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.0.1
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.0.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.1.tar.bz2 mirror://gentoo/gdb-7.0.1-patches-1.tar.lzma
+SRC_URI=mirror://gnu/gdb/gdb-7.0.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.0.1.tar.bz2 mirror://gentoo/gdb-7.0.1-patches-1.tar.lzma
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0cc8ed28bc91a0d39c7586c681659b08
+_md5_=d5e3c52101866e693aa0bdcc59eeb1cd
diff --git a/metadata/md5-cache/sys-devel/gdb-7.1 b/metadata/md5-cache/sys-devel/gdb-7.1
index 6d9733347428..de3705e4be0a 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.1
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( dev-lang/python )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.1.tar.bz2 mirror://gentoo/gdb-7.1-patches-1.tar.lzma
+SRC_URI=mirror://gnu/gdb/gdb-7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.1.tar.bz2 mirror://gentoo/gdb-7.1-patches-1.tar.lzma
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c0870db431d4ef91f9c9b4e0899f4c58
+_md5_=c0780895ab1eec7d8b318c221c664035
diff --git a/metadata/md5-cache/sys-devel/gdb-7.2 b/metadata/md5-cache/sys-devel/gdb-7.2
index 424edb6b7473..cd2096182f44 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.2
+++ b/metadata/md5-cache/sys-devel/gdb-7.2
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~x64
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 mirror://gentoo/gdb-7.2-patches-1.tar.xz
+SRC_URI=mirror://gnu/gdb/gdb-7.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.2.tar.bz2 mirror://gentoo/gdb-7.2-patches-1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f6297bf749c5e9352528f6b46e660f4c
+_md5_=827c83b368ad45256513572d760dc73b
diff --git a/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15 b/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
index 7ce1974734a3..2c0a5c3b9f5d 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
+++ b/metadata/md5-cache/sys-devel/gdb-7.2.50.20101117.4.15
@@ -7,6 +7,6 @@ IUSE=expat multitarget nls python test vanilla
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
-SRC_URI=http://mirrors.kernel.org/fedora/development/source/SRPMS/gdb-7.2.50.20101117-4.fc15.src.rpm
+SRC_URI=mirror://fedora/development/source/SRPMS/gdb-7.2.50.20101117-4.fc15.src.rpm
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc2d2cb26ef38812b7076726fe06436f
+_md5_=ef9ff85ef0f6995f41b204161515b3c3
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3 b/metadata/md5-cache/sys-devel/gdb-7.3
index ac473d63802e..f88e8ac89756 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3
+++ b/metadata/md5-cache/sys-devel/gdb-7.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.3.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.tar.bz2 mirror://gentoo/gdb-7.3-patches-1.tar.xz
+SRC_URI=mirror://gnu/gdb/gdb-7.3.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.tar.bz2 mirror://gentoo/gdb-7.3-patches-1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b0e177b0eb2fd5530aff2b97733bda69
+_md5_=e81c143952c38abc186dc328f52e39d7
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3.1 b/metadata/md5-cache/sys-devel/gdb-7.3.1
index 00503ca2914a..8c63acb38d27 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.3.1
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x86-
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
+SRC_URI=mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c771389c2fca88383af736e0efdac412
+_md5_=f189e255bf62d88b88a56b5e514e60e6
diff --git a/metadata/md5-cache/sys-devel/gdb-7.3.1-r1 b/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
index aa4d5ccfcb12..dc4cc082ed37 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
+++ b/metadata/md5-cache/sys-devel/gdb-7.3.1-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
+SRC_URI=mirror://gnu/gdb/gdb-7.3.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.3.1.tar.bz2 mirror://gentoo/gdb-7.3.1-patches-2.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ac174edae72c383952a4f564e8886351
+_md5_=01ce444f208faa47da777d5ea3e91803
diff --git a/metadata/md5-cache/sys-devel/gdb-7.4 b/metadata/md5-cache/sys-devel/gdb-7.4
index 56c8587884f6..c3a2b64b9c4a 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.4
+++ b/metadata/md5-cache/sys-devel/gdb-7.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=http://ftp.gnu.org/gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
+SRC_URI=mirror://gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=449af342591b2d84d0ee9328e40150f2
+_md5_=fcf712cdc57dcf13c750e410d7603340
diff --git a/metadata/md5-cache/sys-devel/gdb-7.4.1 b/metadata/md5-cache/sys-devel/gdb-7.4.1
new file mode 100644
index 000000000000..12174a8b43f4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-7.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
+DESCRIPTION=GNU debugger
+EAPI=3
+HOMEPAGE=http://sourceware.org/gdb/
+IUSE=+client expat multitarget nls +python +server test vanilla zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-7.4.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.1.tar.bz2 mirror://gentoo/gdb-7.4.1-patches-1.tar.xz
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6c323aa114a55420e79c08189f337177
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index 06bd7a5b0d02..cad993e80738 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=db1ac840eb579711985afa3af8cf842b
+_md5_=fc596a3caf769b3b9340be05ceeb1a87
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r1 b/metadata/md5-cache/sys-libs/glibc-2.15-r1
index 9ae4d7905135..b8981d8cd328 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r1
@@ -8,6 +8,6 @@ LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-9.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-9.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-9.tar.bz2
+SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-10.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-10.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-10.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	1a29d4db2138f0996c1071b0b67e91a1	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=93b7cf69d0037b97cbcabedefba740fa
+_md5_=7b5aff0b6123bdd304468fc768f52e41
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.1.1 b/metadata/md5-cache/sys-libs/libosinfo-0.1.1
new file mode 100644
index 000000000000..5f980dd835f7
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/glib:2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 >=dev-libs/libxml2-2.6.0:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) test? ( dev-libs/check ) vala? ( dev-lang/vala:0.14 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GObject library for managing information about real and virtual OSes
+EAPI=4
+HOMEPAGE=https://fedorahosted.org/libosinfo/
+IUSE=doc +introspection +vala test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/glib:2 net-libs/libsoup:2.4 net-libs/libsoup-gnome:2.4 >=dev-libs/libxml2-2.6.0:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.1.1.tar.gz
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=deb1bccbf6d1d11ae9988aba7b732637
diff --git a/metadata/md5-cache/sys-libs/newlib-1.20.0 b/metadata/md5-cache/sys-libs/newlib-1.20.0
index 6a84a6d1ff44..81f2dc17db9a 100644
--- a/metadata/md5-cache/sys-libs/newlib-1.20.0
+++ b/metadata/md5-cache/sys-libs/newlib-1.20.0
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/newlib/newlib-1.20.0.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=71bf5d7e780d77113038d5706c2559e5
+_md5_=70e16886a58c3359471dcaea5034ab97
diff --git a/metadata/md5-cache/sys-power/iasl-20111123 b/metadata/md5-cache/sys-power/iasl-20111123
index 96afeb040eb0..a606e09fe0b1 100644
--- a/metadata/md5-cache/sys-power/iasl-20111123
+++ b/metadata/md5-cache/sys-power/iasl-20111123
@@ -4,9 +4,9 @@ DESCRIPTION=Intel ACPI Source Language (ASL) compiler
 EAPI=4
 HOMEPAGE=http://www.intel.com/technology/iapc/acpi/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=iASL
 SLOT=0
 SRC_URI=http://www.acpica.org/download/acpica-unix-20111123.tar.gz test? ( http://www.acpica.org/download/acpitests-unix-20111123.tar.gz )
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4cab358f94c29fa535be57bb3197bbda
+_md5_=64872757088b9bf3a7aee0b889868be3
diff --git a/metadata/md5-cache/virtual/fam-0 b/metadata/md5-cache/virtual/fam-0
index bf4d4cae8920..77d3347a103e 100644
--- a/metadata/md5-cache/virtual/fam-0
+++ b/metadata/md5-cache/virtual/fam-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=A virtual package to choose between gamin and fam
 EAPI=2
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( app-admin/gamin app-admin/fam )
 SLOT=0
-_md5_=e4230efcf8f4bd62c06ef99faa0b11ff
+_md5_=258861f180241b1b577aed1e8a5a5e63
diff --git a/metadata/md5-cache/virtual/jpeg-0 b/metadata/md5-cache/virtual/jpeg-0
index 409726da6a51..86bfe9d8a690 100644
--- a/metadata/md5-cache/virtual/jpeg-0
+++ b/metadata/md5-cache/virtual/jpeg-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the JPEG implementation
 EAPI=4
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix? ( >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] ) prefix? ( || ( >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] >=media-libs/jpeg-8d:0[static-libs?] ) )
 SLOT=0
-_md5_=b72f22d56e250a9615c5d2ae3769cfb5
+_md5_=7b525693a431b214182839b347c20432
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.49.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
index 0f4fc4bfdaa9..96b59b2e5325 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.49.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Compress-Raw-Bzip2-2.49.0
 SLOT=0
-_md5_=ca0b0cb1657fce2ddc505079030e207d
+_md5_=7e93fb45e1ca76b74e28da792d890e73
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.49.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.49.0
index 7a93a9f79d59..9fc54759003d 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.49.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.49.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Compress-Raw-Zlib-2.49.0
 SLOT=0
-_md5_=9f9d2093117f6733ea0b3736b0a63cd9
+_md5_=69f648004c0c75a3125ed4d522497e2e
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.49.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.49.0
index 650bd2493d10..2da2d773bd87 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.49.0
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.49.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/IO-Compress-2.49.0
 SLOT=0
-_md5_=4117e32925b2352e3e38081a007b50f6
+_md5_=bf3eb1d4dcee61ff4af2574fb6e825bb
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.250.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.250.0
index a53d7badceb9..2b48e75b9bc4 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.250.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.250.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.250.0
 SLOT=0
-_md5_=58e911e65144ff492b586b47f7b1ca6a
+_md5_=5702832ac3a54baae2e65994a4839c19
diff --git a/metadata/md5-cache/virtual/ttf-fonts-1 b/metadata/md5-cache/virtual/ttf-fonts-1
index eee09cad9273..5a664d972856 100644
--- a/metadata/md5-cache/virtual/ttf-fonts-1
+++ b/metadata/md5-cache/virtual/ttf-fonts-1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Serif/Sans/Monospace font packages
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 RDEPEND=|| ( media-fonts/dejavu media-fonts/ttf-bitstream-vera media-fonts/liberation-fonts media-fonts/droid media-fonts/freefont-ttf media-fonts/corefonts )
 SLOT=0
-_md5_=b7fe45d4cf138076f63de8eefe2a6c14
+_md5_=d91d643782dea05cac87d30759db25ab
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.19.0_beta2 b/metadata/md5-cache/www-apps/mediawiki-1.18.3
similarity index 87%
rename from metadata/md5-cache/www-apps/mediawiki-1.19.0_beta2
rename to metadata/md5-cache/www-apps/mediawiki-1.18.3
index 5b445c41670b..5c17ae9714f6 100644
--- a/metadata/md5-cache/www-apps/mediawiki-1.19.0_beta2
+++ b/metadata/md5-cache/www-apps/mediawiki-1.18.3
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader] imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) !imagemagick? ( dev-lang/php[gd] ) sqlite? ( dev-db/sqlite:3[fts3] >=dev-lang/php-5.3[sqlite3,pdo] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 RESTRICT=test
-SLOT=1.19.0_beta2
-SRC_URI=http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0beta2.tar.gz
+SLOT=1.18.3
+SRC_URI=http://download.wikimedia.org/mediawiki/1.18/mediawiki-1.18.3.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=b1fdf2125cca39e855f2ab5c21a0beab
+_md5_=b8cd94cba238dde66320c2f3c0fbc904
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.19.0_beta1 b/metadata/md5-cache/www-apps/mediawiki-1.19.0_rc1
similarity index 92%
rename from metadata/md5-cache/www-apps/mediawiki-1.19.0_beta1
rename to metadata/md5-cache/www-apps/mediawiki-1.19.0_rc1
index 6ff910be7600..33e3579be93f 100644
--- a/metadata/md5-cache/www-apps/mediawiki-1.19.0_beta1
+++ b/metadata/md5-cache/www-apps/mediawiki-1.19.0_rc1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader] imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) !imagemagick? ( dev-lang/php[gd] ) sqlite? ( dev-db/sqlite:3[fts3] >=dev-lang/php-5.3[sqlite3,pdo] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 RESTRICT=test
-SLOT=1.19.0_beta1
-SRC_URI=http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0beta1.tar.gz
+SLOT=1.19.0_rc1
+SRC_URI=http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0rc1.tar.gz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=887268edc4626895a98aedb6b4b800bf
+_md5_=c2c7a14b75a5dc06c6d4ffb7cfcef07b
diff --git a/metadata/md5-cache/www-apps/roundup-1.4.19 b/metadata/md5-cache/www-apps/roundup-1.4.19
new file mode 100644
index 000000000000..21af4fe9e96a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/roundup-1.4.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=>=sys-libs/db-3.2.9 =dev-lang/python-2*
+DESCRIPTION=Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces.
+EAPI=4
+HOMEPAGE=http://roundup.sourceforge.net http://pypi.python.org/pypi/roundup
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=MIT ZPL
+RDEPEND=>=sys-libs/db-3.2.9 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/r/roundup/roundup-1.4.19.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
+_md5_=00f4576be64a91ee15c103c6ebe99727
diff --git a/metadata/md5-cache/www-apps/wordpress-3.3.2 b/metadata/md5-cache/www-apps/wordpress-3.3.2
new file mode 100644
index 000000000000..b9f68eb0da2f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/wordpress-3.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Wordpress php and mysql based CMS system
+EAPI=4
+HOMEPAGE=http://wordpress.org/
+IUSE=vhosts
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
+SLOT=3.3.2
+SRC_URI=http://wordpress.org/wordpress-3.3.2.tar.gz
+_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=ea0caedf7f1ae8ffe17b8a4e6216ef90
diff --git a/metadata/md5-cache/www-client/firefox-10.0 b/metadata/md5-cache/www-client/firefox-10.0
deleted file mode 100644
index 56411fde5b8c..000000000000
--- a/metadata/md5-cache/www-client/firefox-10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +crashreporter +ipc pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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 )
-SLOT=0
-SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/af.xpi -> firefox-10.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ak.xpi -> firefox-10.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ar.xpi -> firefox-10.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/as.xpi -> firefox-10.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ast.xpi -> firefox-10.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/be.xpi -> firefox-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bg.xpi -> firefox-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-BD.xpi -> firefox-10.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-IN.xpi -> firefox-10.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/br.xpi -> firefox-10.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bs.xpi -> firefox-10.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ca.xpi -> firefox-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cs.xpi -> firefox-10.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/csb.xpi -> firefox-10.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cy.xpi -> firefox-10.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/da.xpi -> firefox-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/de.xpi -> firefox-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/el.xpi -> firefox-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-GB.xpi -> firefox-10.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-ZA.xpi -> firefox-10.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eo.xpi -> firefox-10.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-AR.xpi -> firefox-10.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-CL.xpi -> firefox-10.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-ES.xpi -> firefox-10.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-MX.xpi -> firefox-10.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/et.xpi -> firefox-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eu.xpi -> firefox-10.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fa.xpi -> firefox-10.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fi.xpi -> firefox-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fr.xpi -> firefox-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fy-NL.xpi -> firefox-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ga-IE.xpi -> firefox-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gd.xpi -> firefox-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gl.xpi -> firefox-10.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gu-IN.xpi -> firefox-10.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/he.xpi -> firefox-10.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hi-IN.xpi -> firefox-10.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hr.xpi -> firefox-10.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hu.xpi -> firefox-10.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hy-AM.xpi -> firefox-10.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/id.xpi -> firefox-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/is.xpi -> firefox-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/it.xpi -> firefox-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ja.xpi -> firefox-10.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kk.xpi -> firefox-10.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kn.xpi -> firefox-10.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ko.xpi -> firefox-10.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ku.xpi -> firefox-10.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lg.xpi -> firefox-10.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lt.xpi -> firefox-10.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lv.xpi -> firefox-10.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mai.xpi -> firefox-10.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mk.xpi -> firefox-10.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ml.xpi -> firefox-10.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mr.xpi -> firefox-10.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nb-NO.xpi -> firefox-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nl.xpi -> firefox-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nn-NO.xpi -> firefox-10.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nso.xpi -> firefox-10.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/or.xpi -> firefox-10.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pa-IN.xpi -> firefox-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pl.xpi -> firefox-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-BR.xpi -> firefox-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-PT.xpi -> firefox-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/rm.xpi -> firefox-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ro.xpi -> firefox-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ru.xpi -> firefox-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/si.xpi -> firefox-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sk.xpi -> firefox-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sl.xpi -> firefox-10.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/son.xpi -> firefox-10.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sq.xpi -> firefox-10.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sr.xpi -> firefox-10.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sv-SE.xpi -> firefox-10.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta.xpi -> firefox-10.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta-LK.xpi -> firefox-10.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/te.xpi -> firefox-10.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/th.xpi -> firefox-10.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/tr.xpi -> firefox-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/uk.xpi -> firefox-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/vi.xpi -> firefox-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-CN.xpi -> firefox-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-TW.xpi -> firefox-10.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zu.xpi -> firefox-10.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0/source/firefox-10.0.source.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=7ebb7129d88e83da90226f6dbca77757
diff --git a/metadata/md5-cache/www-client/firefox-10.0.1 b/metadata/md5-cache/www-client/firefox-10.0.1
deleted file mode 100644
index abd6b97baeab..000000000000
--- a/metadata/md5-cache/www-client/firefox-10.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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 )
-SLOT=0
-SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=6365141a921798a3360710ac68339b90
diff --git a/metadata/md5-cache/www-client/firefox-10.0.1-r1 b/metadata/md5-cache/www-client/firefox-10.0.1-r1
deleted file mode 100644
index 7c22a74fe616..000000000000
--- a/metadata/md5-cache/www-client/firefox-10.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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 )
-SLOT=0
-SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=1043f96fb0bff7bda488b3cf682f38f7
diff --git a/metadata/md5-cache/www-client/firefox-10.0.4 b/metadata/md5-cache/www-client/firefox-10.0.4
new file mode 100644
index 000000000000..2ddab8d6bae4
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-10.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=3
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo 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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) 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 )
+SLOT=0
+SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/af.xpi -> firefox-10.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ak.xpi -> firefox-10.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> firefox-10.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/as.xpi -> firefox-10.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> firefox-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/be.xpi -> firefox-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> firefox-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/br.xpi -> firefox-10.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/bs.xpi -> firefox-10.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> firefox-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> firefox-10.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/csb.xpi -> firefox-10.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/cy.xpi -> firefox-10.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/da.xpi -> firefox-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/de.xpi -> firefox-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/el.xpi -> firefox-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eo.xpi -> firefox-10.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/et.xpi -> firefox-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> firefox-10.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fa.xpi -> firefox-10.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> firefox-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> firefox-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> firefox-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> firefox-10.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/he.xpi -> firefox-10.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hr.xpi -> firefox-10.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> firefox-10.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/id.xpi -> firefox-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/is.xpi -> firefox-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/it.xpi -> firefox-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> firefox-10.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kk.xpi -> firefox-10.0.4esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/kn.xpi -> firefox-10.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> firefox-10.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ku.xpi -> firefox-10.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lg.xpi -> firefox-10.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> firefox-10.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/lv.xpi -> firefox-10.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mai.xpi -> firefox-10.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mk.xpi -> firefox-10.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ml.xpi -> firefox-10.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/mr.xpi -> firefox-10.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> firefox-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/nso.xpi -> firefox-10.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/or.xpi -> firefox-10.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> firefox-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> firefox-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> firefox-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> firefox-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/si.xpi -> firefox-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> firefox-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> firefox-10.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/son.xpi -> firefox-10.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> firefox-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> firefox-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta.xpi -> firefox-10.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/te.xpi -> firefox-10.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/th.xpi -> firefox-10.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> firefox-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> firefox-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> firefox-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/xpi/zu.xpi -> firefox-10.0.4esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.7.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/source/firefox-10.0.4esr.source.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=4cb255a7636c901751d70c35b8002541
diff --git a/metadata/md5-cache/www-client/firefox-8.0 b/metadata/md5-cache/www-client/firefox-8.0
deleted file mode 100644
index a18766ed50fe..000000000000
--- a/metadata/md5-cache/www-client/firefox-8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy 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_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) 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 )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//8.0/source/firefox-8.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/af.xpi -> firefox-8.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ak.xpi -> firefox-8.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ar.xpi -> firefox-8.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ast.xpi -> firefox-8.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/be.xpi -> firefox-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bg.xpi -> firefox-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/br.xpi -> firefox-8.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bs.xpi -> firefox-8.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ca.xpi -> firefox-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cs.xpi -> firefox-8.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cy.xpi -> firefox-8.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/da.xpi -> firefox-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/de.xpi -> firefox-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/el.xpi -> firefox-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-GB.xpi -> firefox-8.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-ZA.xpi -> firefox-8.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eo.xpi -> firefox-8.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/et.xpi -> firefox-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eu.xpi -> firefox-8.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fa.xpi -> firefox-8.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fi.xpi -> firefox-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fr.xpi -> firefox-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gd.xpi -> firefox-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gl.xpi -> firefox-8.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/he.xpi -> firefox-8.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hr.xpi -> firefox-8.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hu.xpi -> firefox-8.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/id.xpi -> firefox-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/is.xpi -> firefox-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/it.xpi -> firefox-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ja.xpi -> firefox-8.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kk.xpi -> firefox-8.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kn.xpi -> firefox-8.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ko.xpi -> firefox-8.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ku.xpi -> firefox-8.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lg.xpi -> firefox-8.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lt.xpi -> firefox-8.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lv.xpi -> firefox-8.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mai.xpi -> firefox-8.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mk.xpi -> firefox-8.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ml.xpi -> firefox-8.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mr.xpi -> firefox-8.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nl.xpi -> firefox-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nso.xpi -> firefox-8.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/or.xpi -> firefox-8.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pl.xpi -> firefox-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/rm.xpi -> firefox-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ro.xpi -> firefox-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ru.xpi -> firefox-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/si.xpi -> firefox-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sk.xpi -> firefox-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sl.xpi -> firefox-8.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/son.xpi -> firefox-8.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sq.xpi -> firefox-8.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sr.xpi -> firefox-8.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta.xpi -> firefox-8.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta-LK.xpi -> firefox-8.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/te.xpi -> firefox-8.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/th.xpi -> firefox-8.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/tr.xpi -> firefox-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/uk.xpi -> firefox-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/vi.xpi -> firefox-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zu.xpi -> firefox-8.0-zu.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=1c1101ad2fd18b60ec00513e4949cb85
diff --git a/metadata/md5-cache/www-client/firefox-9.0 b/metadata/md5-cache/www-client/firefox-9.0
deleted file mode 100644
index 8764e2b3b9e9..000000000000
--- a/metadata/md5-cache/www-client/firefox-9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 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.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=3
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy 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_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) 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 )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//9.0/source/firefox-9.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/af.xpi -> firefox-9.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ak.xpi -> firefox-9.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ar.xpi -> firefox-9.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ast.xpi -> firefox-9.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/be.xpi -> firefox-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bg.xpi -> firefox-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/br.xpi -> firefox-9.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bs.xpi -> firefox-9.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ca.xpi -> firefox-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cs.xpi -> firefox-9.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cy.xpi -> firefox-9.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/da.xpi -> firefox-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/de.xpi -> firefox-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/el.xpi -> firefox-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-GB.xpi -> firefox-9.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-ZA.xpi -> firefox-9.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eo.xpi -> firefox-9.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/et.xpi -> firefox-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eu.xpi -> firefox-9.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fa.xpi -> firefox-9.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fi.xpi -> firefox-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fr.xpi -> firefox-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gd.xpi -> firefox-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gl.xpi -> firefox-9.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/he.xpi -> firefox-9.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hr.xpi -> firefox-9.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hu.xpi -> firefox-9.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/id.xpi -> firefox-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/is.xpi -> firefox-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/it.xpi -> firefox-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ja.xpi -> firefox-9.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kk.xpi -> firefox-9.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kn.xpi -> firefox-9.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ko.xpi -> firefox-9.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ku.xpi -> firefox-9.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lg.xpi -> firefox-9.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lt.xpi -> firefox-9.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lv.xpi -> firefox-9.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mai.xpi -> firefox-9.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mk.xpi -> firefox-9.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ml.xpi -> firefox-9.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mr.xpi -> firefox-9.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nl.xpi -> firefox-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nso.xpi -> firefox-9.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/or.xpi -> firefox-9.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pl.xpi -> firefox-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/rm.xpi -> firefox-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ro.xpi -> firefox-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ru.xpi -> firefox-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/si.xpi -> firefox-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sk.xpi -> firefox-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sl.xpi -> firefox-9.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/son.xpi -> firefox-9.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sq.xpi -> firefox-9.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sr.xpi -> firefox-9.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta.xpi -> firefox-9.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta-LK.xpi -> firefox-9.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/te.xpi -> firefox-9.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/th.xpi -> firefox-9.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/tr.xpi -> firefox-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/uk.xpi -> firefox-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/vi.xpi -> firefox-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zu.xpi -> firefox-9.0-zu.xpi )
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=a5b770d4409439409e357ff5b5a8b447
diff --git a/metadata/md5-cache/www-client/firefox-bin-10.0.4 b/metadata/md5-cache/www-client/firefox-bin-10.0.4
new file mode 100644
index 000000000000..dca084b2b901
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-10.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=4
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=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
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+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
+RESTRICT=strip mirror binchecks
+SLOT=0
+SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/af.xpi -> firefox-10.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ak.xpi -> firefox-10.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ar.xpi -> firefox-10.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/as.xpi -> firefox-10.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ast.xpi -> firefox-10.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/be.xpi -> firefox-10.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bg.xpi -> firefox-10.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/br.xpi -> firefox-10.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/bs.xpi -> firefox-10.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ca.xpi -> firefox-10.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/cs.xpi -> firefox-10.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/csb.xpi -> firefox-10.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/cy.xpi -> firefox-10.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/da.xpi -> firefox-10.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/de.xpi -> firefox-10.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/el.xpi -> firefox-10.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/eo.xpi -> firefox-10.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/et.xpi -> firefox-10.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/eu.xpi -> firefox-10.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fa.xpi -> firefox-10.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fi.xpi -> firefox-10.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fr.xpi -> firefox-10.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gd.xpi -> firefox-10.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gl.xpi -> firefox-10.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/he.xpi -> firefox-10.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hr.xpi -> firefox-10.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hu.xpi -> firefox-10.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/id.xpi -> firefox-10.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/is.xpi -> firefox-10.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/it.xpi -> firefox-10.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ja.xpi -> firefox-10.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/kk.xpi -> firefox-10.0.4esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/kn.xpi -> firefox-10.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ko.xpi -> firefox-10.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ku.xpi -> firefox-10.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lg.xpi -> firefox-10.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lt.xpi -> firefox-10.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/lv.xpi -> firefox-10.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mai.xpi -> firefox-10.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mk.xpi -> firefox-10.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ml.xpi -> firefox-10.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/mr.xpi -> firefox-10.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nl.xpi -> firefox-10.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/nso.xpi -> firefox-10.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/or.xpi -> firefox-10.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pl.xpi -> firefox-10.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/rm.xpi -> firefox-10.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ro.xpi -> firefox-10.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ru.xpi -> firefox-10.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/si.xpi -> firefox-10.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sk.xpi -> firefox-10.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sl.xpi -> firefox-10.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/son.xpi -> firefox-10.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sq.xpi -> firefox-10.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sr.xpi -> firefox-10.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ta.xpi -> firefox-10.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/te.xpi -> firefox-10.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/th.xpi -> firefox-10.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/tr.xpi -> firefox-10.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/uk.xpi -> firefox-10.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/vi.xpi -> firefox-10.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.4esr/linux-i686/xpi/zu.xpi -> firefox-10.0.4esr-zu.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.4esr/linux-x86_64/en-US/firefox-10.0.4esr.tar.bz2 -> firefox-bin_x86_64-10.0.4.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.4esr/linux-i686/en-US/firefox-10.0.4esr.tar.bz2 -> firefox-bin_i686-10.0.4.tar.bz2 )
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=ab6cd103e091e6749971409979060397
diff --git a/metadata/md5-cache/www-client/lynx-2.8.7_p1 b/metadata/md5-cache/www-client/lynx-2.8.7_p1
index c066fbc1984d..c57536a9b0ab 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.7_p1
+++ b/metadata/md5-cache/www-client/lynx-2.8.7_p1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) nls? ( sys-devel/gettext ) >=dev-util/pkgconfig-0.23
 DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=2
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? (
 SLOT=0
 SRC_URI=http://lynx.isc.org/current/lynx2.8.7rel.1.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a4af018e40eef64d11426cf01804de65
+_md5_=c9f9cd363b185358bd2141ffbaaa76d5
diff --git a/metadata/md5-cache/www-client/seamonkey-2.9 b/metadata/md5-cache/www-client/seamonkey-2.9
index 9c00d1648b5b..a53fcec68ca1 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.9
+++ b/metadata/md5-cache/www-client/seamonkey-2.9
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.2 >=dev-libs/nspr-4.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 ) 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 )
 SLOT=0
-SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/source/seamonkey-2.9.source.tar.bz2 -> seamonkey-2.9.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz )
+SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.be.langpack.xpi -> seamonkey-2.9-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ca.langpack.xpi -> seamonkey-2.9-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.cs.langpack.xpi -> seamonkey-2.9-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.de.langpack.xpi -> seamonkey-2.9-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.en-GB.langpack.xpi -> seamonkey-2.9-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-AR.langpack.xpi -> seamonkey-2.9-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.es-ES.langpack.xpi -> seamonkey-2.9-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fi.langpack.xpi -> seamonkey-2.9-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.fr.langpack.xpi -> seamonkey-2.9-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.gl.langpack.xpi -> seamonkey-2.9-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.hu.langpack.xpi -> seamonkey-2.9-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.it.langpack.xpi -> seamonkey-2.9-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ja.langpack.xpi -> seamonkey-2.9-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.lt.langpack.xpi -> seamonkey-2.9-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nb-NO.langpack.xpi -> seamonkey-2.9-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.nl.langpack.xpi -> seamonkey-2.9-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pl.langpack.xpi -> seamonkey-2.9-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.pt-PT.langpack.xpi -> seamonkey-2.9-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.ru.langpack.xpi -> seamonkey-2.9-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sk.langpack.xpi -> seamonkey-2.9-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.sv-SE.langpack.xpi -> seamonkey-2.9-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.tr.langpack.xpi -> seamonkey-2.9-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonkey-2.9.zh-CN.langpack.xpi -> seamonkey-2.9-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/source/seamonkey-2.9.source.tar.bz2 -> seamonkey-2.9.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	56b17379006865b42dcb9277b8178494	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	6695ecf00333c6acf870a802d3ceb9fd	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=38935351e42090296f097e62a43e822a
+_md5_=a4bd39360709823b29bb67a720eb688e
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
index 9ef14dce605b..9ce858d5eca8 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXfont || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/aut
 DESCRIPTION=X.Org bdftopcf application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXfont
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=de33016b0c9e88ad30c9c472d2ff5ab4
+_md5_=d510ca32ab97ec5990d9f5dca8127ba0
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.5 b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
new file mode 100644
index 000000000000..8e7b6bd222c8
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
+DESCRIPTION=generate BDF font from X font server
+EAPI=4
+HOMEPAGE=http://xorg.freedesktop.org/
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libFS
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
+_md5_=35f056bf54c9e1889e95fc6312a0e5fb
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
index bba5cf1a48f6..d068ecc24e14 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/
 DESCRIPTION=create an index of X font files in a directory
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-apps/mkfontscale
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=6faa69dab414affdd59ad1a9340a4409
+_md5_=1522896c0d4e454752107c5907f324bd
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0 b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
index 4db057e014d3..38809ee89b52 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.1.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libfontenc media-libs/freetype:2 x11-proto/xproto app-arch/gzip
 DESCRIPTION=create an index of scalable font files for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.1.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=1dd194fc8b45892242480a71f07aaa91
+_md5_=a1db8786a3160d8bfd72e26aa0f31979
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.7 b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
new file mode 100644
index 000000000000..c49eb7b0191e
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
+DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
+EAPI=4
+HOMEPAGE=http://xorg.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
+_md5_=5bc6d4c05a86b8c84f30af3d50ad5fc6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.10 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.14
similarity index 90%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.10
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.14
index 34fca981a53f..503987fcc90b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.10
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.14
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2cf2698881c6dc4cf00a40b53c57218a
+_md5_=5ca7bdada10df73a48119af769653e43
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.4 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.4
deleted file mode 100644
index b522bff5eacd..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox video driver
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=dri kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.4/VirtualBox-4.1.4.tar.bz2
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=df8aca1fe232c6f1b72651795c06b17b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.8 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.8
deleted file mode 100644
index 3937dc88ab85..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox video driver
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=dri kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.8/VirtualBox-4.1.8.tar.bz2
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=19b2ff7ef5a8c23284eb6978ab068c41
diff --git a/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 b/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
index 502b854b547a..e0ee2d47733d 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
+++ b/metadata/md5-cache/x11-libs/cairo-1.10.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=3
 HOMEPAGE=http://cairographics.org/
 IUSE=X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5b3c387b90afed72453dcfdfddfac979
+_md5_=731a08a973eab02cd1799d191a1468ca
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.0 b/metadata/md5-cache/x11-libs/cairo-1.12.0
index af5b4c3584ed..d67c3593734b 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.0
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=4
 HOMEPAGE=http://cairographics.org/
 IUSE=X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[openvg] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 REQUIRED_USE=drm? ( X ) gallium? ( drm )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.0.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2ea14cd9befa8be6bc6b47bc024bb964
+_md5_=bd2baf13cae7ff7630d8bb48e2fbf556
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8 b/metadata/md5-cache/x11-libs/libICE-1.0.8
index 6aec517b293d..6d836b8d67c1 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org ICE library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=174e798fe5b6897ac91512102ce2195a
+_md5_=ee34f0b6cef7e95e28bab78629cb09b4
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.1 b/metadata/md5-cache/x11-libs/libSM-1.2.1
index 2ea082ded8f0..41b75a7087f6 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org SM library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc ipv6 +uuid static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=4d1c7521b4f9591f4b4ffebde7ac90a0
+_md5_=a26cecf500ae25d9d2908ef5d607bd25
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.4 b/metadata/md5-cache/x11-libs/libX11-1.4.4
index d6e3df1cab76..810e835e5fef 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.4
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.4
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=31a8528b96f41a5cb087aacd20812a8e
+_md5_=5d50b7c5312ab01fa971c8ff25a29b1d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.4.99.901 b/metadata/md5-cache/x11-libs/libX11-1.4.99.901
index ed2dd283c667..aad522126581 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.4.99.901
+++ b/metadata/md5-cache/x11-libs/libX11-1.4.99.901
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X11 library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 test static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.1.92 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.4.99.901.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=9f70bede96c2634c1135c2bedce84588
+_md5_=f5b8c2a7e841dec5595fda93539976fe
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
index 4e6d44e8be39..cfaa62e75d49 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XScrnSaver library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=996a0fb384e7ac3da0b7b4b83bee9228
+_md5_=c2aae2ab5db8db09857c3e8dea8ceddc
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.7 b/metadata/md5-cache/x11-libs/libXau-1.0.7
index a7c5adbedb73..6933cdf881a1 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xau library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=74ae2f762dc72e217accbc308189d504
+_md5_=76f8aa1a60f22036933de23b20ccd014
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.10 b/metadata/md5-cache/x11-libs/libXaw-1.0.10
index 3c04f7a60822..41b9bb686dce 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.10
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.10.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=ff53c4eddb1ab434a7d44ee4c9c12fcc
+_md5_=9fe4edaf818bf0db9d16b07c8f5f346b
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
index 622754c9f102..44e40227b0e0 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xdmcp library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=10faabbbbe7262d34cae3ed84b0bb065
+_md5_=01d9fa7359394f0257d8204e64c407ee
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.1 b/metadata/md5-cache/x11-libs/libXext-1.3.1
index 285586341327..05f7e5af43de 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xext library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=36e35cecff155820eba8c7b8d32ed291
+_md5_=b577fed64d26b7695880aeeae6377c37
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5 b/metadata/md5-cache/x11-libs/libXfont-1.4.5
index 82633b7569b4..836e5e038db6 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=332a565d4d045d170520a743677cb3c0
+_md5_=e1c9db32a79c3d91153e6f1e7ab55e79
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1 b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
index 7847a0b9a001..029d6b0f1d46 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xft library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=232627492f24cd53c9c99e9f4dc916b7
+_md5_=021cb477e36408168bd7b8b37578acde
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1
index 14f05ad1bfe6..42235a51064c 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xmu library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=543077c07d97bab9e712c536d149d4d5
+_md5_=a747641e503a307adbdd4952e46b8215
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10 b/metadata/md5-cache/x11-libs/libXpm-3.5.10
index d5b9f2cc53c0..383fb8368ad7 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xpm library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=a26899ae16a31d2412f13f2c141a2241
+_md5_=02edf144111a554e2fab41d0deb1ba40
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.7 b/metadata/md5-cache/x11-libs/libXrender-0.9.7
index e1697dd6838f..530f2663130f 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.7
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xrender library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=10afe6b245007a08881733a8baa63d60
+_md5_=509e88d5cffe6f9bef4711f988e270da
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.3 b/metadata/md5-cache/x11-libs/libXt-1.1.3
index a5ca91aa50d8..d99c1a7ec9eb 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xt library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=834b32f6ba2e6f38bbf3aebeedf2bbea
+_md5_=fb5213b77d9e9056fa32c14472e30106
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
index 3d07e35a290f..f642c02bf5a3 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org fontenc library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=sys-libs/zlib x11-proto/xproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=541f47551b686e05d60c9c9dea61108e
+_md5_=56715fcca75b36702b8c667d4815cd48
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/metadata/md5-cache/x11-libs/libxcb-1.8.1
index 8cead184b5a5..52e475d45ff1 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.8.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings library
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=selinux static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=b384c048a5683e10713de3340020cfbd
+_md5_=f96897d33a7ec970b3de3c04aeba9b16
diff --git a/metadata/md5-cache/x11-libs/pixman-0.24.4 b/metadata/md5-cache/x11-libs/pixman-0.24.4
index 5d183ea06fb0..5f56e0d9fc0f 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.24.4
+++ b/metadata/md5-cache/x11-libs/pixman-0.24.4
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=altivec iwmmxt mmx neon sse2 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.24.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=b3c1bdfb4d3995af9bd5aacd4ba311a8
+_md5_=1bc718ce1af6a1a247a3780fdd96c301
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
index 1440a263a3fb..4e2a2ffadfaa 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 PDEPEND=>=x11-libs/xcb-util-image-0.3.8 >=x11-libs/xcb-util-keysyms-0.3.8 >=x11-libs/xcb-util-renderutil-0.3.8 >=x11-libs/xcb-util-wm-0.3.8
 RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=f28612d19a749a5bfc7ea0d6e7a1d793
+_md5_=55286b380427fef99c3842d4bbda0c06
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
index 9b5d930265ad..e0031d86fbf5 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=1c9b09a1aa0b69b2aaffa2b8f4ed8394
+_md5_=fdd094b52208a38b53aa095fccb0ee0f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
index 381f67d6c2c9..6cd70537dc52 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=bba85c9fcd08a12a76efde0b30e000cc
+_md5_=b3d3c128e1cfaa3a0e23e6374965517f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
index b44113777a8e..cced116c82a5 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=a5e3b0dc2f6976fab946d3c511b824d4
+_md5_=c0af3a9c6ff50cfc064ff296f33bc73e
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
index 1ba65ecb415b..40ca4259c06a 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test static-libs doc
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.8 x11-proto/xcb-proto x11-proto/xproto
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.8.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=678797de2cfef19b5789c02c651ca942
+_md5_=bc7db82c2913fd20052b5a8991afe366
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.7 b/metadata/md5-cache/x11-libs/xtrans-1.2.7
index 73fa7d75b33f..deaf2b018236 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.7
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.7
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xtrans library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=920aa7bf8ee0dd43e7b275d5fe1a6793
+_md5_=f34d19ecd3e76265f91e5f8b92f128eb
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.17 b/metadata/md5-cache/x11-misc/util-macros-1.17
index 1a17f4c21bab..0af85c0dbf5e 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.17
+++ b/metadata/md5-cache/x11-misc/util-macros-1.17
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=X.Org autotools utility macros
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=b5a728e43224e6d0e2fce82c97f175cc
+_md5_=88205430675ef2e839679d56c9b1c4e1
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.2 b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
index ccc8c3053316..4df495f5033e 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org Fonts protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=6e292ed2913f7bb6c66e4a402091afff
+_md5_=86e8431dfc47b27cdabf91244e9956e5
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.2 b/metadata/md5-cache/x11-proto/inputproto-2.2
index dd9c5845a298..8f221d3a0539 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.2
@@ -3,9 +3,9 @@ DEPEND=!<x11-libs/libXi-1.2.99 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-dev
 DESCRIPTION=X.Org Input protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=d16be03d71b69e05adeb3b40145ca9a5
+_md5_=54b16353bf510d4bc1e11c062fa71717
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6 b/metadata/md5-cache/x11-proto/kbproto-1.0.6
index 4a1c76ea6e57..058d07804bf2 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=X.Org KB protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=f94d03a7fab6f81ca497ac5ed87814cc
+_md5_=316b43f743ced791fef2dfe06bdcfe15
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1 b/metadata/md5-cache/x11-proto/renderproto-0.11.1
index f77883bb9c89..526cd6397d5d 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=X.Org Render protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=e556be848788b2813a4863bf26269779
+_md5_=ffa084373404b89447a884398ee3d61d
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
index d23e44d97451..202a369f67b7 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org ScrnSaver protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=f7c33228413c464c4a23c8e49b3ab1fb
+_md5_=6373d4a3edcac0cfce7dfb0edf524350
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
index 3f489a4c0c5b..783022b0048a 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.7.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 )
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=583b8acb7ccddfdd2034c185d077fa87
+_md5_=cc9daf1521f22718093c40af29868bed
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1
index 8f726198e5fb..7ad0f8cdc827 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XExt protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=d50196a10a74ae79eca6a364db87473d
+_md5_=f5de3c4d6b7b21d3958a8a44b1b28408
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
index 1ed217433021..1b5c89d11fe9 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=X.Org XF86BigFont protocol headers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=dbd4fdac66079a0bbec3024bab66d94b
+_md5_=fee1f268522e4b8c521ebcad5ccadc15
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23 b/metadata/md5-cache/x11-proto/xproto-7.0.23
index 0366fddc4460..54a73cf482ca 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xproto protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	3a8bdddbfe71c4023df8cf5945dd2c54
-_md5_=3e0e5947afcf0af5f14de5aba2b737db
+_md5_=99c3e65647413cc478b01c9a5e789c45
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15 b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15
new file mode 100644
index 000000000000..c70dbe3ad6be
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtcurve-1.8.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=x11-libs/gtk+:2 dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A set of widget styles for GTK2 based apps, also available for Qt4/KDE4
+EAPI=4
+HOMEPAGE=http://www.kde-look.org/content/show.php?content=40492
+IUSE=mozilla
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 mozilla? ( || ( >=www-client/firefox-3.0 >=www-client/firefox-bin-3.0 >=www-client/icecat-3.0 ) )
+SLOT=0
+SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-1.8.15.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=07ca29937b97931e6a0e35658c88d748
diff --git a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12 b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12
new file mode 100644
index 000000000000..acb86f105172
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+DESCRIPTION=A set of widget styles for Qt4 based apps, also available for GTK2
+EAPI=4
+HOMEPAGE=http://www.kde-look.org/content/show.php?content=40492
+IUSE=kde windeco aqua kde
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+REQUIRED_USE=windeco? ( kde )
+SLOT=0
+SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-KDE4-1.8.12.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	kde4-base	3924a969e2ee84757f8a3f6dd8dc2d8c	kde4-functions	3fc7b5d60204b49948f87741ba8cea55	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=ef78802b56a4428048057f8ef94dbfdd
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 546e265a6525..e152c30da7d4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Apr 2012 16:37:01 +0000
+Fri, 27 Apr 2012 05:37:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c15778aefb35..aae93db58e3c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 26 16:36:59 UTC 2012
+Fri Apr 27 05:36:58 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 926813772952..408dfdc03e3d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Apr 2012 17:00:01 +0000
+Fri, 27 Apr 2012 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 28abcfac9421..af44e595a8f2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1335458101 Thu Apr 26 16:35:01 2012 UTC
+1335504901 Fri Apr 27 05:35:01 2012 UTC
diff --git a/net-analyzer/bsnmp/Manifest b/net-analyzer/bsnmp/Manifest
index ee06b6d7e267..7d4151a94462 100644
--- a/net-analyzer/bsnmp/Manifest
+++ b/net-analyzer/bsnmp/Manifest
@@ -1 +1,2 @@
 DIST bsnmp-1.11a.tar.gz 408165 RMD160 ab1e423450cab9f1268f3e5346b223c806f1c10c SHA1 8af663b69c7942a62334d8151563c3577f0cef25 SHA256 72d74b12742b153ac9c0bb4deb86bda6fc982eb41c775cc6fd7f343924b887f8
+DIST bsnmp-1.12.tar.gz 418653 RMD160 d7ea4c2c07870f42073f7e758abbd6dfe4afefc9 SHA1 9a028c7f66a59fb6ac3293e67810abf27cbcaa6a SHA256 986d02d71c55693ec0b90b24564cb43195ce03254e85a8cd70457b318eefbee0
diff --git a/net-analyzer/bsnmp/bsnmp-1.12.ebuild b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
new file mode 100644
index 000000000000..1ed6f3497d4e
--- /dev/null
+++ b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bsnmp/bsnmp-1.12.ebuild,v 1.1 2012/04/26 17:50:56 aballier Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Mini-SNMP Daemon and Library"
+HOMEPAGE="http://people.freebsd.org/~harti/"
+SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+IUSE="tcpd"
+
+DEPEND="dev-libs/libbegemot
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
+	epatch "${FILESDIR}/werror.patch"
+}
+
+src_compile() {
+	if use elibc_glibc; then
+		# bsnmp is bsd-based, without this it will fail
+		append-flags "-D_BSD_SOURCE"
+	fi
+
+	filter-flags -fno-inline
+
+	econf \
+		--with-libbegemot=/usr \
+		$(use_with tcpd tcpwrappers) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+}
diff --git a/net-analyzer/bsnmp/files/werror.patch b/net-analyzer/bsnmp/files/werror.patch
new file mode 100644
index 000000000000..7a0968e84441
--- /dev/null
+++ b/net-analyzer/bsnmp/files/werror.patch
@@ -0,0 +1,11 @@
+--- bsnmp-1.12/config/Makefile.pre.old	2012-04-26 10:45:58.000000000 -0400
++++ bsnmp-1.12/config/Makefile.pre	2012-04-26 10:46:11.000000000 -0400
+@@ -53,7 +53,7 @@
+ # Assume a Posix-ish make that passes MAKEFLAGS in the environment.
+ SUBMAKE= $(MAKE) --no-print-directory
+ 
+-WARNS=	-Wsystem-headers -Werror -Wall -Wno-format-y2k -W	\
++WARNS=	-Wsystem-headers -Wall -Wno-format-y2k -W		\
+ 	-Wstrict-prototypes -Wmissing-prototypes		\
+ 	-Wpointer-arith -Wreturn-type -Wcast-qual		\
+ 	-Wwrite-strings -Wswitch -Wshadow -Wcast-align		\
diff --git a/net-dns/c-ares/c-ares-1.7.5.ebuild b/net-dns/c-ares/c-ares-1.7.5.ebuild
index 05fa256f1be3..d2f481bb10d0 100644
--- a/net-dns/c-ares/c-ares-1.7.5.ebuild
+++ b/net-dns/c-ares/c-ares-1.7.5.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/net-dns/c-ares/c-ares-1.7.5.ebuild,v 1.1 2011/08/21 11:23:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.7.5.ebuild,v 1.2 2012/04/26 17:21:13 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
diff --git a/net-dns/libidn/libidn-1.24.ebuild b/net-dns/libidn/libidn-1.24.ebuild
index 7d91a08c8ede..0f75447f6b6c 100644
--- a/net-dns/libidn/libidn-1.24.ebuild
+++ b/net-dns/libidn/libidn-1.24.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/net-dns/libidn/libidn-1.24.ebuild,v 1.10 2012/04/01 16:14:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.24.ebuild,v 1.11 2012/04/26 17:03:44 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
index 7152eb14043c..079507e9902a 100644
--- a/net-im/centerim/centerim-4.22.10.ebuild
+++ b/net-im/centerim/centerim-4.22.10.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/net-im/centerim/centerim-4.22.10.ebuild,v 1.3 2011/11/04 18:34:59 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.10.ebuild,v 1.4 2012/04/26 21:53:24 swegener Exp $
 
 EAPI="2"
 
@@ -34,6 +34,7 @@ DEPEND=">=sys-libs/ncurses-5.2
 	)
 	msn? (
 		|| (
+			>=net-misc/curl-7.25.0-r1[ssl]
 			>=net-misc/curl-7.19.6[ssl]
 			>=net-misc/curl-7.19.6[gnutls]
 			>=net-misc/curl-7.19.6[nss]
@@ -41,6 +42,7 @@ DEPEND=">=sys-libs/ncurses-5.2
 	)
 	yahoo? (
 		|| (
+			>=net-misc/curl-7.25.0-r1[ssl]
 			>=net-misc/curl-7.19.6[ssl]
 			>=net-misc/curl-7.19.6[gnutls]
 			>=net-misc/curl-7.19.6[nss]
diff --git a/net-im/centerim/centerim-4.22.9.ebuild b/net-im/centerim/centerim-4.22.9.ebuild
index dfc47cdf0076..d1841b2796af 100644
--- a/net-im/centerim/centerim-4.22.9.ebuild
+++ b/net-im/centerim/centerim-4.22.9.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/net-im/centerim/centerim-4.22.9.ebuild,v 1.4 2011/02/26 19:41:09 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.9.ebuild,v 1.5 2012/04/26 21:53:24 swegener Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ DEPEND=">=sys-libs/ncurses-5.2
 	)
 	msn? (
 		|| (
+			>=net-misc/curl-7.25.0-r1[ssl]
 			>=net-misc/curl-7.19.6[ssl]
 			>=net-misc/curl-7.19.6[gnutls]
 			>=net-misc/curl-7.19.6[nss]
@@ -36,6 +37,7 @@ DEPEND=">=sys-libs/ncurses-5.2
 	)
 	yahoo? (
 		|| (
+			>=net-misc/curl-7.25.0-r1[ssl]
 			>=net-misc/curl-7.19.6[ssl]
 			>=net-misc/curl-7.19.6[gnutls]
 			>=net-misc/curl-7.19.6[nss]
diff --git a/net-libs/libssh2/libssh2-1.4.1.ebuild b/net-libs/libssh2/libssh2-1.4.1.ebuild
index b90f34a52948..134764ce433c 100644
--- a/net-libs/libssh2/libssh2-1.4.1.ebuild
+++ b/net-libs/libssh2/libssh2-1.4.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/net-libs/libssh2/libssh2-1.4.1.ebuild,v 1.1 2012/04/04 22:22:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.4.1.ebuild,v 1.2 2012/04/26 17:29:40 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-solaris"
 IUSE="gcrypt static-libs test zlib"
 
 DEPEND="!gcrypt? ( dev-libs/openssl )
diff --git a/net-print/cups/cups-1.5.2-r3.ebuild b/net-print/cups/cups-1.5.2-r20.ebuild
similarity index 98%
rename from net-print/cups/cups-1.5.2-r3.ebuild
rename to net-print/cups/cups-1.5.2-r20.ebuild
index cc8f978004c0..4c0b15848c42 100644
--- a/net-print/cups/cups-1.5.2-r3.ebuild
+++ b/net-print/cups/cups-1.5.2-r20.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/net-print/cups/cups-1.5.2-r3.ebuild,v 1.5 2012/04/26 12:15:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $
 
 EAPI=4
 
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
new file mode 100644
index 000000000000..3a50c8d47f76
--- /dev/null
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+
+MY_P=${P/_}
+MY_PV=${PV/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
+	+png python slp +ssl static-libs +threads +tiff usb X xinetd"
+
+LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	jpeg? ( virtual/jpeg:0 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap[ssl?,gnutls?] )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.4.3:0 )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	>=app-text/poppler-0.12.3-r3[utils]
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# various build time fixes
+	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads.patch"
+	epatch "${FILESDIR}/${PN}-1.5.2-threads2.patch"
+
+	# revert ipp backend to 1.4 state, as ubuntu and debian
+	epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"
+
+	# avahi support from debian
+	epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"
+
+	# browsing off by default
+	epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# locale support
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=none
+	fi
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-pdftops=/usr/bin/pdftops \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable tiff) \
+		$(use_enable usb libusb) \
+		$(use_with java) \
+		$(use_with perl) \
+		--without-php \
+		$(use_with python) \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--disable-dnssd \
+		${myconf}
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
+}
+
+src_compile() {
+	emake
+
+	if use perl ; then
+		cd "${S}"/scripting/perl
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	if use perl ; then
+		pushd scripting/perl > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+	elog "Network browsing for printers is now switched off by default in the config file."
+	elog "To (re-)enable it, edit /etc/cupsd.conf and set \"Browsing On\", "
+	elog "afterwards re-start or reload cups."
+	echo
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-proxy/dante/dante-1.3.2.ebuild b/net-proxy/dante/dante-1.3.2.ebuild
index 4bc5ff158446..994b1d59e725 100644
--- a/net-proxy/dante/dante-1.3.2.ebuild
+++ b/net-proxy/dante/dante-1.3.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/net-proxy/dante/dante-1.3.2.ebuild,v 1.3 2012/03/13 12:07:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.2.ebuild,v 1.4 2012/04/26 16:53:40 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug kerberos pam selinux static-libs tcpd"
 
 RDEPEND="pam? ( virtual/pam )
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.3.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.3.ebuild
index 66ac5553c359..0e704267c59f 100644
--- a/net-wireless/bluez-hcidump/bluez-hcidump-2.3.ebuild
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-2.3.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/net-wireless/bluez-hcidump/bluez-hcidump-2.3.ebuild,v 1.4 2012/04/11 21:50:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/bluez-hcidump-2.3.ebuild,v 1.5 2012/04/26 20:24:00 vapier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 ~arm hppa ~ppc x86"
 IUSE=""
 
 RDEPEND=">=net-wireless/bluez-4.98"
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.4.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.4.ebuild
index 5d33109a942e..4649a85fd101 100644
--- a/net-wireless/bluez-hcidump/bluez-hcidump-2.4.ebuild
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-2.4.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/net-wireless/bluez-hcidump/bluez-hcidump-2.4.ebuild,v 1.1 2012/04/26 11:05:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/bluez-hcidump-2.4.ebuild,v 1.2 2012/04/26 20:24:00 vapier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=net-wireless/bluez-4.98"
diff --git a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild
index 8b12d32d8bdf..8b516926b0a4 100644
--- a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild
+++ b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.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/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild,v 1.1 2012/02/21 19:26:12 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.49.0.ebuild,v 1.2 2012/04/26 19:57:29 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-Level Interface to bzip2 compression library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-arch/bzip2"
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.0.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.0.ebuild
index 449f8f48ef23..47dcee66ac72 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.0.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.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/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.0.ebuild,v 1.1 2012/02/21 19:30:33 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.49.0.ebuild,v 1.2 2012/04/26 19:58:39 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit multilib perl-module
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.5"
diff --git a/perl-core/IO-Compress/IO-Compress-2.49.0.ebuild b/perl-core/IO-Compress/IO-Compress-2.49.0.ebuild
index dc73505ce1ab..5bd0ad36d077 100644
--- a/perl-core/IO-Compress/IO-Compress-2.49.0.ebuild
+++ b/perl-core/IO-Compress/IO-Compress-2.49.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/perl-core/IO-Compress/IO-Compress-2.49.0.ebuild,v 1.1 2012/02/21 19:32:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/IO-Compress/IO-Compress-2.49.0.ebuild,v 1.2 2012/04/26 19:59:44 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="allow reading and writing of compressed data"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-Scalar-List-Utils
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.0.ebuild
index ae3afbf01ea3..323c9baf511b 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.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/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.0.ebuild,v 1.1 2012/03/30 14:04:48 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.250.0.ebuild,v 1.2 2012/04/26 19:56:36 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
index 0f59561d9011..7ff931462cef 100644
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -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/profiles/arch/amd64-fbsd/make.defaults,v 1.5 2011/10/14 22:52:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v 1.6 2012/04/26 20:23:10 aballier Exp $
 # System-wide defaults for the G/FBSD Portage system
 
 ARCH="amd64-fbsd"
@@ -18,6 +18,8 @@ ABI="amd64_fbsd"
 CFLAGS_x86_fbsd="-m32"
 LDFLAGS_x86_fbsd="-m elf_i386_fbsd"
 
+USE="mmx sse sse2"
+
 VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
 	neomagic nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
 	sisusb tga trident tseng via vmware"
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 26af5715f38a..40112435cea4 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -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/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.46 2012/04/26 16:19:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.114 2012/04/26 22:41:48 aballier Exp $
 
 # Mask useflags that require deps with missing keywords.
 # Anyone is allowed and _very welcome_ to add masks there.
@@ -15,18 +15,8 @@
 # net-dns/hesiod
 sys-freebsd/freebsd-lib hesiod
 
-# sys-power/iasl
-sys-freebsd/freebsd-usbin acpi
-
-# net-analyzer/bsnmp
-sys-freebsd/freebsd-sbin atm
-
-# virtual/fam
-dev-libs/glib fam
-# dev-libs/libxslt
 # dev-util/gdbus-codegen
 # dev-util/gtk-doc
-# app-text/docbook-xml-dtd
 dev-libs/glib doc
 # sys-devel/gdb
 # dev-util/gdbus-codegen
@@ -35,62 +25,32 @@ dev-libs/glib test
 # dev-util/gdbus-codegen
 dev-libs/glib utils
 
-# dev-scheme/guile
-net-libs/gnutls guile
-
-# app-crypt/p11-kit
-net-libs/gnutls pkcs11
-
 # app-misc/datefudge
 net-libs/gnutls test
 
 # dev-util/gtk-doc
 net-libs/gnutls doc
+x11-libs/cairo doc
+dev-libs/gobject-introspection doc
 
 # net-libs/axTLS
 net-misc/curl curl_ssl_axtls
 
-# dev-libs/nss
-net-misc/curl curl_ssl_nss
-
-# net-dns/libidn
-net-misc/wget idn
-net-misc/curl idn
-
-# net-dns/c-ares
-net-misc/curl ares
-
-# net-libs/libssh2
-net-misc/curl ssh
-
 # net-nds/openldap
 net-misc/curl ldap
 
-# app-vim/pam-syntax
-sys-auth/openpam vim-syntax
-
 # sys-auth/pam_ssh
 sys-auth/pambase pam_ssh
 
 # gnome-base/gnome-keyring
 sys-auth/pambase gnome-keyring
 
-# sys-auth/pam_mktemp
-sys-auth/pambase mktemp
-
 # sys-auth/pam_krb5
 sys-auth/pambase pam_krb5
 
-# dev-python/docutils
-app-admin/eselect doc
-
-# app-text/xmlto app-text/docbook-xml-dtd-4.4
-sys-apps/portage doc
-# dev-python/epydoc
-sys-apps/portage epydoc
-
 # dev-libs/icu
 dev-libs/libxml2 icu
+dev-db/sqlite icu
 
 # dev-vcs/git
 sys-devel/gettext git
@@ -101,31 +61,89 @@ sys-devel/gettext java
 # app-emacs/po-mode
 sys-devel/gettext emacs
 
-# sys-devel/autogen
-sys-devel/gcc test
-# dev-libs/cloog-ppl dev-libs/ppl
-sys-devel/gcc graphite
+# virtual/emacs
+dev-scheme/guile emacs
+dev-util/cscope emacs
+net-dns/libidn emacs
+dev-util/cmake emacs
+
+# dev-lang/mono
+net-dns/libidn mono
 
-# dev-lang/tk dev-tcltk/blt
+# =dev-lang/python-2*[tk]
+dev-python/epydoc X
+
+# dev-tcltk/blt
 dev-lang/python tk
-# dev-db/sqlite:3
-dev-lang/python sqlite
 # dev-python/sphinx dev-python/python-docs:SLOT
 dev-lang/python doc
 
 # app-emacs/autoconf-mode
 sys-devel/autoconf emacs
 
-# x11-libs/libX11
-# x11-libs/libXt
-# x11-libs/libXmu
-# x11-libs/libXaw
-# x11-libs/libSM
-# x11-libs/libICE
-sys-apps/groff X
-
 # dev-libs/libnl:1.1
 net-libs/libpcap libnl
 
 # net-libs/libtirpc
 sys-apps/xinetd rpc
+
+# app-text/passivetex
+# dev-tex/xmltex
+app-text/xmlto latex
+
+# app-text/docbook-sgml-utils[jadetex]
+media-libs/fontconfig doc
+
+# virtual/latex-base
+# dev-texlive/texlive-latexextra
+dev-python/epydoc latex
+
+# media-gfx/graphviz
+app-text/asciidoc graphviz
+app-doc/doxygen dot
+dev-util/cppunit doc
+
+# sci-mathematics/glpk
+dev-libs/ppl lpsol
+
+# media-gfx/fontforge
+media-fonts/dejavu fontforge
+
+# x11-libs/qt-gui
+dev-util/cmake qt4
+app-text/poppler qt4
+app-doc/doxygen qt4
+x11-libs/cairo qt4
+
+# x11-base/xorg-server[xvfb]
+# x11-apps/xhost
+dev-util/cmake test
+
+# x11-libs/pango
+media-gfx/graphviz cairo
+
+# x11-libs/pango
+# x11-libs/gtk+:2
+media-gfx/graphviz gtk
+
+# media-libs/lasi
+media-gfx/graphviz lasi
+
+# net-print/cups
+app-text/ghostscript-gpl cups
+
+# x11-libs/gtk+:2
+app-text/ghostscript-gpl gtk
+
+# sys-apps/dbus
+app-text/ghostscript-gpl dbus
+
+# virtual/opengl
+# media-libs/freeglut
+media-libs/jasper opengl
+
+# virtual/opengl
+x11-libs/cairo opengl
+
+# app-text/texlive[extra]
+app-doc/doxygen latex
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index eeb1ea0f0b1e..602a3121a88b 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -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/profiles/prefix/package.mask,v 1.102 2012/04/24 18:02:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.103 2012/04/26 19:14:25 grobian Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked.  This file is for
@@ -16,6 +16,7 @@
 # supported.  A second attempt always succeeds.  The problem does not
 # occur with python 2.7.2.  http://bugs.python.org/issue14662
 =dev-lang/python-2.7.3
+=dev-lang/python-2.7.3-r1
 
 # Jeremy Olexa <darkside@gentoo.org> (28 Oct 2011)
 # Masking selective games-*, www-apps/*, net-proxy/* packages because:
diff --git a/profiles/uclibc/package.mask b/profiles/uclibc/package.mask
index 6f5096e96cd2..ecda1645a489 100644
--- a/profiles/uclibc/package.mask
+++ b/profiles/uclibc/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.mask,v 1.21 2011/08/09 02:18:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.mask,v 1.22 2012/04/27 00:54:23 vapier Exp $
 
 # glib-2.x requires working locale/iconv which
 # isn't available atm in uclibc
@@ -21,5 +21,3 @@ dev-libs/libiconv
 
 # requires funcs we dont yet provide
 >=sys-fs/xfsprogs-2.8.10
-
->sys-fs/udev-141
diff --git a/sci-astronomy/sextractor/Manifest b/sci-astronomy/sextractor/Manifest
index f42077f76359..90ce65ca32e0 100644
--- a/sci-astronomy/sextractor/Manifest
+++ b/sci-astronomy/sextractor/Manifest
@@ -1,2 +1 @@
-DIST sextractor-2.5.0.tar.gz 2321708 RMD160 336e3a47f57416ad50bbbdd2afb4ff7e858556d0 SHA1 84e111ea0796428d9336de7add3820575fd7d4cb SHA256 786f987818546d9b72fea7e786f040b63e31fbc46325deb58929251065573303
 DIST sextractor-2.8.6.tar.gz 3994622 RMD160 98319c54ab3af0d4a91c3ffa70e7d5148b06d67a SHA1 103ac2d51d9bae9fcbc5dda3031d82cd127f8250 SHA256 dde34594c2a1324f0951272e404e55d0d4cb0607f8ea18a61f2563bb67f494ac
diff --git a/sci-astronomy/sextractor/metadata.xml b/sci-astronomy/sextractor/metadata.xml
index 8b8931e595ae..b2219a08d147 100644
--- a/sci-astronomy/sextractor/metadata.xml
+++ b/sci-astronomy/sextractor/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+	<herd>sci-astronomy</herd>
+	<longdescription lang="en">
   SExtractor (Source Extractor) is a program that builds a catalogue of
   objects from an astronomical image. Although it is particularly
   oriented towards reduction of large scale galaxy-survey data, it
diff --git a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild b/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
deleted file mode 100644
index c9eb4cdf10d7..000000000000
--- a/sci-astronomy/sextractor/sextractor-2.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.5.0.ebuild,v 1.1 2009/02/17 20:44:23 bicatali Exp $
-
-EAPI=2
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
-HOMEPAGE="http://terapix.iap.fr/soft/sextractor"
-SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	CONFDIR=/usr/share/${PN}/config
-	# change default configuration files location from current dir
-	sed -i -e "s:default\.:${CONFDIR}/default\.:" src/preflist.h || die
-	# buggy with >= O2
-	replace-flags -O[2-9] -O1
-	local myconf
-	[[ "$(tc-getCC)" == "icc" ]] & myconf="${myconf} --enable-icc"
-	econf "${myconf}" || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
-	insinto ${CONFDIR}
-	doins config/* || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*
-	fi
-}
-
-pkg_postinst() {
-	elog "SExtractor configuration files are located"
-	elog "in ${CONFDIR} and loaded by default."
-}
diff --git a/sci-astronomy/sextractor/sextractor-2.8.6.ebuild b/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
index 53d04ec30f47..67385ef0e175 100644
--- a/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
+++ b/sci-astronomy/sextractor/sextractor-2.8.6.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.8.6.ebuild,v 1.1 2009/07/28 17:39:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/sextractor/sextractor-2.8.6.ebuild,v 1.2 2012/04/26 16:35:34 jlec Exp $
 
-EAPI=2
-inherit eutils autotools
+EAPI=4
 
-DESCRIPTION="Extract catalogs of sources from astronomical FITS images."
-HOMEPAGE="http://astromatic.iap.fr/software/sextractor"
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Extract catalogs of sources from astronomical FITS images"
+HOMEPAGE="http://astromatic.iap.fr/software/sextractor/"
 SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
@@ -14,36 +17,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc threads"
 
-RDEPEND="virtual/cblas
-	>=sci-libs/lapack-atlas-3.8.0
+RDEPEND="
+	virtual/cblas
+	sci-libs/lapack-atlas
 	sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-configure.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-configure.patch
 	# gentoo uses cblas instead of ptcblas (linked to threaded with eselect)
-	sed -i \
+	sed \
 		-e 's/ptcblas/cblas/g' \
-		acx_atlas.m4 || die "sed acx_atlas.m4 failed"
-	eautoreconf
+		-i acx_atlas.m4 || die "sed acx_atlas.m4 failed"
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		--with-atlas="/usr/$(get_libdir)/lapack/atlas" \
+	local myeconfargs=(
+		--with-atlas="/usr/$(get_libdir)/lapack/atlas"
 		$(use_enable threads)
+		)
+	autotools-utils_src_configure
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog HISTORY README THANKS
-	CONFDIR=/usr/share/sextractor
-	insinto ${CONFDIR}
-	doins config/* || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/* || die
-	fi
+	autotools-utils_src_install
+
+	insinto /usr/share/sextractor
+	doins config/*
+
+	use doc && dodoc doc/*
 }
 
 pkg_postinst() {
diff --git a/sci-biology/bamtools/bamtools-1.0.2.ebuild b/sci-biology/bamtools/bamtools-1.0.2.ebuild
index f7c3bddc8bfc..d0d94534dbdf 100644
--- a/sci-biology/bamtools/bamtools-1.0.2.ebuild
+++ b/sci-biology/bamtools/bamtools-1.0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/bamtools-1.0.2.ebuild,v 1.2 2012/04/23 20:33:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/bamtools/bamtools-1.0.2.ebuild,v 1.3 2012/04/26 16:44:38 jlec Exp $
 
 EAPI=4
 
 inherit cmake-utils
 
-DESCRIPTION="BamTools provides both a programmer's API and an end-user's toolkit for handling BAM files."
+DESCRIPTION="A programmer's API and an end-user's toolkit for handling BAM files"
 HOMEPAGE="https://github.com/pezmaster31/bamtools"
 SRC_URI="mirror://github/pezmaster31/bamtools/"${P}".tar.gz"
 
@@ -23,11 +23,11 @@ src_install() {
 		TMPDIR="$(pwd)" scanelf -Xr $i || die
 	done
 
-	dobin bin/bamtools || die
-	dolib lib/* || die
-	insinto /usr/include/bamtools/api || die
-	doins include/api/* || die
-	insinto /usr/include/bamtools/shared || die
+	dobin bin/bamtools
+	dolib lib/*
+	insinto /usr/include/bamtools/api
+	doins include/api/*
+	insinto /usr/include/bamtools/shared
 	doins include/shared/*
-	dodoc README || die
+	dodoc README
 }
diff --git a/sci-biology/emboss/emboss-6.1.0.ebuild b/sci-biology/emboss/emboss-6.1.0.ebuild
deleted file mode 100644
index 012f5c43628a..000000000000
--- a/sci-biology/emboss/emboss-6.1.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.1.0.ebuild,v 1.7 2011/10/20 08:46:56 xarthisius Exp $
-
-inherit eutils
-
-DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package"
-HOMEPAGE="http://emboss.sourceforge.net/"
-SRC_URI="ftp://${PN}.open-bio.org/pub/EMBOSS/old/${PV}/EMBOSS-${PV}.tar.gz"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X png minimal"
-
-DEPEND="X? ( x11-libs/libXt )
-	png? (
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/gd
-	)
-	!minimal? (
-		sci-biology/primer3
-		sci-biology/clustalw
-	)"
-
-RDEPEND="${DEPEND}
-	!sys-devel/cons"
-
-PDEPEND="!minimal? (
-		sci-biology/aaindex
-		sci-biology/cutg
-		sci-biology/prints
-		sci-biology/prosite
-		>=sci-biology/rebase-707
-		sci-biology/transfac
-	)"
-
-S="${WORKDIR}/EMBOSS-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-5.0.0-as-needed.patch
-
-	local link_string="-lX11";
-	if use png; then
-		link_string="${link_string} -lgd -lpng"
-	fi
-	sed -e "s:PATCH_PLPLOT:${link_string}:" -i plplot/Makefile.in \
-		|| die "Failed to patch ajax Makefile"
-}
-
-src_compile() {
-	EXTRA_CONF="--includedir=${D}/usr/include/emboss"
-	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
-	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
-
-	econf ${EXTRA_CONF} || die
-	# Do not install the JEMBOSS component (the --without-java configure option
-	# does not work). JEMBOSS will eventually be available as a separate package.
-	sed -i -e "s/SUBDIRS = plplot ajax nucleus emboss test doc jemboss/SUBDIRS = plplot ajax nucleus emboss test doc/" \
-			Makefile || die
-	emake || die
-}
-
-src_install() {
-	einstall || die "Failed to install program files."
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS \
-			|| die "Failed to install documentation."
-	newdoc "${FILESDIR}"/${PN}-README.Gentoo-1 README.Gentoo \
-			|| die "Failed to install Gentoo readme file."
-
-	# Install env file for setting libplplot and acd files path.
-	cat <<- EOF > 22emboss
-		# plplot libs dir
-		PLPLOT_LIB="/usr/share/EMBOSS/"
-		# ACD files location
-		EMBOSS_ACDROOT="/usr/share/EMBOSS/acd"
-	EOF
-	doenvd 22emboss || die "Failed to install environment file."
-
-	# Symlink preinstalled docs to "/usr/share/doc".
-	dosym /usr/share/EMBOSS/doc/manuals /usr/share/doc/${PF}/manuals || die
-	dosym /usr/share/EMBOSS/doc/programs /usr/share/doc/${PF}/programs || die
-	dosym /usr/share/EMBOSS/doc/tutorials /usr/share/doc/${PF}/tutorials || die
-	dosym /usr/share/EMBOSS/doc/html /usr/share/doc/${PF}/html || die
-
-	# Remove frestdist documentation conflicting with the EMBASSY philypnew
-	# package.
-	rm "${D}"/usr/share/EMBOSS/doc/programs/text/frestdist.txt || \
-			die "Failed to remove duplicated documentation."
-
-	# Remove useless dummy files from the image.
-	find emboss/data -name dummyfile -delete || die "Failed to remove dummy files."
-
-	# Move the provided codon files to a different directory. This will avoid
-	# user confusion and file collisions on case-insensitive file systems (see
-	# bug #115446). This change is documented in "README.Gentoo".
-	mv "${D}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
-			die "Failed to move CODON directory."
-
-	# Move the provided restriction enzyme prototypes file to a different name.
-	# This avoids file collisions with versions of rebase that install their
-	# own enzyme prototypes file (see bug #118832).
-	mv "${D}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \
-			die "Failed to move enzyme equivalence file."
-}
diff --git a/sci-biology/pilercr/pilercr-1.0.ebuild b/sci-biology/pilercr/pilercr-1.0.ebuild
index 988420c753b6..8507e4dab28e 100644
--- a/sci-biology/pilercr/pilercr-1.0.ebuild
+++ b/sci-biology/pilercr/pilercr-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/pilercr/pilercr-1.0.ebuild,v 1.5 2009/09/22 14:12:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/pilercr/pilercr-1.0.ebuild,v 1.6 2012/04/26 16:39:58 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -16,19 +16,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch || die
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
-	emake GPP="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" || die
+	emake GPP="$(tc-getCXX)" CFLAGS="${CXXFLAGS}"
 }
 
 src_install() {
-	dobin pilercr || die
+	dobin ${PN}
 }
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
index 2496fc9e587e..11a37c9d2fa1 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v 1.4 2010/07/19 19:09:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v 1.5 2012/04/26 16:40:51 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A simple hex calculator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/"
 SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
@@ -22,7 +23,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch ${FILESDIR}/${PN}-* || die
+	epatch "${FILESDIR}"/${PN}-*
 }
 
 src_compile() {
@@ -31,12 +32,10 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		CCLINK="$(tc-getCC)" \
-		LDOPTIONS="${LDFLAGS}" \
-		|| die
+		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin hexcalc || die
-	mv hexcalc.man hexcalc.1
-	doman hexcalc.1 || die
+	dobin ${PN}
+	newman ${PN}.{man,1}
 }
diff --git a/sci-calculators/hexcalc/hexcalc-1.11.ebuild b/sci-calculators/hexcalc/hexcalc-1.11.ebuild
deleted file mode 100644
index ee4c0ca1ea89..000000000000
--- a/sci-calculators/hexcalc/hexcalc-1.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11.ebuild,v 1.7 2007/07/22 07:29:44 dberkholz Exp $
-
-DESCRIPTION="A simple hex calculator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/"
-SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	app-text/rman"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	xmkmf || die
-	make || die
-}
-
-src_install() {
-
-	dobin hexcalc
-	mv hexcalc.man hexcalc.1
-	doman hexcalc.1
-}
diff --git a/sci-calculators/hexcalc/metadata.xml b/sci-calculators/hexcalc/metadata.xml
index b229aec85b8f..d369d068ffb8 100644
--- a/sci-calculators/hexcalc/metadata.xml
+++ b/sci-calculators/hexcalc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild
new file mode 100644
index 000000000000..072c391d06e2
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild,v 1.1 2012/04/26 18:38:44 swift Exp $
+EAPI="4"
+
+inherit selinux-policy-2
+
+IUSE="kerberos"
+MODS="apache"
+BASEPOL="2.20120215-r8"
+
+DESCRIPTION="SELinux policy for Apache HTTPD"
+DEPEND="${DEPEND}
+	kerberos? ( sec-policy/selinux-kerberos )"
+RDEPEND="${DEPEND}"
+
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/"
+
+src_unpack() {
+	selinux-policy-2_src_unpack
+}
+
+src_prepare() {
+	selinux-policy-2_src_prepare
+	if ! use kerberos ; then
+		[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted mcs mls";
+		for i in ${POLICY_TYPES}; do
+			sed -i -e "/httpd_keytab_t/d" \
+				"${S}/${i}/apache.fc"
+		done
+	fi
+}
+
+pkg_postinst() {
+	selinux-policy-2_pkg_postinst
+	if use kerberos ; then
+		einfo "If you decide to uninstall Kerberos, you should clear the"
+		einfo "kerberos use flag here, and then emerge this module again."
+		einfo "Failure to do so may result in policy compile errors in the"
+		einfo "future."
+	else
+		einfo "If you install Kerberos later, you should set the kerberos"
+		einfo "use flag here, and then emerge this module again in order to"
+		einfo "get all of the relevant policy changes.  Failure to do so may"
+		einfo "result in errors authenticating against kerberos servers by"
+		einfo "Apache."
+	fi
+}
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 464541b2f623..491691e7456e 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -6,5 +6,6 @@ DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4
 DIST patchbundle-selinux-base-policy-2.20110726-r8.tar.bz2 26629 RMD160 66d10e4d940c1c21ac429a2976abe5c6d711353c SHA1 e76454db60332fe21556c749b481db18ae609114 SHA256 bed5dd9121aaa984ad4b5c1087a72d0e222b79caeeb6a10b8975b2cbbb92d24e
 DIST patchbundle-selinux-base-policy-2.20120215-r6.tar.bz2 28970 RMD160 4726fd1dc85b5f6ad78389cf882d69c487a664dc SHA1 53e3acd5ce30582636462ae4d3fe834215b88810 SHA256 2a9e0bde439032a2183aed12ff6c18a7bdc00c05c4e1ce59ba097b0733bc776a
 DIST patchbundle-selinux-base-policy-2.20120215-r7.tar.bz2 29331 RMD160 d2f25fcc1bfe063392b68706644b5ff90381fc91 SHA1 557f77ac862d28191aabe2b6a18c1bc5beebae69 SHA256 e9ebe825c0f3651fc8fbf8183036fd61007d1c901d613071c6cfec3bec77963a
+DIST patchbundle-selinux-base-policy-2.20120215-r8.tar.bz2 29993 RMD160 6d6a03ff3d24951529f32442dd713b1f4982aa7b SHA1 1a2fec3e59f4f440598c52cf28c2eee45ce46d92 SHA256 0d2b6b35007f833d49701f4ea4a71b91d056ee4b86c990aa000aea1c431a8d60
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
 DIST refpolicy-2.20120215.tar.bz2 589917 RMD160 333960d5fdd5f9a23a024d1782950a06ada4f2d1 SHA1 1fe2dd03ea27e0e6fbde6e11309895efd43916e6 SHA256 6df77faf62f73bd1f6e3bfca3fa2f77cdfd2cada94a7dcc4816ed9bbcf3545dc
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20120215-r8.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120215-r8.ebuild
new file mode 100644
index 000000000000..6619367b6fbf
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120215-r8.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20120215-r8.ebuild,v 1.1 2012/04/26 18:38:44 swift Exp $
+EAPI="4"
+
+inherit eutils
+
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE=""
+BASEPOL="2.20120215-r8"
+
+RDEPEND=">=sec-policy/selinux-base-2.20120215-r8"
+DEPEND=""
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+		http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg unconfined"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+src_prepare() {
+	local modfiles
+
+	# Patch the sources with the base patchbundle
+	if [[ -n ${BASEPOL} ]];
+	then
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		# Parallel builds are broken, so we need to force -j1 here
+		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		local LOCCOMMAND
+		local LOCMODS
+		if [[ "${i}" != "targeted" ]]; then
+			LOCCOMMAND=$(echo "${COMMAND}" | sed -e 's:-i unconfined.pp::g');
+			LOCMODS=$(echo "${MODS}" | sed -e 's: unconfined::g');
+		else
+			LOCCOMMAND="${COMMAND}"
+			LOCMODS="${MODS}"
+		fi
+		einfo "Inserting the following modules, with base, into the $i module store: ${LOCMODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${LOCCOMMAND} || die "Failed to load in base and modules ${LOCMODS} in the $i policy store"
+	done
+}
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index fb84793bc705..d394b87084fb 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -1,3 +1,4 @@
 DIST patchbundle-selinux-base-policy-2.20120215-r6.tar.bz2 28970 RMD160 4726fd1dc85b5f6ad78389cf882d69c487a664dc SHA1 53e3acd5ce30582636462ae4d3fe834215b88810 SHA256 2a9e0bde439032a2183aed12ff6c18a7bdc00c05c4e1ce59ba097b0733bc776a
 DIST patchbundle-selinux-base-policy-2.20120215-r7.tar.bz2 29331 RMD160 d2f25fcc1bfe063392b68706644b5ff90381fc91 SHA1 557f77ac862d28191aabe2b6a18c1bc5beebae69 SHA256 e9ebe825c0f3651fc8fbf8183036fd61007d1c901d613071c6cfec3bec77963a
+DIST patchbundle-selinux-base-policy-2.20120215-r8.tar.bz2 29993 RMD160 6d6a03ff3d24951529f32442dd713b1f4982aa7b SHA1 1a2fec3e59f4f440598c52cf28c2eee45ce46d92 SHA256 0d2b6b35007f833d49701f4ea4a71b91d056ee4b86c990aa000aea1c431a8d60
 DIST refpolicy-2.20120215.tar.bz2 589917 RMD160 333960d5fdd5f9a23a024d1782950a06ada4f2d1 SHA1 1fe2dd03ea27e0e6fbde6e11309895efd43916e6 SHA256 6df77faf62f73bd1f6e3bfca3fa2f77cdfd2cada94a7dcc4816ed9bbcf3545dc
diff --git a/sec-policy/selinux-base/selinux-base-2.20120215-r8.ebuild b/sec-policy/selinux-base/selinux-base-2.20120215-r8.ebuild
new file mode 100644
index 000000000000..abaea4e64b8c
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20120215-r8.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120215-r8.ebuild,v 1.1 2012/04/26 18:38:44 swift Exp $
+EAPI="4"
+
+inherit eutils
+
+IUSE="+peer_perms +open_perms +ubac doc"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/policycoreutils-2.1.10
+	>=sys-fs/udev-151
+	!<=sec-policy/selinux-base-policy-2.20120215"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.1.8"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	# Apply the gentoo patches to the policy. These patches are only necessary
+	# for base policies, or for interface changes on modules.
+	EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	cd "${S}/refpolicy"
+	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
+	# system_r role
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mls/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+
+		cd "${S}/${i}";
+		make conf || die "Make conf in ${i} failed"
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
diff --git a/sys-apps/findutils/findutils-4.5.10-r1.ebuild b/sys-apps/findutils/findutils-4.5.10-r1.ebuild
index 08d15cd1aeb5..b44b593a261b 100644
--- a/sys-apps/findutils/findutils-4.5.10-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.5.10-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/sys-apps/findutils/findutils-4.5.10-r1.ebuild,v 1.4 2012/03/27 17:50:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.10-r1.ebuild,v 1.5 2012/04/26 21:35:56 aballier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/help2man/help2man-1.40.8.ebuild b/sys-apps/help2man/help2man-1.40.8.ebuild
index 7cd7011e5b16..37523b676137 100644
--- a/sys-apps/help2man/help2man-1.40.8.ebuild
+++ b/sys-apps/help2man/help2man-1.40.8.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-apps/help2man/help2man-1.40.8.ebuild,v 1.5 2012/04/25 18:46:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.40.8.ebuild,v 1.6 2012/04/26 17:49:05 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/help2man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls elibc_glibc"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
index 0153c0804bcb..1e39a3023878 100644
--- a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.9-r2.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-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.6 2012/04/24 14:43:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.7 2012/04/27 03:11:35 vapier Exp $
 
 EAPI="4"
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )"
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
+DEPEND="static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index 245e9efa965b..f394dbce289a 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.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/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.9 2012/03/09 14:30:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild,v 1.10 2012/04/26 17:54:38 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="selinux +prevent-removal"
 
 DEPEND="virtual/pam
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 6399cf204ced..34dc11c7a730 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.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/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.19 2011/03/15 23:08:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.20 2012/04/26 17:57:01 aballier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autogen/autogen-5.15.ebuild b/sys-devel/autogen/autogen-5.15.ebuild
index 99110e519269..aa37e2f48450 100644
--- a/sys-devel/autogen/autogen-5.15.ebuild
+++ b/sys-devel/autogen/autogen-5.15.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-devel/autogen/autogen-5.15.ebuild,v 1.1 2012/03/03 03:28:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.15.ebuild,v 1.2 2012/04/26 16:40:18 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 0c8307a18c3c..ff0e7f661930 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -17,4 +17,6 @@ DIST gdb-7.3.1-patches-2.tar.xz 17344 RMD160 7a97172d74158e92dd297182d278173842f
 DIST gdb-7.3.1.tar.bz2 19500995 RMD160 6350a786b2f60dd46386454ebab0effc67ed169f SHA1 e57f2c7f93536ef54fab728eb733bf2c36550718 SHA256 6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28
 DIST gdb-7.3.tar.bz2 19091650 RMD160 3df9a15e2d276f4f7f30e5d2a7d86a8c63f30a34 SHA1 fefd90275d6decdca00c5c29c533e2ef3d439664 SHA256 f9edc83ed921660b77aa2b2fc168b81639aab0f49a94d4b38f2f01bf51d5d2ba
 DIST gdb-7.4-patches-1.tar.xz 8192 RMD160 c42d576b421905f0a56ed4d4e12779528bfe805d SHA1 469a510f062bc6e37976a5b0f43b697c2f457c01 SHA256 c4349847c80f314c603dd9465b90cda2b3565cac4f8024a4287f756eda9d138b
+DIST gdb-7.4.1-patches-1.tar.xz 8188 RMD160 ab816950dae61849411af9bc2b2378118d604cca SHA1 5cdc1b39398b627c968337b7b5e8c6682545a21d SHA256 66f85b5060bba26d199d407aaced9025373879ae7a9d7d39a1a16900fc47a6f4
+DIST gdb-7.4.1.tar.bz2 20619200 RMD160 a1273705aafd0c4d38b5836d0b096bbdbc6ee897 SHA1 1b0f8c3778d4b10c8d2be6922ac01a9900e8116c SHA256 a081343c017732ab4dd30a4730da83667aa01b0b37d1ad3700c3f05a5da0f9f6
 DIST gdb-7.4.tar.bz2 20614020 RMD160 32d79650c93f64583ae1e49908ec238f78d49e73 SHA1 43a3ee582eae4d69c2babea4f8700b7bec8e37fa SHA256 de7e2db7f0475eca7f9ffa9251abaddd3d37e0eed0b3759f71abfd810a3fd20f
diff --git a/sys-devel/gdb/gdb-6.6-r2.ebuild b/sys-devel/gdb/gdb-6.6-r2.ebuild
index dc5c6aa2620c..d4603e46bc1b 100644
--- a/sys-devel/gdb/gdb-6.6-r2.ebuild
+++ b/sys-devel/gdb/gdb-6.6-r2.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/sys-devel/gdb/gdb-6.6-r2.ebuild,v 1.13 2011/02/06 11:34:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.6-r2.ebuild,v 1.14 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ fi
 PATCH_VER="1.3"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
diff --git a/sys-devel/gdb/gdb-6.7.1-r3.ebuild b/sys-devel/gdb/gdb-6.7.1-r3.ebuild
index 59947080037f..f823449335cb 100644
--- a/sys-devel/gdb/gdb-6.7.1-r3.ebuild
+++ b/sys-devel/gdb/gdb-6.7.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.7.1-r3.ebuild,v 1.9 2008/03/30 16:17:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.7.1-r3.ebuild,v 1.10 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ fi
 PATCH_VER="1.3"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
diff --git a/sys-devel/gdb/gdb-6.8-r1.ebuild b/sys-devel/gdb/gdb-6.8-r1.ebuild
index 3da23d829365..cc0ed4d79dcd 100644
--- a/sys-devel/gdb/gdb-6.8-r1.ebuild
+++ b/sys-devel/gdb/gdb-6.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.11 2009/10/10 21:34:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r1.ebuild,v 1.12 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ fi
 PATCH_VER="1.4"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
 
diff --git a/sys-devel/gdb/gdb-6.8-r2.ebuild b/sys-devel/gdb/gdb-6.8-r2.ebuild
index d87ebd67d06e..08d84838f3c0 100644
--- a/sys-devel/gdb/gdb-6.8-r2.ebuild
+++ b/sys-devel/gdb/gdb-6.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r2.ebuild,v 1.5 2009/10/10 21:34:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.8-r2.ebuild,v 1.6 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ fi
 PATCH_VER="1.5"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
 
diff --git a/sys-devel/gdb/gdb-7.0.1.ebuild b/sys-devel/gdb/gdb-7.0.1.ebuild
index 2b5165f6e526..536af1226b43 100644
--- a/sys-devel/gdb/gdb-7.0.1.ebuild
+++ b/sys-devel/gdb/gdb-7.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.0.1.ebuild,v 1.8 2010/09/11 16:58:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.0.1.ebuild,v 1.9 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 PATCH_VER="1"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma}"
 
diff --git a/sys-devel/gdb/gdb-7.1.ebuild b/sys-devel/gdb/gdb-7.1.ebuild
index 12fa13f1617b..acfdae5baa39 100644
--- a/sys-devel/gdb/gdb-7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.1.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/sys-devel/gdb/gdb-7.1.ebuild,v 1.2 2011/03/22 16:14:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.1.ebuild,v 1.3 2012/04/27 01:12:08 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,7 +15,7 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 PATCH_VER="1"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
 	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma}"
 
diff --git a/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
index 00a54aacd7ed..1908c40e3737 100644
--- a/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
+++ b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild,v 1.1 2010/12/31 21:06:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild,v 1.2 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -29,9 +29,9 @@ PATCH_VER=""
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
 if [[ -n ${RPM} ]] ; then
-	SRC_URI="http://mirrors.kernel.org/fedora/development/source/SRPMS/${RPM}"
+	SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
 else
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 fi
 SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
diff --git a/sys-devel/gdb/gdb-7.2.ebuild b/sys-devel/gdb/gdb-7.2.ebuild
index 445bf533ec52..ac1b7d016717 100644
--- a/sys-devel/gdb/gdb-7.2.ebuild
+++ b/sys-devel/gdb/gdb-7.2.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/sys-devel/gdb/gdb-7.2.ebuild,v 1.14 2011/09/03 14:54:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.15 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -31,7 +31,7 @@ HOMEPAGE="http://sources.redhat.com/gdb/"
 if [[ -n ${RPM} ]] ; then
 	SRC_URI="http://mirrors.kernel.org/fedora/development/source/SRPMS/${RPM}"
 else
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 fi
 SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild
index a6c95b180337..e3b79b16dda1 100644
--- a/sys-devel/gdb/gdb-7.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.3.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/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.6 2012/01/13 19:13:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.7 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ case ${PV} in
 	;;
 *)
 	# Normal upstream release
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 	;;
 esac
diff --git a/sys-devel/gdb/gdb-7.3.1.ebuild b/sys-devel/gdb/gdb-7.3.1.ebuild
index 6a81d37fe0cf..b8bd432c1a0d 100644
--- a/sys-devel/gdb/gdb-7.3.1.ebuild
+++ b/sys-devel/gdb/gdb-7.3.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/sys-devel/gdb/gdb-7.3.1.ebuild,v 1.12 2012/02/13 10:31:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1.ebuild,v 1.13 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ case ${PV} in
 	;;
 *)
 	# Normal upstream release
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 	;;
 esac
diff --git a/sys-devel/gdb/gdb-7.3.ebuild b/sys-devel/gdb/gdb-7.3.ebuild
index ee78345c27ca..2d7f2eacfa12 100644
--- a/sys-devel/gdb/gdb-7.3.ebuild
+++ b/sys-devel/gdb/gdb-7.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/sys-devel/gdb/gdb-7.3.ebuild,v 1.6 2011/09/03 14:54:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.ebuild,v 1.7 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ case ${PV} in
 	;;
 *)
 	# Normal upstream release
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 	;;
 esac
diff --git a/sys-devel/gdb/gdb-7.4.1.ebuild b/sys-devel/gdb/gdb-7.4.1.ebuild
new file mode 100644
index 000000000000..0344b54a5a54
--- /dev/null
+++ b/sys-devel/gdb/gdb-7.4.1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.1.ebuild,v 1.2 2012/04/27 01:12:08 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic eutils
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+*.*.*.*.*.*)
+	# fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	MY_PV=$(gvcr 1-4)
+	RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm"
+	SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
+	;;
+*.*.50.*)
+	# weekly snapshots
+	SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
+	;;
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/gdb.git"
+	inherit git-2
+	SRC_URI=""
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
+		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
+	;;
+esac
+
+PATCH_VER="1"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sourceware.org/gdb/"
+SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client expat multitarget nls +python +server test vanilla zlib"
+
+RDEPEND="!dev-util/gdbserver
+	>=sys-libs/ncurses-5.2-r2
+	sys-libs/readline
+	expat? ( dev-libs/expat )
+	python? ( =dev-lang/python-2* )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/yacc
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local sysroot="${EPREFIX}"/usr/${CTARGET}
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='http://bugs.gentoo.org/'
+		--disable-werror
+		$(is_cross && echo \
+			--with-sysroot="${sysroot}" \
+			--includedir="${sysroot}/usr/include")
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			--with-system-readline
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with expat)
+			$(use_enable nls)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPREFIX}/usr/bin/python2")
+			$(use_with zlib)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake check || ewarn "tests failed"
+}
+
+src_install() {
+	use server && ! use client && cd gdb/gdbserver
+	emake DESTDIR="${D}" install || die
+	use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
+	cd "${S}"
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -r "${ED}"/usr/share
+		return 0
+	fi
+	# Install it by hand for now:
+	# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
+
+	dodoc README
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-7.4.ebuild b/sys-devel/gdb/gdb-7.4.ebuild
index cbb5938f0a4b..3f1a444e4f23 100644
--- a/sys-devel/gdb/gdb-7.4.ebuild
+++ b/sys-devel/gdb/gdb-7.4.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-devel/gdb/gdb-7.4.ebuild,v 1.3 2012/01/25 22:28:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.4 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ case ${PV} in
 	;;
 *)
 	# Normal upstream release
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 	;;
 esac
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 202c536f3cdd..fa285c767a7f 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.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-devel/gdb/gdb-9999.ebuild,v 1.10 2012/01/25 22:28:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.11 2012/04/27 01:12:08 vapier Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ case ${PV} in
 	;;
 *)
 	# Normal upstream release
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
 		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 	;;
 esac
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index aff7f7429fe3..2c324f40677e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -14,7 +14,7 @@ DIST glibc-2.14.1-patches-5.tar.bz2 159559 RMD160 25b72ae44aab4ec3f7fc516f144353
 DIST glibc-2.14.1-patches-7.tar.bz2 162243 RMD160 d5f2c3beec856ded1452d8842e5a2818be0a72fb SHA1 7d6d4c7c93f6edb81442b0bdea425945ecaafeb2 SHA256 a3f60ba52ad93ec67aa3cdd9c948561ccde747f33ea1e1cae83c11fe86e06deb
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
-DIST glibc-2.15-patches-9.tar.bz2 150196 RMD160 4a9da53ae101f51300c39c9d791180068e2e618f SHA1 0335f611d10ae4e9f5d6e12ff485b1fcd3e1236f SHA256 57858aee5f120dec5a97e376ee2fe1774eafd160d3ea36241a048fbc617305c8
+DIST glibc-2.15-patches-10.tar.bz2 150815 RMD160 92180f595736fb97a0aa9e0cbc8f7ef6a3fb627a SHA1 dfa7b9c7c7d739288555788095dce2ccd29b540d SHA256 41b2ae5971d40d7811a81f67d2bbd2e556a7e1bd1dcf13ec44b7bfe0966fa570
 DIST glibc-2.15.tar.xz 10280176 RMD160 29afafcb61f5842b6b458e322a004aac06dbf6df SHA1 0a7936be3bd0562b076b95dacb7c9daa3dbc83fc SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index 2514a0501b32..1b3fe70e8826 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-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/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.1 2012/04/21 16:54:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.2 2012/04/27 02:07:12 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="9"                                  # Gentoo patchset
+PATCH_VER="10"                                 # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index ecfa38d59d6c..2d2dc1e38747 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,2 +1,3 @@
 DIST libosinfo-0.0.5.tar.gz 852471 RMD160 6954097ef8137014758eac8c906dab6c557427b6 SHA1 6fba398582eaeab994105c96dcda19ceebd5d3c8 SHA256 ae5577f45e9d9af59c3fa5b50f20b26e62990b2fffa14cb66e3f684857570ac3
 DIST libosinfo-0.1.0.tar.gz 855326 RMD160 dc9088422dbc1e6be9bd8b0baeaeacadea297664 SHA1 dd1b28ac4b66830b229b798e973c4bef2e8f9615 SHA256 13ab1932cdeca6e4525b6a88bd35b10c9b9abe34dc47f422ea99699cf2d46b9a
+DIST libosinfo-0.1.1.tar.gz 984734 RMD160 6d2d1e2e237aff73ac7e98a59ee5e261f343aeac SHA1 ff0c6dfc76999ca056c514d663b6386a3f079a2d SHA256 4d36281190c1e8694be98b305d890eb4d0518bcdf0dc51134e57a2f377e1a5ac
diff --git a/sys-libs/libosinfo/libosinfo-0.1.1.ebuild b/sys-libs/libosinfo/libosinfo-0.1.1.ebuild
new file mode 100644
index 000000000000..5605195229ba
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-0.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.1.1.ebuild,v 1.1 2012/04/26 21:13:06 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://fedorahosted.org/libosinfo/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection +vala test"
+
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/libsoup:2.4
+	net-libs/libsoup-gnome:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( dev-libs/check )
+	vala? ( dev-lang/vala:0.14 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	# --enable-udev only installs udev rules
+	G2CONF="--disable-coverage
+		--disable-static
+		--enable-udev
+		--with-udev-rulesdir=/lib/udev/rules.d
+		VAPIGEN=$(type -P vapigen-0.14)
+		$(use_enable introspection)
+		$(use_enable test tests)
+		$(use_enable vala)"
+}
diff --git a/sys-libs/newlib/files/newlib-1.20.0-arm-targets.patch b/sys-libs/newlib/files/newlib-1.20.0-arm-targets.patch
new file mode 100644
index 000000000000..1704cc0ba7f4
--- /dev/null
+++ b/sys-libs/newlib/files/newlib-1.20.0-arm-targets.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/413547
+
+From 3b98b99eaa23f242b984af8cbf4a0e707bc7eae8 Mon Sep 17 00:00:00 2001
+From: Corinna Vinschen <corinna@vinschen.de>
+Date: Thu, 23 Feb 2012 09:30:17 +0000
+Subject: [PATCH] 	* configure.host: Accept "arm*" host spec instead of
+ just "arm".
+
+---
+ newlib/ChangeLog      |    4 ++++
+ newlib/configure.host |    8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
++2012-02-23  Dan Egnor  <egnor@ofb.net>
+
+	* configure.host: Accept "arm*" host spec instead of just "arm".
+
+diff --git a/newlib/configure.host b/newlib/configure.host
+index a6673af..dc44e80 100644
+--- a/newlib/configure.host
++++ b/newlib/configure.host
+@@ -98,7 +98,7 @@ case "${host_cpu}" in
+   arc)
+ 	machine_dir=
+ 	;;
+-  arm)
++  arm*)
+ 	machine_dir=arm
+ 	;;
+   avr*)
+@@ -367,7 +367,7 @@ case "${host}" in
+   arc-*-*)
+ 	sys_dir=arc
+ 	;;
+-  arm-*-*)
++  arm*-*-*)
+ 	sys_dir=arm
+ 	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
+ 	  have_crt0="no"
+@@ -560,10 +560,10 @@ case "${host}" in
+   arc-*-*)
+ 	syscall_dir=syscalls
+ 	;;
+-  arm-*-pe)
++  arm*-*-pe)
+ 	syscall_dir=syscalls
+ 	;;
+-  arm-*-*)
++  arm*-*-*)
+ 	syscall_dir=syscalls
+ # If newlib is supplying syscalls, select which debug protocol is being used.
+ # ARM_RDP_MONITOR selects the Demon monitor.
+-- 
+1.7.8.5
+
diff --git a/sys-libs/newlib/newlib-1.20.0.ebuild b/sys-libs/newlib/newlib-1.20.0.ebuild
index 29ea3b99ba94..7a90a43dccb2 100644
--- a/sys-libs/newlib/newlib-1.20.0.ebuild
+++ b/sys-libs/newlib/newlib-1.20.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/sys-libs/newlib/newlib-1.20.0.ebuild,v 1.2 2012/03/23 23:09:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.20.0.ebuild,v 1.3 2012/04/27 01:09:29 vapier Exp $
 
 EAPI="4"
 
@@ -40,6 +40,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cris-install.patch
+	epatch "${FILESDIR}"/${P}-arm-targets.patch #413547
 }
 
 src_configure() {
diff --git a/sys-power/iasl/iasl-20111123.ebuild b/sys-power/iasl/iasl-20111123.ebuild
index 44768d3febb8..340859bb62c0 100644
--- a/sys-power/iasl/iasl-20111123.ebuild
+++ b/sys-power/iasl/iasl-20111123.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/sys-power/iasl/iasl-20111123.ebuild,v 1.2 2011/12/25 22:45:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20111123.ebuild,v 1.3 2012/04/26 16:38:16 aballier Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.acpica.org/download/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/virtual/fam/fam-0.ebuild b/virtual/fam/fam-0.ebuild
index c8f72feb79d2..20e2e950f71e 100644
--- a/virtual/fam/fam-0.ebuild
+++ b/virtual/fam/fam-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/virtual/fam/fam-0.ebuild,v 1.1 2011/01/06 11:03:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/fam/fam-0.ebuild,v 1.2 2012/04/26 17:35:10 aballier Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( app-admin/gamin app-admin/fam )"
diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild
index f3c057038e15..46197a6f38ab 100644
--- a/virtual/jpeg/jpeg-0.ebuild
+++ b/virtual/jpeg/jpeg-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/virtual/jpeg/jpeg-0.ebuild,v 1.7 2012/04/26 13:10:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jpeg/jpeg-0.ebuild,v 1.8 2012/04/26 20:38:29 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!prefix? ( >=media-libs/libjpeg-turbo-1.2.0:0[static-libs?] )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.0.ebuild
index 39bc0049f56e..fa555607a629 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.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/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.0.ebuild,v 1.1 2012/02/21 19:26:43 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.49.0.ebuild,v 1.2 2012/04/26 19:57:54 aballier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.0.ebuild
index 66ecd81da5f8..d649a604d772 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.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/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.0.ebuild,v 1.1 2012/02/21 19:31:30 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.49.0.ebuild,v 1.2 2012/04/26 19:59:11 aballier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.49.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.49.0.ebuild
index 3794e6cc218d..d8968a4966ba 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.49.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.49.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/virtual/perl-IO-Compress/perl-IO-Compress-2.49.0.ebuild,v 1.1 2012/02/21 19:33:29 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Compress/perl-IO-Compress-2.49.0.ebuild,v 1.2 2012/04/26 20:00:31 aballier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.0.ebuild
index 20098f0dc051..7f9f6d9bcd34 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.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/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.0.ebuild,v 1.1 2012/03/30 14:05:27 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.250.0.ebuild,v 1.2 2012/04/26 19:57:14 aballier Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/ttf-fonts/ttf-fonts-1.ebuild b/virtual/ttf-fonts/ttf-fonts-1.ebuild
index f5e92017f4d3..03ffe084d884 100644
--- a/virtual/ttf-fonts/ttf-fonts-1.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1.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/virtual/ttf-fonts/ttf-fonts-1.ebuild,v 1.7 2011/05/29 17:51:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ttf-fonts/ttf-fonts-1.ebuild,v 1.8 2012/04/26 19:28:45 aballier Exp $
 
 DESCRIPTION="Virtual for Serif/Sans/Monospace font packages"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 4f7bfaf3f5a0..c677b09199f0 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,4 +1,4 @@
 DIST mediawiki-1.18.1.tar.gz 17271798 RMD160 066871f63d38120ba0985f5168351a6a66a45758 SHA1 1c433523a5ae2835e97462053e08ad7c01e178d2 SHA256 d9db16b4f18bc43984f323ad90f724ee5ffa52e1f21e6c453bc8d4b1210e1a34
 DIST mediawiki-1.18.2.tar.gz 17320421 RMD160 2ad278236d0b636489ddd0ee0774d346135f5009 SHA1 edaf86104f7542a08d6ce39473cdef6a5b01fca4 SHA256 82228bb85f4ae0cfaa5e2b1b5be57601d86e5bfe2f3d397a6bd0c2d3021cccef
-DIST mediawiki-1.19.0beta1.tar.gz 17903674 RMD160 0040bfb514d293e6898154617b9c78f5d7c4c3cf SHA1 b27da95759f8347ade92554162a4aaa8761ae953 SHA256 0779a8440f86f147dfdb4134139143feac5e851d5bb88cab5c270efb230900b8
-DIST mediawiki-1.19.0beta2.tar.gz 17914172 RMD160 c6b436598928d1d6742e678902992ebe9121087f SHA1 1ee6ed0c863cdf7c5aa2a8c2de13600045bc7823 SHA256 64fbe2905131920a77010546b40bff28ea97bda02523c0740e88130bfd268dec
+DIST mediawiki-1.18.3.tar.gz 17376442 RMD160 71a22e4f016459a0a1f215b1699e3ded1df3ccb3 SHA1 e524e08e24a0129e59dc41ef482df5705481c5f9 SHA256 4319f37282ad64ddfca53ecae76da787630f1cd0e5ad438d028551fb1742eb39
+DIST mediawiki-1.19.0rc1.tar.gz 17896494 RMD160 070bb3e203d7f305c9e713f734d3c573251c410b SHA1 4757bc23b5fa2e8e2088484e44a1d1ec0ed56932 SHA256 a3d86409156af4966df872c82ef02f60db6ef1538faf19a5404ac2a3479de1b7
diff --git a/www-apps/mediawiki/mediawiki-1.19.0_beta1.ebuild b/www-apps/mediawiki/mediawiki-1.18.3.ebuild
similarity index 92%
rename from www-apps/mediawiki/mediawiki-1.19.0_beta1.ebuild
rename to www-apps/mediawiki/mediawiki-1.18.3.ebuild
index a0bc283862ca..5b134a4a6779 100644
--- a/www-apps/mediawiki/mediawiki-1.19.0_beta1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.18.3.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.0_beta1.ebuild,v 1.1 2012/03/09 12:15:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.3.ebuild,v 1.1 2012/04/26 19:23:11 radhermit Exp $
 
 EAPI="4"
 inherit webapp versionator
 
 MY_BRANCH=$(get_version_component_range 1-2)
-MY_P=${P/_/}
 
 DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
 HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${MY_P}.tar.gz"
+SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
@@ -29,8 +28,6 @@ need_httpd_cgi
 
 RESTRICT="test"
 
-S=${WORKDIR}/${MY_P}
-
 src_install() {
 	webapp_src_preinst
 
@@ -39,7 +36,7 @@ src_install() {
 
 	# We ensure the directories are prepared for writing.  The post-
 	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-1.18 UPGRADE"
 	dodoc ${DOCS} docs/*.txt
 	docinto php-memcached
 	dodoc docs/php-memcached/*
diff --git a/www-apps/mediawiki/mediawiki-1.19.0_beta2.ebuild b/www-apps/mediawiki/mediawiki-1.19.0_rc1.ebuild
similarity index 97%
rename from www-apps/mediawiki/mediawiki-1.19.0_beta2.ebuild
rename to www-apps/mediawiki/mediawiki-1.19.0_rc1.ebuild
index 466eb7832894..7262692e8a70 100644
--- a/www-apps/mediawiki/mediawiki-1.19.0_beta2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.19.0_rc1.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-apps/mediawiki/mediawiki-1.19.0_beta2.ebuild,v 1.1 2012/03/23 05:15:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.0_rc1.ebuild,v 1.1 2012/04/26 19:24:02 radhermit Exp $
 
 EAPI="4"
 inherit webapp versionator
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index faefef6eef66..9fed40da4584 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1 +1,2 @@
 DIST roundup-1.4.16.tar.gz 1444546 RMD160 1968f0c84b6757aaec7790f92ed76c0e484faefb SHA1 0a6657ce81041fa6a12003200ee54666b78b6463 SHA256 496602769b8338718eb90efca7bca61bf228b4d6650533d353abb1f225345dcf
+DIST roundup-1.4.19.tar.gz 2505527 RMD160 f5ce2fab5d6e5a9abd6384d80610f21730beac1a SHA1 8c92ee6b644cacf6d1592caa847bab7696232850 SHA256 484fe4c639f37c488cc488531a7c45e7afe1638424759f78e2e2da99cbb38b6b
diff --git a/www-apps/roundup/roundup-1.4.19.ebuild b/www-apps/roundup/roundup-1.4.19.ebuild
new file mode 100644
index 000000000000..ab2b661e2748
--- /dev/null
+++ b/www-apps/roundup/roundup-1.4.19.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-1.4.19.ebuild,v 1.1 2012/04/26 22:01:21 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Simple-to-use and -install issue-tracking system with command-line, web, and e-mail interfaces."
+HOMEPAGE="http://roundup.sourceforge.net http://pypi.python.org/pypi/roundup"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/db-3.2.9"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES.txt doc/*.txt"
+
+src_install() {
+	distutils_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	dohtml -r doc/*
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	ewarn "As a non privileged user! (not root)"
+	ewarn "Run 'roundup-admin install' to set up a roundup instance"
+	ewarn "Then edit your config.ini file in the tracker home you setup"
+	ewarn "Run 'roundup-admin initialise' to setup the admin pass"
+	ewarn "run /usr/bin/roundup start port host \"your tracker name\" [your tracker home], and all should work!"
+	ewarn "run /usr/bin/roundup stop [your tracker home] to stop the server"
+	ewarn "log is in [tracker home]/roundup.log"
+	ewarn "pid file is in [tracker home]/roundup.pid"
+	ewarn
+	ewarn "See upgrading.txt for upgrading instructions."
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 43b0241083a6..c91f4df7d117 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1 +1,2 @@
 DIST wordpress-3.3.1.tar.gz 3879784 RMD160 956a99348b965c2bc0fa4083e5295425958e90a4 SHA1 c250cf66da88c49c927161172af2264caac6d2d5 SHA256 e884db6e551c155f022533b6653867b048088cd3cbcbfe546b404696dd960dc2
+DIST wordpress-3.3.2.tar.gz 3883667 RMD160 1fce1f9402308f9e4689778656a2e7e8fab45211 SHA1 f4c0ee4d14d3364d158755072a944cd8cf685475 SHA256 3da62214ef274066ed7912a6f062000e173e267297e34b7b011f029366cc1b2f
diff --git a/www-apps/wordpress/wordpress-3.3.2.ebuild b/www-apps/wordpress/wordpress-3.3.2.ebuild
new file mode 100644
index 000000000000..396566d63b3f
--- /dev/null
+++ b/www-apps/wordpress/wordpress-3.3.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3.2.ebuild,v 1.1 2012/04/26 19:12:24 radhermit Exp $
+
+EAPI="4"
+
+inherit webapp
+
+DESCRIPTION="Wordpress php and mysql based CMS system"
+HOMEPAGE="http://wordpress.org/"
+SRC_URI="http://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml readme.html
+	rm -f readme.html license.txt
+
+	[ -f wp-config.php ] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index d510afcdf5f4..9d2e5d858b85 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -166,6 +166,90 @@ DIST firefox-10.0.3esr-vi.xpi 262784 RMD160 9e371105a4c4a169bdeeadedee1cc2b43c0f
 DIST firefox-10.0.3esr-zh-CN.xpi 256544 RMD160 39b8f49243efa9589e4a19295d6e3b280a770b25 SHA1 85d7eaf228250cbeec0a259b0ee040d1d7712962 SHA256 1fb0e63f2ca9b2641862b0c85eef2aaa74b29074dea25f42d70fe4e48905edaf
 DIST firefox-10.0.3esr-zh-TW.xpi 257489 RMD160 be46b9681d869437ff9574ceb476c9708ccd4a6d SHA1 5a2a35024ff27bcb07d6be974a0a858a9f041ed1 SHA256 df2243c0d27ada14d8faffe17892ee09f9ff19745808252946952a84b9887183
 DIST firefox-10.0.3esr-zu.xpi 246392 RMD160 ca177faec411efb5a42b9fe17faf2425ffb6bbe7 SHA1 0d8a70a8af1a12ea3851fa200cfa2f915f3c98a7 SHA256 b03779b3ebc7ef4fd4ff80731f2f7150b751c4fc2bbfd7d7beb77275f07a99fc
+DIST firefox-10.0.4esr-af.xpi 238740 RMD160 abbad41bc2e2116f4e9e1b903f3b3d9db289bbca SHA1 0298c0d209b043fa23db8370142facc50c9498c9 SHA256 375d0ef6e2c5543276704920fcaac881c8a852b17d300224848fa71636be7b5b
+DIST firefox-10.0.4esr-ak.xpi 240568 RMD160 6f1eed2ae5becf0ae26711979abe6687e88508d8 SHA1 9cfad2fda4c2d5ba8438889e120ac9a48fef7388 SHA256 246065e30882eeb5fe9017e65bec73e7bb60f35763b42a48c0adc6b375c28417
+DIST firefox-10.0.4esr-ar.xpi 263699 RMD160 7e2e14a2c0c3bdab00b10c882a08537a82ae41b1 SHA1 054b82ed27292178aef907503aaf6ac7710bd5c9 SHA256 6bf992eb757890ac79dc35b6ff7204435abf8070ca98260ce2940728b42a541b
+DIST firefox-10.0.4esr-as.xpi 278740 RMD160 6d751b5930d769dcc8894a435a9e267a44c80e04 SHA1 7636dfbc2144dbb2f33cb69a953f6084be6604a2 SHA256 948e2a1adbe0e963a9983259305407f243b6c500df7fd9e8c30d1e7f68f3cf9d
+DIST firefox-10.0.4esr-ast.xpi 237972 RMD160 f969299d4fa2e1a7389071cc2000e0c830cf907e SHA1 706a47df268e4161449769f237f16cec9a0f789f SHA256 c5c4f1308f958a12ce4123aeb1e6c0d428fbfab00f45f770d0433dac74d1cc92
+DIST firefox-10.0.4esr-be.xpi 245753 RMD160 6e716545d586ecc09d5b3b74e3c58ba68e89f19d SHA1 e53ce933b701e754c24e700644a47618c5d25cc3 SHA256 de3f31df5664f34caff2d0bcce7400a5cdfe93aa2ffa953de4e0525475511bab
+DIST firefox-10.0.4esr-bg.xpi 276752 RMD160 96e09eac649982f0c2393821cca164964a1391bf SHA1 efe9a476bc8f3153d3b06ba600ab7a2c0dad0fa6 SHA256 d4ba44ebb33cf1fb58fbb39604066e4d6774e033359c86f0a4692f84fb81182c
+DIST firefox-10.0.4esr-bn-BD.xpi 288290 RMD160 1a588039d7ef4cb635723cb1b3349593258da4e1 SHA1 ff056110cc308df95c48bd6577be63b72ad06b36 SHA256 d0b8776eddd3090a389fa17686ca912eef6f86836fd266bf60083a11af085bf6
+DIST firefox-10.0.4esr-bn-IN.xpi 319302 RMD160 3ed2f12bd263aa95dbd76b61e5f27df3d5b11aa9 SHA1 b9e2d8f90c50c3de424458322a4adfd4019f625d SHA256 fbcf9da2b5d81952d2f84d5608f5316d562b00593f18fc501f9780f2ace902eb
+DIST firefox-10.0.4esr-br.xpi 247648 RMD160 7a9003053cf3da7e81db1507396ea779b449a552 SHA1 a5ab1e13b54fc22740dc045e7eb24c1cd84a0bb7 SHA256 e56dd861af173ce5778f7ba1f77051c36fae6acb9fa2f3f44db6906047fb0cc8
+DIST firefox-10.0.4esr-bs.xpi 245305 RMD160 b5571e8b74baf85a17f452ccb58f6fcab4cc8ef8 SHA1 12bac7144f7af2662caeb16d083d9caaf36aab87 SHA256 520c99818b136c8c516c895cbb1309ac47991dffabe754467c3b538b5095cbd9
+DIST firefox-10.0.4esr-ca.xpi 248217 RMD160 50443a2604861a9039af9d3d9597e1da86f1da4f SHA1 aa5e860f1a8d9d87c98917b803f28ddb8ddf648a SHA256 3f7fc9f7753b38bf6054b8f43c1efdf01b7e93e4a9566320ec03599fde97406c
+DIST firefox-10.0.4esr-cs.xpi 248766 RMD160 1a07c2c8470a766a0d94931a3db8ccac15b8d5e1 SHA1 9fb6212f98c907c8a1e6b82b9dd5812c2286a840 SHA256 a5238f7ecaeab23b2ec383eeb4e93c98b17ac4dde280c5a8d8e390512433426f
+DIST firefox-10.0.4esr-csb.xpi 266621 RMD160 caa6b1b99d72813cb258017f26c35d70e7885192 SHA1 9271ed1a473199e7d59294d43b25c10fbe305e59 SHA256 9c717a2d1e04453d09f55176221bf4377571533b63ab9a1aa8ea996210d76fbc
+DIST firefox-10.0.4esr-cy.xpi 244194 RMD160 bdd349d26bbed86ada71c32b11711a2d00b91630 SHA1 0a11e0352445e731eb80fe0df7f66a7f9c487bbf SHA256 91007ba23e623a22c32f51f555ac4d3e48827ab2be17b299fc344ccea5b0d829
+DIST firefox-10.0.4esr-da.xpi 240325 RMD160 8d13728f3c26ac9cad2fcd5170912fd7e850feeb SHA1 51b77dd9bdd4ef508cfc7cc5a7d0f0fb8ebe8dd7 SHA256 f74e8887e08891d1f2527bb188c95de4e7d4bc95f29359e5eae8ee057d018281
+DIST firefox-10.0.4esr-de.xpi 249295 RMD160 f921c147fe1f765d515121c6e88165f55fd96363 SHA1 5e468f1bd6b042408d70d274e7d53c552490702c SHA256 c4da00e8bde6ff621f15a365771a2b7546a53524fc411564ddbb0e99d0eb32b3
+DIST firefox-10.0.4esr-el.xpi 264377 RMD160 4efbc481ef5a896468a44e4a4a2d4669bc05e13c SHA1 b642bf681732be60e371c3872aad621d30f0b479 SHA256 44049d0af162f864b71d8ed18e4e9f8870c0c12197bd5777269fa89e5fe0e454
+DIST firefox-10.0.4esr-en-GB.xpi 231191 RMD160 d2f04b32aff7bc6e9f5c2bf522eef41f60add299 SHA1 c0e46b26fa8f5d9a718a2b475b8306593617baa8 SHA256 ad0edc140d3d2594d5782970c9bbb4b8041eef157602cb81e9d1389c6c5334a0
+DIST firefox-10.0.4esr-en-ZA.xpi 233917 RMD160 fd3099f027f0b8ecd1aa6993f115a40bff3d1634 SHA1 5e4966723235357e09de6b4651e2b49b8c9d3055 SHA256 4bab5719e2575a07dc0137f87ca12273f398262917c7ad593d2a189bdeece1d5
+DIST firefox-10.0.4esr-eo.xpi 240899 RMD160 2dfe20096eebfa44dacfdee1953ef8fa199dc816 SHA1 d541848d24caffc051dd06e9b9a78562ef1037be SHA256 19869ed03e9510dfeb0bd2460aef718215fe6256b1a2ee852bcab9f0770be5d4
+DIST firefox-10.0.4esr-es-AR.xpi 245343 RMD160 09419f21db52153eff8891cc4ba53c92f66f07e9 SHA1 711faddfe3f76b84d580343485c53ffd9ef635d5 SHA256 677ba210f3365cffe4463d13b074a81495e71cd8f8b89b0392848ba6ca4f2325
+DIST firefox-10.0.4esr-es-CL.xpi 250202 RMD160 5d9f2024e4bc5056edb82042cf506477fd6bf80a SHA1 50d647f9a948f6510dbf564f5dcd54c78e692d82 SHA256 06e9c0a5cce1e424757a13df487faa6bbde461f25bee3d98bae35621d32653dc
+DIST firefox-10.0.4esr-es-ES.xpi 215375 RMD160 aafa00d412c10aa4436d0f497c29af019dd47892 SHA1 2a305d38f5d3163f5584310dba3d837e7a0d1aa3 SHA256 dc735944dc5b32fcf43bc4c59b4425b80b88b03b92465b93756152bec4cc10ea
+DIST firefox-10.0.4esr-es-MX.xpi 224149 RMD160 d0bd4c15c81b943fce3054313c79e2e0d7097e90 SHA1 93e96669db0e7e794eb3b8054f5159ff44f9b8a4 SHA256 59110269809bb00f29c49e71097cf82325e668a1411ff5c7281e0b48745c934f
+DIST firefox-10.0.4esr-et.xpi 242628 RMD160 462eb3b4d2676dbbb5af4360be34b0c60cfc7dee SHA1 06aa603a0abd8b26827c3087eefd2f4eb7ece307 SHA256 c775a9f2a743a29750639df3e819c71420816ab08a35b342cb0fa4376ddbde86
+DIST firefox-10.0.4esr-eu.xpi 240247 RMD160 3fe620e36b71bb92960ea8d791c1616887621fc9 SHA1 ded3ecdf5f9cc6fe206797f597109789ad8fa27b SHA256 1bbb22f8145567733dfca7c93ade6a8abd02a834ab2e046919df29b934faadfc
+DIST firefox-10.0.4esr-fa.xpi 272850 RMD160 07dd7985ec467d623c154220feb69a96c0d46f27 SHA1 c0e08d6e1607fb9a1850a0d27070cd3a66063ff3 SHA256 b0c1111e45bdff1cf1a283099d72a9a1ce7232c4de1c6e5cd93336f81b4d6f44
+DIST firefox-10.0.4esr-fi.xpi 243627 RMD160 0c167d37fe98a33126385b591d920c5818438a26 SHA1 b114f4ba4072ab578962970664c34394a8938df7 SHA256 056a3b3e5335e3b6af07c9583231ad38349260c64fd44c491dff4aab50a215e4
+DIST firefox-10.0.4esr-fr.xpi 249565 RMD160 6e2bf1c36d30426d02a931719bf2aac135bdb270 SHA1 4de3b7d308af34ebcc7dd47272458975abf56374 SHA256 cddb3616058d202b379ccf4c60c27f95fd3d31bc70157804610439752865c4cd
+DIST firefox-10.0.4esr-fy-NL.xpi 249340 RMD160 4ea4eb86d6b744ee3bc251836bda48e293fca35e SHA1 7401a0a1a1807cd4eb9e752e47591959ec571cfa SHA256 010c2c32a3427242d7ace11e7b8eb2c05f102bb0886abd2a5314e9fc34f40fbf
+DIST firefox-10.0.4esr-ga-IE.xpi 252020 RMD160 26d31c24c2f6fbe86ece1c91861c80551464621b SHA1 a3ac7a400a6e779bb0b2a49280c39e42fa65d9f0 SHA256 6c83b3e8f2c9b26d03537f75b56a719e3a2d49354390a4420509b9b952142c5d
+DIST firefox-10.0.4esr-gd.xpi 253674 RMD160 fdc0534f21d301ebdf1f128858296009f638b918 SHA1 533622dee6777d5785646ac370d74288f6beb951 SHA256 89dfd1c094b415beb34e7bde8964920e97c1ffe9e2f2684322a517191676adb3
+DIST firefox-10.0.4esr-gl.xpi 243247 RMD160 3a252c6f9c9c927150e7be0bb36eda52e4d54382 SHA1 bcb54818c10de075133af2e2d2f9f61d936c79cb SHA256 2a57e3d26a19ab8134467b5292951f112c9ff2fff037b56437660495c701a964
+DIST firefox-10.0.4esr-gu-IN.xpi 275219 RMD160 a3bfd5633aace7469e21b388f1e83e9404f75217 SHA1 ecf5b3bdb17a538c3b6beab2ab73ef41b0896c68 SHA256 65dca364e03d29028a61ff8ac98e5ba5303c49f174b967038be8c163a6bef916
+DIST firefox-10.0.4esr-he.xpi 264932 RMD160 1598da719da294f5689afba9ae916dd7944da947 SHA1 08d2423a019e903f3018c18ecb7d5bd16dd1d06c SHA256 ab92ccb00f750d2a8eca49671dc87ece69f02291ba5fbf38c775ec9f78e369b7
+DIST firefox-10.0.4esr-hi-IN.xpi 279998 RMD160 97b62a335a939e81b473281fd0df9407dc595a7d SHA1 da990408872ed366d263d6c2230843de307693fa SHA256 5faaf108c5183f81e976c29f54ebb3a02e8e13ad9832bb98e34eb2f51057a6b9
+DIST firefox-10.0.4esr-hr.xpi 249330 RMD160 c76096053f7d71cfef1b700a9226f8a034c4164e SHA1 32afb617eda93ef2fed5936db1c13756818d9f34 SHA256 4804c901dcdf70d4ee147acfd91575548f6a76226c4fba00e4574d96ad484807
+DIST firefox-10.0.4esr-hu.xpi 253771 RMD160 e42f3d233da092cbf208ad13ed30f5c688636ba8 SHA1 0e764a197ee45827908ae6395a643b9b63e8818e SHA256 b9dda9541afe4eaae3234e50558c469f0a567b4c5e4b537d554e3fb4c38c4831
+DIST firefox-10.0.4esr-hy-AM.xpi 445449 RMD160 55bb9b76552899a5abb6ba9f89729fa50387e264 SHA1 55b2856d47c75e0b5a4c12f524a85f2f033bef89 SHA256 11c7e5500098360faf71ea932841b7f49dd02ce847fa2b4971228dae904fd9ee
+DIST firefox-10.0.4esr-id.xpi 236821 RMD160 595f2a771c94f9e1fd9bb83b861bca8da19266b3 SHA1 aaf4f59a56249651d177e703755aae659c35f574 SHA256 15f899db6963b3ce456b08b898f48691e6d2d7938120370d3ebedbea05cac789
+DIST firefox-10.0.4esr-is.xpi 243065 RMD160 6b6bf0da686ce3e8497986587ae5398f196639f2 SHA1 dc4e7a29cb6a018a99286f91148d3385d0037d19 SHA256 600cefdc4fe5ce693ab59677db88b6fd42cc3fe40d84d2c5c96276c85cf0b89c
+DIST firefox-10.0.4esr-it.xpi 212714 RMD160 c92a0783ad7d68872ab31aedbf40c07ffcdf05c8 SHA1 f4b40c62e495170be30ca8b5755a4b1fa166f772 SHA256 7118b065151879a8efb5b2194b7084a4121755845711be250b7657e3bb989220
+DIST firefox-10.0.4esr-ja.xpi 273112 RMD160 5159ff5649580f005c0c51c634bc7cdbff45750e SHA1 f00ab15d4ce133785db2ed6bd62d6664bff1ca92 SHA256 b929980df42ee72f51521b1c42d6e3322c22f4231ab91dd48dc7960b37bb80d6
+DIST firefox-10.0.4esr-kk.xpi 279774 RMD160 ea55f176f2348c6fefe9706c0c850e750a8c5041 SHA1 4c153aaa4c239d7622f534fc43e63202fba439e4 SHA256 388107619d6d8490aa7f57406a919a997aa9825012fd47b84b1265c0adb996b8
+DIST firefox-10.0.4esr-kn.xpi 299828 RMD160 47ac91ea12a0f1adce296a514191bacb8669fee3 SHA1 699560f23174319896ba53a19c8ff930ab7b6848 SHA256 21ac7b0d3441d7757a4e7c33266998c924f14747da95b44f20a6906b5b4f56f4
+DIST firefox-10.0.4esr-ko.xpi 227940 RMD160 b52cae5b6bc0f6bea83d1c7bfb37f0ff903b41cc SHA1 dc83a4c75b1e801c52b48c6e9fa34ffe29ff63c6 SHA256 98f2ac793628cd93f3f86f6c9be2f573fbf58ff1655061681aa89b9a45d84fd8
+DIST firefox-10.0.4esr-ku.xpi 254707 RMD160 58535e55c0f610c5475b2189128398a357f01f2b SHA1 897751d4ee736b0417024152712595955ca0fc09 SHA256 45ec44785bd6af66454dbe3be11793bdf90eb28ee3df5ddde3f990c004f4998d
+DIST firefox-10.0.4esr-lg.xpi 247671 RMD160 737e1cec1319fca4342cafe1628fc13c3dd7e613 SHA1 36694a659ad42ff5589abe8e53b736c65c998303 SHA256 f4b39c662b95e1c0c4c470c7e1202ff409023b8239684b54e089d526a7ee4420
+DIST firefox-10.0.4esr-lt.xpi 330628 RMD160 3bcda40c432e5a7c4740947006cfd9f92feba582 SHA1 cf1e679974aa3b15625e3d33de901ce1f2d0c5d5 SHA256 43e5ab0f64a314e9da3f78ab2383ca9a998a1130ca005cd4a51316c729e06c42
+DIST firefox-10.0.4esr-lv.xpi 244349 RMD160 a734f8666bfbd6ee6214f36e7a52f5a1a05d755f SHA1 ca58959ec48ec5911f43e0e007400fb0eca603b4 SHA256 5169752cc649581f11a6dfabbe41a0698cd7708e55cd60f1d9a6126b362ccefa
+DIST firefox-10.0.4esr-mai.xpi 279251 RMD160 7bf6bbc7837b278b6cc4c10a05d103a3ff51b852 SHA1 db250ef7fef28e88a9c9b3e7297f5028ce572eae SHA256 45dd7cfb023a9ece20faf94daf43b6399586a69dba16404bd0b84109bd08aa00
+DIST firefox-10.0.4esr-mk.xpi 272936 RMD160 55e4911bf2005be3eb72227351d060bcd2696ae8 SHA1 c8af39466916d2ff7c12a471c650be9592988b09 SHA256 648a913256a64ce445cb8ffa4c53dbce635af451772c6cbc9c227bf48446e31e
+DIST firefox-10.0.4esr-ml.xpi 306673 RMD160 f9e78dbc2890bac47eb344acecaa3217758e9b68 SHA1 a98db3a820eebe30587fed78062dfd3780070726 SHA256 00795d1bab6c8dd1a41d051f3f8c941bd2d70d3d0546650fea88192bc6f31db7
+DIST firefox-10.0.4esr-mr.xpi 281455 RMD160 0f84d25c4aa2f14e2a813957b13e5f23a8081ce7 SHA1 d9de9cdaf6dafa7e9bb62b31dbe84d1af4980532 SHA256 045809988140f7c7df532d695f5a98afb87dab4d9cd69af3ff87e7507e97e103
+DIST firefox-10.0.4esr-nb-NO.xpi 241208 RMD160 f0b18aae9d9c7f6b4154ca47aec1606223aba931 SHA1 966e47176ff80896345cf46558301903ded3f31b SHA256 319f21a013aed41faffa238b5ec569b7a7bbd05830763e9befa8e8997b433bc9
+DIST firefox-10.0.4esr-nl.xpi 242398 RMD160 877fdf65f1c14f3848881a5a9f9d5705f447975a SHA1 5138313682775e5787dac4f89f977bd86c99d4c1 SHA256 30f29b6c99bf6b361ab51f097720c938c5985f93bdb22729f1af40ce84d6d6d1
+DIST firefox-10.0.4esr-nn-NO.xpi 242451 RMD160 aab164940f8c497026d46c7ce41f8576f6166694 SHA1 a2a829af14091a073e13129bc3cd9bd0f25b9462 SHA256 eb0fd49839e38fd06a206241261ec80af54f9478ea7dddf62ae43f685264722d
+DIST firefox-10.0.4esr-nso.xpi 245692 RMD160 7b0fe1cac7c5142b9e772349e294320ac6ba1e04 SHA1 b9a6c091a6c4c0faec7525b79dd1628fa8dd8004 SHA256 91062d27b1d6e53001c2cc3df61c6dbb79a760e1d6fad63b019f142216b40d60
+DIST firefox-10.0.4esr-or.xpi 281684 RMD160 684cc35f7101e1a678782fdb9672649ab0bf72ac SHA1 b9685b76f8920207eae93cd1296c460dddb46d2e SHA256 da63d476209fee28fac311a532761f53ce38942f5c8eca32c23ca94bc464487f
+DIST firefox-10.0.4esr-pa-IN.xpi 282142 RMD160 9b22bef2cbf1a6c6bd36d5d3e903764b02266f05 SHA1 e14ece60b96b631836b896c100802dae5e80ea2b SHA256 f58c26374beaa43bde80624a553646281d0471e0ea6a5e14365141a415940d54
+DIST firefox-10.0.4esr-pl.xpi 252043 RMD160 d3c8018e934f0a978c01dcd4802dfed01617a810 SHA1 98bb2ea94d499c4b4f954aa350bcb4a821abd8fa SHA256 e5c0523fcb8b7d6bdf877acbc13999d685f4fe1af361d4713ad46df057b3dd57
+DIST firefox-10.0.4esr-pt-BR.xpi 246845 RMD160 4d61571744c128636126ab7bc471fb22a6b4b047 SHA1 c537c27dbd34588d03df919f572117cc0d8b103c SHA256 5a16ad83498cb495f47da38b4d78e03d45babb0af2b817279084d57ca1a24be0
+DIST firefox-10.0.4esr-pt-PT.xpi 246471 RMD160 2f4efc922dea62c65d201a4b4ddcad5cef257389 SHA1 c09d552f8f0c5c76acfb7b92e934cd8f409b205d SHA256 0d905cc55163c4f22260b368118c2e5a4bbda94fabd298da0adc66ad903571e8
+DIST firefox-10.0.4esr-rm.xpi 245768 RMD160 b52ce11966941c368a83fa5df9b4bae87ccfc871 SHA1 aa8a93acfa2b5d5bf167602f043b20739c161ca0 SHA256 eda7ec6d1f2a4af0cd4d1d3310276305d86de6b0adaccab11f041e03ae7f0973
+DIST firefox-10.0.4esr-ro.xpi 263249 RMD160 dc658987f312e5b8db80abe03baf1fac41e1da46 SHA1 d4489f5d7e19c68d1a42af59d093d165e232ceda SHA256 13760bc76e3301d88d38159450062224ab849f47070d3effb16e0eea45666c66
+DIST firefox-10.0.4esr-ru.xpi 254982 RMD160 17ca10c744ee0717a9d8dc45740a3d1fb67367f4 SHA1 0c868968a3b95eb7c798676459fa85861d23e7c8 SHA256 a51ee9da4dae375a459dd8ffa402a57a335c19102f96fba4dacd24fbf4e691a2
+DIST firefox-10.0.4esr-si.xpi 271987 RMD160 9dab98549c61f26b58fca4570b3311dca5680f69 SHA1 e87f8dc36fd72f9bac89af26cfefb31126760acc SHA256 33f0838a17e4bfb9a1b94184011f40e4cac316c48cc92d9fa84caeb11c44e422
+DIST firefox-10.0.4esr-sk.xpi 254286 RMD160 30ff0b9086338462bc299a31e40ca9c29c9cd95d SHA1 3f92e0619dbe23b073ed8a39175dcfda20b84bf7 SHA256 fc8d6c7b040828946deda2cce08647d953cc6b4962e3e60dbe153d89aec2741e
+DIST firefox-10.0.4esr-sl.xpi 241031 RMD160 d8491be0b8517c440f6093e0ae97f1e2a0d56a2f SHA1 156995525dae36d07c738ab6d0381bbbc4b42e32 SHA256 99e5b4936817aee29a930aa07649212868bf304b2f00c1a1119cebb5f24402e3
+DIST firefox-10.0.4esr-son.xpi 239057 RMD160 442721aaa6f51cd54567e3ff71ed9ac6d6e7fb79 SHA1 3d839addcca49ac7edc59c1c560b949e32088a4d SHA256 36970881af28cc5d5f0085aeddf4f8fd62a8d69a93b32c075756b4044e19c356
+DIST firefox-10.0.4esr-sq.xpi 227693 RMD160 47f8a72b1575baf16e9073e3e77654b4834be151 SHA1 c8d7472a865e8fb8d15b0a497487f8fb6ece51f9 SHA256 b8e5143f0391dbb2719a1f4b2dfe285d821d10929b774180764c86c1e1ac91e0
+DIST firefox-10.0.4esr-sr.xpi 277743 RMD160 b685b6a097184f0304f97b083ba6cdd81687555e SHA1 9b5ae0564abc6d97dab7eda2774fc089407aff00 SHA256 30055512a7812cd19ed88ce4c864bd76d5651398fae04958b8c0272f77a65fce
+DIST firefox-10.0.4esr-sv-SE.xpi 278877 RMD160 954a59a6dd95856cefe83d50c91e32a1bd4ee6f2 SHA1 df0b8dd862fef07a5ab2386ae8e62258be2b79bb SHA256 2f077a94bc2348255271cdad2e5ba7b87077444b345029b9e3ba9a7f30741ffb
+DIST firefox-10.0.4esr-ta-LK.xpi 290616 RMD160 33b0ea12eda629985c8eee45e7a1d0697f8c6cef SHA1 68e4e34edc4d966b4e3d1dc7a133f33586d246c4 SHA256 e6b1c89e1c39461402a95b66df0e116702654277eee376d08baa9008723ceaa2
+DIST firefox-10.0.4esr-ta.xpi 274052 RMD160 2204311813534d2555dc87376416b1221af48ead SHA1 c7ea6be9e83d0da58a88d3ff74a4ba0ac1556792 SHA256 977a0f0880b587a75affc15924cca25bed7876f628a1308d579cd273c46e748a
+DIST firefox-10.0.4esr-te.xpi 289043 RMD160 a74230f1684fb2b967f57d591d2f843064dba507 SHA1 241cd92879a97ffec7ef1862574fc93fad6c5053 SHA256 1cf73e705370503df7315353a589ff719046dc03b316487389bba54ec67b580a
+DIST firefox-10.0.4esr-th.xpi 272418 RMD160 d320851f4e6b4499c204b2235903828b8ef54e2f SHA1 598e4a74003e4ba057b83e1c590e775fa49ec23e SHA256 3d5ace42b2f7bcbd0dafd013e77478df67b645105b4fc8fa0e70803761d7d133
+DIST firefox-10.0.4esr-tr.xpi 249915 RMD160 c85216ecbaa925c8e842cc66b49565f490e8f810 SHA1 0053f574461a47879d37759fd64d0c0d878ed917 SHA256 86d718c4721cb945af3e3e1e66a043b142298533272692511c1ed1aac9f42a02
+DIST firefox-10.0.4esr-uk.xpi 279130 RMD160 7ab8ba6dffc6802010089bb654c03d482b904ce3 SHA1 b14a9ff70d0b0398c5bc8e6512552657467874d2 SHA256 e134316824ec76efa72907d80ba98e97ab19bed1af7b57728f704fbddff06349
+DIST firefox-10.0.4esr-vi.xpi 262783 RMD160 d12f5fede1fb35ed0859d9675e15b342a7d25ef6 SHA1 eb10befffc8e440f7d89bd37c4800766f9479690 SHA256 9ca45a0eda9696d8769f26fcd9fbe4ac84af7c60e905156a57368a4db3bae74a
+DIST firefox-10.0.4esr-zh-CN.xpi 256544 RMD160 0d2102ae66aa03fd11cda5523e83a20104e2ad04 SHA1 15a759f3a5c16f356291fc2d15fa91c469f9f508 SHA256 57c7767969ecdda513cec23a540488152369c6121b8091941255cba64f45776f
+DIST firefox-10.0.4esr-zh-TW.xpi 257489 RMD160 130fdc757225a89c48b3caaf7f2b85ba86449281 SHA1 a8c5b5bc9939a8ff75311ef961b51801c8442b76 SHA256 bb0b95ca4a489178f0e0f765e5d166bc853872878f0e3ed1dab95ccd68194634
+DIST firefox-10.0.4esr-zu.xpi 246392 RMD160 899747d1c870c22b5b1bf6da0f05b867bd196a54 SHA1 da4f9069a24f47af48b189cc0a4c96e0d869c23e SHA256 7467cae292d3a13976a1e7b8f3526474e646fbeab17ca378c38b923b7530e59b
 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
@@ -336,9 +420,11 @@ DIST firefox-12.0-zh-TW.xpi 267735 RMD160 937efdf1bdefffcfb514247bd2779fa66fb1a2
 DIST firefox-12.0-zu.xpi 255708 RMD160 42b5013ff842ed74bcb70bacf338b6239340a1c6 SHA1 4ac34cc274ad7a94904f05bb768d8b412bf72ce6 SHA256 8491b0e6c1f4b5dff38f715d38c44ed267816bb053149193d958c43b6ca65bbb
 DIST firefox-bin_i686-10.0.2.tar.bz2 17161122 RMD160 e3fce6dd99291992404cad53eabc4f88e58405a5 SHA1 ac20698ca1152dbde724553652b7ecc1ecfc4c00 SHA256 83b13b3b00bfd146f40c9795112582ebb10db6a75b5e971065283f51d7ea7aeb
 DIST firefox-bin_i686-10.0.3.tar.bz2 17295626 RMD160 79e8e7134545cf7d6a66ff97fc4a8298054c0c1d SHA1 6165f2995ec9d9b500298c94c48580e3a252ad41 SHA256 bb62a40167699961e8acf0e658cfb0b759a6f3d96f6db4e658f4fdc8bd1f72cf
+DIST firefox-bin_i686-10.0.4.tar.bz2 17298473 RMD160 7ccfe8b5f32f455503b001e1f082648499b481fa SHA1 5b34c3e24c57a65afcc1c778c4d284743d69553e SHA256 5a0ca703cc9fed4c02dba868cf99101ca7110a77540f3aba00b44907c686d0a1
 DIST firefox-bin_i686-11.0.tar.bz2 17693756 RMD160 6e8dc0781d963434178abb588f6c297482634842 SHA1 96a44eeb3076b4343b55cb21bfd7cd6fc59f5b05 SHA256 26683b58136972565d05a6891687a5852c0a624f312d36d2e857bb9068549fb2
 DIST firefox-bin_i686-12.0.tar.bz2 18008340 RMD160 4932efa73b5e6cd09c3a9600fc367f96d2887c2d SHA1 d523fd9bf0790fdc9737479a59f9d5be86f839ab SHA256 8c0966cacf8733b09b2bd8d03637a4e50f5f1be71c3cc6b3e4f8d4c8f883c46f
 DIST firefox-bin_x86_64-10.0.2.tar.bz2 18876985 RMD160 b7884e5f83ab22677f55270fc9122c3e34149043 SHA1 37afae1f49427f3afa2c2a0050a26399c805991f SHA256 5d55d50340e4315915662638fd5ebb9e6b2fc09ff725b668621ed0e46d71cbbe
 DIST firefox-bin_x86_64-10.0.3.tar.bz2 18994450 RMD160 b5b46452da44a267ef847177b37ca9baa479e3d4 SHA1 7994194ed06a1bb4e38c3a2180f557323c5ac6de SHA256 c4ae7a11d10b28645bb06d4e7462f69e272896c5acca263e12ec848ed1925fb9
+DIST firefox-bin_x86_64-10.0.4.tar.bz2 18966436 RMD160 c5ecdff31b780106ecbbd6b1912e4ef1040e93d4 SHA1 6488ece42fa46030b4826bd8f9ab9d22574c5f7b SHA256 80c33709513080cb9519383044986b6309d95de6b663035a249b76d3463bbfdb
 DIST firefox-bin_x86_64-11.0.tar.bz2 19435299 RMD160 dc644c60ebcfbf4a2978f9392fc4e8b2ef5c21fc SHA1 299c39757974876a28ed504794f74f865275be01 SHA256 ed1a5a1d6abf4b7a2cb6bb5c4dd77c8364eae46bbc7f65751a9c07998286a046
 DIST firefox-bin_x86_64-12.0.tar.bz2 19809672 RMD160 024e270d7368fa33211a21e36ff849e710f6da40 SHA1 1ab5d810eaab0861b47bbdadb9de0b9b0449a21f SHA256 443e6c56256432f816da941cbd372d5037a7872cd8b427c026cb8fcb981710b9
diff --git a/www-client/firefox-bin/firefox-bin-10.0.4.ebuild b/www-client/firefox-bin/firefox-bin-10.0.4.ebuild
new file mode 100644
index 000000000000..225c256bf46e
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-10.0.4.ebuild
@@ -0,0 +1,145 @@
+# 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-10.0.4.ebuild,v 1.1 2012/04/27 03:00:36 jdhore Exp $
+
+EAPI="4"
+MOZ_ESR="1"
+
+# 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}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+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/firefox/Manifest b/www-client/firefox/Manifest
index 80e8727b99ce..e480508d30c1 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,176 +1,4 @@
-DIST firefox-10.0-af.xpi 238739 RMD160 9b77e7db501e513103fbf6603a92b0251de38492 SHA1 6a61601bfb4462fba32213fcbcfca8d5098e1e24 SHA256 e419d5f34ee8a67086f7c8ecc6c38e16751edcdcb059da1605d73bf4d3cc689c
-DIST firefox-10.0-ak.xpi 240567 RMD160 796338e3acb26f8ec688d969dcad21340a0f56e1 SHA1 ea3121fec45e6d7c5f9d018ec548fd894ed95db0 SHA256 ab8d3186058316db4c753df519f3273129647e793df629c2433319f71d31efe0
-DIST firefox-10.0-ar.xpi 263698 RMD160 31844c6de8b55c0c692b65c29f4a0e63cf97f92f SHA1 54736d53dca221528bc54ff957fbcc9fb7d89275 SHA256 66f75e75a8be460bb781f463f57d841c2a40722eb1dbe55b12355f8fda203bfd
-DIST firefox-10.0-as.xpi 278739 RMD160 170c8c90c57337e86108f826301ac097942de882 SHA1 45b806470f037566cec56b587a0a6ad4c68fa8db SHA256 d6fc2818793e05941abf0a1e56cf252136a38c8e15517524d96d805b8d6649c3
-DIST firefox-10.0-ast.xpi 237971 RMD160 abe5cf59a5b5b357d68cbc9b144b1e5dcec7d1f2 SHA1 7722618ddb747a487d934d9442228fa91823ca1f SHA256 af50c98e02190c14e5914c23f12150c67982c24a6bf9df23da074f0baaf38c88
-DIST firefox-10.0-be.xpi 245752 RMD160 a848ad0e0e6c31e2168d29e68e8687606d39adee SHA1 51227dd335a3427fc87dffce0616dc4f7c8ab4a4 SHA256 2d3e67b12cda59ce1e024034304cf1d2ce5b2dc17e0c4e7fa603cfcac7c0b1dc
-DIST firefox-10.0-bg.xpi 276751 RMD160 a11efa71b03f6e8bdeb632003e531a85e2d6298e SHA1 cacdabb2cb1a705363c270857f8bcef9f11a9206 SHA256 c9ef8926176909a11197b192b8be4318e6df445b1cb977e7e498676ff398a06e
-DIST firefox-10.0-bn-BD.xpi 288289 RMD160 2827a6e92ac24453b37970707aea39857c398cf0 SHA1 251932a6a78dbb39f3277c55d152ce419f8eb33d SHA256 e9bd2b31895528083a1d890936a59f2f9af4acd3787cf19888d4c6516bb48aa0
-DIST firefox-10.0-bn-IN.xpi 319301 RMD160 dc4f37859772a1fb448d9eecf412a6425cc4c83c SHA1 67a9619480844e62a779068daec69e192d5a365b SHA256 815bf0843e5aefea7910b2a19ff2bb99deea26b592be79d18edab110037fa805
-DIST firefox-10.0-br.xpi 247646 RMD160 e2a9a0bc36bf8aa9f16955fd942e154818084d3e SHA1 fbfff4c8ba45c6cd641d4a17b1520632eaa78e3a SHA256 13ab40e8a47e7cfe6d8881f1da07969850e18d21ac31df9a6678205090f9bb24
-DIST firefox-10.0-bs.xpi 245304 RMD160 fc0a3e67c25be57f5068b8ad98240552b3980beb SHA1 c34fdea642420b11222b7a6dac88c176402f18a4 SHA256 c2e1b83bf1b8b233ad925dbce6d97d9df4656c31fa55edc5396d2c116ad7c8ef
-DIST firefox-10.0-ca.xpi 248217 RMD160 ff53a5eb296086ec03883ad3653584276eff8437 SHA1 a756aa02da9138a005187abe0fa8102b75117ed2 SHA256 84638daa9924e47603c776f1605eb02defa33c0bea4e807367e17fed3826b97c
-DIST firefox-10.0-cs.xpi 248765 RMD160 ab064727b68962b52970a39f174cec387d3706f5 SHA1 aa012f8f616c4647ca63e01e99a46178de35ece0 SHA256 f2f71eff2633771169f2e79ee33b5b70977b8f3e686efaa43356bdf34408bce5
-DIST firefox-10.0-csb.xpi 266620 RMD160 0591e52516c307a86e7a4a92f8cd61ca7fe394a1 SHA1 597d6e774637068351e8ea4fa99216bb6ea8fedc SHA256 a856baeef1c3b3ddd0d8998635e62ce845a52e0650a5ff8df93e4c2108fd9928
-DIST firefox-10.0-cy.xpi 244193 RMD160 0b32a727490fb119fa50b04e593e415b980b25dc SHA1 84d09757a05444ae78b4e4c2ef05c9661eb36bce SHA256 289de6cd2d4dd4629e3944c79f1cbaa13fa8ed20d480aae75c58bbf3379316e6
-DIST firefox-10.0-da.xpi 240324 RMD160 e0c0bb1924df6c2820b7405610d61f9cd7e202ee SHA1 c62e90f2eaf268ecc89a3acccd45d2812432739d SHA256 032d7421b58b11f0c1c581fc241c14f2ee709c8e4f5683ac21ad3b4e4fb5791c
-DIST firefox-10.0-de.xpi 249293 RMD160 800602c6688e7785abeecabe88f61bbd3acff993 SHA1 cfff686c19cc17abbc44fa3ea7e36289a1e06e78 SHA256 fde6375fdc2f5b1b281c85342be23d04bceaa5acac49012de14488da6627cfd5
-DIST firefox-10.0-el.xpi 264376 RMD160 5d1cff6c58f8c7615da2ac04186286977fa03d07 SHA1 96c72891ebd71dff34c04b96fd3c20886fe669f7 SHA256 6003a9b187b8985dcac466e06dda7e575b19ce59fb4fe88d6e03392ca3831a87
-DIST firefox-10.0-en-GB.xpi 231190 RMD160 49fd8eeedf0fb708bdc38c4aacf7463c27378bb9 SHA1 454f35e325669efacde3d6b01de4c08f4653ed81 SHA256 7ef09a904aca56d2e6bd13a53b170668895b94134de201d59b1bfa0e0f00fb27
-DIST firefox-10.0-en-ZA.xpi 233916 RMD160 d9d24cd4cf71f421651448d08f0911ebb20ab7f4 SHA1 af1759832140391ecd056d12da7f548cf2613b8e SHA256 42b33563af42842b2ecbf9bbc6bcfbc99f39dc5f827b46a323dd5cd466083c56
-DIST firefox-10.0-eo.xpi 240898 RMD160 1b6b9b9c808ff1fb5599a87ccc715d847e30a01b SHA1 45c8aee52e29468ff96cf37fdbc3c25a04bce77d SHA256 6ad27f6e7efe5648f085e13c40c28ce85d78e55649b48d6696fb5dbe39bb9106
-DIST firefox-10.0-es-AR.xpi 245342 RMD160 312627e1c05fefd0ce47f7ddfcc2048283245884 SHA1 184034daa35146c3083c64dda96f507b1ab1ad0c SHA256 1e86fc9a3f8ec0d2bf97ea550cc78756d6a163261013203946081cd5818b29b6
-DIST firefox-10.0-es-CL.xpi 250201 RMD160 fe2915286f652bcb27b3fc5cc683544867d46215 SHA1 915eb9e17f76b72bed30e113527a0c534ea44701 SHA256 19d7f65af4a154fa47e75ef385d5fa0b7d70ac4fd2fe2a6e8ab6c17a3b85facf
-DIST firefox-10.0-es-ES.xpi 215373 RMD160 5ac047198170df1a76265bf6cf00a0122d51d449 SHA1 9148d5ea5cdbf4fabfb2164c57682cd83f447519 SHA256 386d304f2a94206259f99b575f231871fc9d88bb44c0b472106994dd769581e6
-DIST firefox-10.0-es-MX.xpi 224148 RMD160 d4b01faa5fd48ec8ec2b945a3b6c01bb11069415 SHA1 5b8b3b30918a7da3e3dc8278de742033a8dc5305 SHA256 f29450776c4e9878f5a937c908f7713fa2b432d6782ceac29e1059f3a5feb7c9
-DIST firefox-10.0-et.xpi 242626 RMD160 91287ceab7ee6d052ced23ba6e097897fa7afc71 SHA1 aff5f57bcc6a620966793ec4911261542a7e1b0c SHA256 b1a810692c197274255127d27bf0361e0a85401ec2672607a0e6520eb757e4ff
-DIST firefox-10.0-eu.xpi 240246 RMD160 a6d86bf1beb0399681a39da5febdb0b645190393 SHA1 88686060c226071769288dba167c9e0ce3f750fb SHA256 13cb5c9fef31bf4b744dad19fc6b4f32f8e8a155f6ced4ad1f02bf04900a80a1
-DIST firefox-10.0-fa.xpi 272848 RMD160 13bb195e818ecc828fbe19a3b3e8fbdce32eff9c SHA1 880e88d35f8ae6829235325c05edef0cc7ab57be SHA256 4d8b4f9e516343e7881537ce8f58a4e757c060944968118af2e2fb6e42157c27
-DIST firefox-10.0-fi.xpi 243626 RMD160 602c58ed67e3182b3a8561be0822e41e38098130 SHA1 6db60945e42d9b1dcffd7ba9d2181d4ed9a8ed62 SHA256 9e9ba81dbae92cf030a2ba59ef6c7e04bdc7adb2e5027fe4d8a27ba42e691a82
-DIST firefox-10.0-fr.xpi 249563 RMD160 b0609bf4d422c1af64638c53fc9b1818e49a4d05 SHA1 38353ed49413ebbdafac03c8705158d2ee6f792f SHA256 acc44951cabf3793ddb11278f653a2e9a72deb2e74c3765c8e0a0adeceaf4b76
-DIST firefox-10.0-fy-NL.xpi 249339 RMD160 017c14e7cf0b763f06f3f7d4c76cfd0f0f6c014c SHA1 811756fb2e747cd83e28db242b17e3bf85a6443b SHA256 36ddf85c8306e31fba5cea7ebf1996340ab3c3be6e3bc98534126c00c9655ab1
-DIST firefox-10.0-ga-IE.xpi 252018 RMD160 587c68acfab4f2d833b72750edc2aa6efb38147c SHA1 d1280e88f3594ffb08023afb981eb7a777de10ae SHA256 6def59c9a117f0b432877c837319dab6ad9cd663358ef35f14811bc9ce410c05
-DIST firefox-10.0-gd.xpi 253673 RMD160 d5fab58076c825cac3d581375ce294a161d5f0d8 SHA1 79d65cb7036978ce4ff163498b749d8f1e48f71d SHA256 22efea814885b9836bafa3bb6c04d8f4bd81fe172a3739cc30e6400005c17d6d
-DIST firefox-10.0-gl.xpi 243245 RMD160 2a958ebad1914ba596163515d42da5b0846249a6 SHA1 51035c446f09e5206a347890a203ae1c11249e4c SHA256 a232e94583837f3d03b8c0e891e3eec727a85c7ff0189520de57f370f26cd708
-DIST firefox-10.0-gu-IN.xpi 275219 RMD160 940adc11300ce9e3a63762ebf8ebcecf96bb73be SHA1 5f79b2b78e6afca95658e4d5cc83a302939a9bfb SHA256 5c0531e22bb371e113bc49e726e6f1d2e08bf1f0f5f9ac4ca1af53b748380a88
-DIST firefox-10.0-he.xpi 264931 RMD160 e753c5f2e4a1eab30dc070df3e72ef49c569c2ed SHA1 62f731ef5c4cf045a3554d54c9bcaef089ab8658 SHA256 7b62e1984661b69a8623c33e1024c4f34fc674e93118d1c025dff281cb76f345
-DIST firefox-10.0-hi-IN.xpi 279997 RMD160 174d4fef10759c5a1f4d5265ac69bccc71527f9d SHA1 d9e230857cff5c233f706405c8f8120c181ab2db SHA256 5a57093851b75a1b3e63a506ff77fc582debe3e9661950fda3d88247afd68f51
-DIST firefox-10.0-hr.xpi 249329 RMD160 13e449b810f0ad09dcfe66e85e37578436da0689 SHA1 bbef3548b02c9a2c6360ee3cafcbc38782393eb9 SHA256 bee304e8224e7335367abfccf9601cbf0ccd55a48e773ac35a8f74b50596b1fa
-DIST firefox-10.0-hu.xpi 253770 RMD160 cd279772e978833708f765da4543e78e232c64e0 SHA1 2e709bfe3bc643f137b95e26ed07505dd20a7f19 SHA256 cf0304236f769babdf3bb681690b0ce70f04da52eeab255c1a0793856041e71d
-DIST firefox-10.0-hy-AM.xpi 445447 RMD160 0b6037882880cb068d053beb78652c1dad635524 SHA1 bd0e018197b1cab24362b22bc86a81003712da84 SHA256 acb199c6aedc1d099f06c7e6fc133ea8023a570154484ae09e1966d612a45e85
-DIST firefox-10.0-id.xpi 236820 RMD160 589bf451cca9ceb49009fb6e16044b64a1cf0e3c SHA1 133f215900f497f6420f86221535f0de5f7f9bcf SHA256 f8d9c45d86f0db65ee41400dfcb02f3bc344358f609de48100a707c7c8216bc0
-DIST firefox-10.0-is.xpi 243065 RMD160 456357d2eb8619eefc294267382a43d0d4e4f6cc SHA1 db1ba9adcc3bad4a2e4f7af291693331a5a5f431 SHA256 0b0e84302499a51a8096940fafca2b1e09e654e3fbdbfef098c2cbdf9b973ba7
-DIST firefox-10.0-it.xpi 212712 RMD160 0dae8c4106041a07f4faaf22536eea4cb32b1aa8 SHA1 f79eab3f1bad1017544abad0ecaf94e5e25cc4a6 SHA256 d9082242820d671a99d64a40e394474f9e42c726291e1cb865daa107b8fdad0b
-DIST firefox-10.0-ja.xpi 273109 RMD160 9e44da202e120849f3d19c8858a71d10924f21d4 SHA1 f1c898b79b49d4e367813df4b2298bb73f2ca410 SHA256 220d9d749f3e6f9411fb4fdb5806b01ce594fed10d8ab7ee2ba4946a1faf7d03
-DIST firefox-10.0-kk.xpi 279771 RMD160 a3eae03358366aa39ffa84171f48a20a2f9867dd SHA1 069108cdb70997c04ca63e73691027ca40b1fbcf SHA256 ce5d5d968a06a6b9feca037f377a8f9645b2de146f6085c875d195955c2b8d60
-DIST firefox-10.0-kn.xpi 299827 RMD160 c4c3668c3de4a0eea1b9d571afc4d785005d1e16 SHA1 e9fd274a8b221dcbc46ade417ece585f69873e4f SHA256 e442281fde1274d329907c7d05e99d37dd8d049e72f8bb5adbecf318919b2aac
-DIST firefox-10.0-ko.xpi 227938 RMD160 1c96c03d03dd825a70c0ed2a4857d6a7a386a797 SHA1 f267501371358d5c18b7fc1a810c6bb26f18d2ea SHA256 2e9995e3589c1f5680ed1987b609b69963f2db2d7e1c61e622e0b2b5aae4f958
-DIST firefox-10.0-ku.xpi 254706 RMD160 61c9b84025fe506050fdf8ddba877c7248da0c98 SHA1 af9304b8ca8f86ad501df644c1098684271ca3a5 SHA256 25bafb95054877bb797d8e3fa4ab886723d42cad8abe409f54eb8bdf44e4d2d2
-DIST firefox-10.0-lg.xpi 247670 RMD160 1d1a87f40e96378fe9bfd09da6f026145e4e33d4 SHA1 f891fac7a696760e6a6eedeec9fe8e6697b964f6 SHA256 1107989f67e82e33c5144812c4a06147e49a404a4e0247c895a4674339e78f3e
-DIST firefox-10.0-lt.xpi 330626 RMD160 ee501b50bd27afc205e45beb00bac81534fda46e SHA1 edaa6e7bd45af20f1ecd5d258f8e1a141285709b SHA256 87131359f5fd86e48510a8579f1660e1a322af9dcd30879f82b29d9720f5a610
-DIST firefox-10.0-lv.xpi 244348 RMD160 8f0bc951709f777e0fc17bf18072c647207cb5b1 SHA1 e74372999973a08639568f119efe78747e741275 SHA256 68c31ceaa27d9164e85e36c6d4c4128b4c6a44af539c2c140fba1c609288ca74
-DIST firefox-10.0-mai.xpi 279249 RMD160 05c21a4be806b7f11bf813e1ede2e2681276ebce SHA1 0a49d09dc886b0c9f568ccb4c1f70698c529c63f SHA256 01b40b42cc4e3d213dbd5cfca571c26ef593397ea3c5fd722c2e8fb3b5e44d17
-DIST firefox-10.0-mk.xpi 272935 RMD160 9646511e68434165a92226533a18b0501aea9da8 SHA1 30e2b2f4f1ec39b1cfed8686134d12f011edd060 SHA256 1df3175984be3d66550744a5bcd634ff03a6c74eb103eff304577f71d6bd8049
-DIST firefox-10.0-ml.xpi 306673 RMD160 0e0ac243548bdd03a70b1db7609357ee0cfe37fb SHA1 eae9e8861cc060efabca761689d3b4132f8c94b9 SHA256 c71041c50a79348a504198c4deb4bc3dfeef9d19a0248e8a2a83b7b1ec95f874
-DIST firefox-10.0-mr.xpi 281454 RMD160 4b41dcc0b49ce9a2cc14b8945e8103c892a6c3e8 SHA1 c919f1970ac339af9f676b28ae5de74939d69d33 SHA256 ac932d2d59375f9fa13964b4052e9ef8acc3fc3a807fec23876bcb532f45b21e
-DIST firefox-10.0-nb-NO.xpi 241207 RMD160 3445d78202d4d5fa40551b3c0c594f6ced4f41b6 SHA1 7909404edf9cbd78b3af5c4b426c7185bc3710de SHA256 674f3493103948eee6e30d5ff1e8e156b1accec6a9dd8a8a5bae9df69a17db01
-DIST firefox-10.0-nl.xpi 242396 RMD160 8937db370edc021e0e951d3c762feca8aad756a2 SHA1 33f374265a13ad68c1ecf7449d38e440436f7f6e SHA256 6a643bed7b2922532ecf2b85982560efde355e778f678563cc95dae3f5adf539
-DIST firefox-10.0-nn-NO.xpi 242450 RMD160 b87038b4dda04e47d2e6f49e8730c5c0397e31ca SHA1 645e63112545e5be24025c93a3cdee4a30ac9ba8 SHA256 abf67b444ffdd6f5a729b873c59e1c149a5080618df71b332e82b91890025964
-DIST firefox-10.0-nso.xpi 245691 RMD160 0489d2b34223f802307421c2e93bb4343cf09812 SHA1 896a9339bcbef4acca6e6e675a58dace3700211e SHA256 5e2deccc8302eb00f129cdc2eb1c20d103bbacef7166a2e41fa0ca3eec5ac431
-DIST firefox-10.0-or.xpi 281683 RMD160 a25c21d3c49276cda0c6cd144c1d5b7b82bacbbb SHA1 aeae592f14180a7e4f3304234c8c8daa8de049d5 SHA256 30dd1be2b2652e4e319537e6da6b153feabb38855995e1baf9bc18296bff83cb
-DIST firefox-10.0-pa-IN.xpi 282141 RMD160 2bd89cfede49be41188c254d73052f95bb0116d6 SHA1 748862aea3d60f2e84df1d7949f83b2a87a6ffbb SHA256 cb646c029793cd7a4fd99bb7d1f7a1b5607162d9b4658110de3cd71de77c5bbc
-DIST firefox-10.0-patches-0.4.tar.xz 14044 RMD160 4ed929b42bc272606a67783ea31b4562fc4d939a SHA1 09ecb7c8c06064eb1c5416ccdc5483d472765f66 SHA256 ac2ce062aa23e9ad269b4a151bebbb2ce3affcd4df0002b6dd53f0ceb52f8eb2
-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-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-DIST firefox-10.0-pl.xpi 252042 RMD160 226fdbe0d895e15f96580b1ecffa2237b3eb0ee9 SHA1 91d9a8890d30f1c99dd290c30d44106e8cdedb3f SHA256 cfc5701ac5b201f7bb84991f4829224657fef20809a15d45855bdeff82834f68
-DIST firefox-10.0-pt-BR.xpi 246845 RMD160 9067d148ec29350167e447519c277a81254b51c6 SHA1 744bfb6e788d95e3f188b3f9f36ee6be4db144b0 SHA256 36f3a97158ccd2e7188adfdce59a57fa8dc1470dcbdc19550a6c0644c0dbe9ff
-DIST firefox-10.0-pt-PT.xpi 246470 RMD160 e5d5b618056b34d618af05585aa2be8eb4b482bf SHA1 6b8a4aec730bd2ac49b87d0704fd186221e4ada5 SHA256 6944a99c3109e1efd48cd94f2c5b69ef121ea03e65380da022766880b4bf60b5
-DIST firefox-10.0-rm.xpi 245766 RMD160 cb186f396117cd5bcc0734a46cecc9f23efb9d94 SHA1 50455a3de56ae8923dc6ba2c9b060d02dd65b28c SHA256 d4bd34750507089d9bda0c2fc8bf2c44adbc0f1825eee58abbc31cadc2958bac
-DIST firefox-10.0-ro.xpi 263249 RMD160 c5fe8c891bf932989122437ff988a505a1e1b00d SHA1 d930340246b7baa3233c22f31a9518fd64a5df33 SHA256 4245664566d33441636efddaa38f49d943b7ffcca9a14381745885a43b0139fc
-DIST firefox-10.0-ru.xpi 254981 RMD160 c3528ebc2af5a044407f18e0ceacb7428de1ecc2 SHA1 43481b85aaafede1e22321b3da4798e322bb1b07 SHA256 7a8bd29cf23d0b3e56c9659118521fe90af5e6dbd7ec79b0322f18d6bb086c45
-DIST firefox-10.0-si.xpi 271986 RMD160 fbcec82db83a9b8ab5beaf822ba61eb1f8a6d7f4 SHA1 d3f3881b1baf1e27825be65e19066c0a3e3c70f6 SHA256 38957baf1359bca0f69015312918267aa30e72abea23ef2eb0ea6f7a54a73321
-DIST firefox-10.0-sk.xpi 254285 RMD160 b08cbc5bccc2c7c1f9b5505af1cd78e405dab5db SHA1 1c39909fcabaf4f4ae8086d96ceacce6ac40ba35 SHA256 ec931ce72b993208e7726b5f8b7f126eae3321506b1407adbcafd66027c7322d
-DIST firefox-10.0-sl.xpi 241030 RMD160 ebfde314c49cdcf771ce62ab0b186148977a2019 SHA1 6dbe8605490b9eab6f72acd8a2e8a9d3157ed633 SHA256 f58c6e3cc0eb3e15674306d9d71cc505eac054975da1cd23e1b4f2a5c025b9b4
-DIST firefox-10.0-son.xpi 239055 RMD160 ed32368582eba31c3387782dc4be4ded946c70c2 SHA1 1364bcfd36a6e6a80d212b0ec65f4d661f0be918 SHA256 240df3c32d4341dab385952ad0cac46bddbf2225986923527896cf0f6651e9c3
-DIST firefox-10.0-sq.xpi 227693 RMD160 6624f1646c1591c392ab8cee15bfa4a686151130 SHA1 75ac58c345805c6373f4282a97524b82d205707d SHA256 65dc68819c6f19616814f61c55391be8bfcb3edb56cfa9e3fef3aa910792a03b
-DIST firefox-10.0-sr.xpi 277742 RMD160 a413eaf7e74561b243ea4fcd71fa99fd1855e050 SHA1 d380cb73531f1aaea56e6c91a0b2de99bfad663e SHA256 03f6b615ee7b987c0298eda1e8cf794780ae6362027b342a431dc5a331f67b4c
-DIST firefox-10.0-sv-SE.xpi 278877 RMD160 7536e371a6f2c1649542009fa3ef21f929750795 SHA1 543020f7b0aca912d5d770e968cf1fc91b721e78 SHA256 6e60acb3c521695d2b62ef92b86d6a5acae6ee3156edc7ed7c8564b49eeb4e23
-DIST firefox-10.0-ta-LK.xpi 290614 RMD160 e12095049c8881c0c50286082ae8d265af5b7e4f SHA1 4d538079e1d65136d1b5408840f23e798128c89c SHA256 979bcba43ebeb35545199371c53e4e613622d3f4b33d52e9806e56589a0f35c1
-DIST firefox-10.0-ta.xpi 274051 RMD160 14de8869850a637e78d29be328f7e3ebfe29f14a SHA1 946199ba2cd50e926e871a477bb5972460e91ff9 SHA256 df566e3d57519828ad66d83c19c28d451f9e8b46c60254209c215d07a936ea12
-DIST firefox-10.0-te.xpi 289042 RMD160 fee4ec771c33fee403596201e10639538d0019ec SHA1 15d440d3b32501875e83e7121db2ff44614de7cc SHA256 324b17c9e72f61710b20171b4404de1d458a4c022ed07bba971949cf1881a2d0
-DIST firefox-10.0-th.xpi 272415 RMD160 cf7df4b098067c294bf5b8424db35f378317d4ff SHA1 c10145b045926bb0a2e2577b7d3c2b3f8d77ab6f SHA256 9a479651352ca18a6278306e9e70ac687de464632d4fb5ec7d38d6ac5ee81671
-DIST firefox-10.0-tr.xpi 249913 RMD160 7bca9e665b0124cd075a682b03be85a87c70be1d SHA1 188cae1ed7c94bd4c3c85349471c880ce23a45d9 SHA256 f149859742f6c994993afb350a005737c71dede2c2dd7edc5089068652c2f91a
-DIST firefox-10.0-uk.xpi 279129 RMD160 8ee7c49949b7e6483cec9292ba1f3eb1a2b0bf86 SHA1 a561a6a15ad86e54e9cb7c66d9b9d61682a3c735 SHA256 6b24e81b41e1d2574387a6d7387edabb3541197a108517dc7a6a3f899be90dfa
-DIST firefox-10.0-vi.xpi 262782 RMD160 6b9920701788ca8d0ed49bf16e64a719cd52497b SHA1 2b3865614c5e7a5cae9963f2b3eeea05d991e02d SHA256 8ebcebf87f06a1e174236891b6cdea15d2a78cbba8555500f94f1ccbb0eb1511
-DIST firefox-10.0-zh-CN.xpi 256543 RMD160 d8f1c6554c9cdb1a59752e675044db1bad377bb1 SHA1 30f5ce80ded20593dc8a9e723a142b7741dc0e73 SHA256 e9b9492453c21422375ac711aa0e6dca4b3d410773aeb64b2f5c98d1e721f3ee
-DIST firefox-10.0-zh-TW.xpi 257487 RMD160 899ab1ff8b090dc595e6757dcbbb24c93b8057d5 SHA1 d54f419ebf680711d49bda3b279f4eadcbf03db2 SHA256 31cd7b3369ce5bf31676ab7a9fedf5f7612f843c7a96c7467197abe7ccc384cd
-DIST firefox-10.0-zu.xpi 246390 RMD160 bc01dbc63d760a66cb888a14edce6e592fbc5059 SHA1 7ec656dd3369ef2ac9084cc0e3d57785942eac80 SHA256 9ff09a88ea8780162f3bec509a64ed1f79eaf84d581a50fdc8dac2a15374dd48
-DIST firefox-10.0.1-af.xpi 238740 RMD160 375e0cfb66386f02f3780a8fe6ba2ae327751b28 SHA1 29f5aa62d64e120c2bb1b5a946838f472c8aee55 SHA256 987d4b6d9de72122136b6022ea5fc02956c2dc59a7718cee4f06b43a3e8c39f0
-DIST firefox-10.0.1-ak.xpi 240568 RMD160 a91b02f9d556f8e89d834ff2378ac75abebb83b9 SHA1 6fc83016e4e03010f81fa25ab65b71b8334c841c SHA256 c79ac0a55a0d6e627ecd7bcece7aa6e5260565ebedf33d404b7f91370f544828
-DIST firefox-10.0.1-ar.xpi 263699 RMD160 cc79edb30a57ef4a9d924646c529ba12bbd4fa27 SHA1 13c3353fe8a508ff8a57c95a8d64d8d3b9b6b7b0 SHA256 2e2e90ce071d8a00db1b645e77d5448468117ddd1ec21f326a1004c71617b63a
-DIST firefox-10.0.1-as.xpi 278740 RMD160 f53883d50490a1173696066b674a88502ccdb8fd SHA1 ea2e422dac84b129f7ff78c1c9b2af6dc165ab92 SHA256 187eaef870790ff25d2e7a5f676f612989d141309553fb884dbcb99279988457
-DIST firefox-10.0.1-ast.xpi 237972 RMD160 ea1ca44698075f74e78e2cfc9768347f4c86291f SHA1 34f86656da96e5533d8b018ff1d4f00317c41c25 SHA256 bd9b5c0b26936133fb9a53168a53a16389db9c760c7fe834927d88b20aa18cec
-DIST firefox-10.0.1-be.xpi 245753 RMD160 df38fe642d3c1d84de399078601b095898643b1e SHA1 356d807bc8532321e4e699cfb8261cf81213b72c SHA256 abe57b3712ac59f7585c55f899dd068e98bcba7a87c32765939ad54f76afe1cd
-DIST firefox-10.0.1-bg.xpi 276753 RMD160 f00a1b7907ba1a1d6d7e1702a7dde7d87947166c SHA1 b4948180d2ab1c012143a61d3958abe57d19e248 SHA256 d9af0b048996b5afd0dba779221abd89c5561b43e631ee87aea21a5f736492fa
-DIST firefox-10.0.1-bn-BD.xpi 288291 RMD160 7a33db722fbe1796dd4f69b9602b834075547ba6 SHA1 567233012a33c5726f8255e596962ae0764436bf SHA256 56e155204142cf07ba36d6cf3dc15db0b2c466ecd066ee35b452ed206a67fde6
-DIST firefox-10.0.1-bn-IN.xpi 319302 RMD160 e7e7a1f918b13a23b749c2aadf3d1947c13469f9 SHA1 fa4ecca5b339b1736ed7eceacbb37f1eba6ed7a0 SHA256 da7c3aa7550f5c788948f2db9c1f6e4167202a25c873722a2b322c88a5904410
-DIST firefox-10.0.1-br.xpi 247648 RMD160 47fc591760cf03a20ceb42e6aa99797880abcdbe SHA1 e0f1525c4a7f907a3abad7aa34a1ebf436c83da7 SHA256 9093e623b00213f0af54e3beed43920573cb59f808e9a049269eb0eba56a1a69
-DIST firefox-10.0.1-bs.xpi 245305 RMD160 eed56f16e605dd1844323cf037dc78c50c3e7fad SHA1 e2d043483db99c8069c119eea3b9019b1da9c40c SHA256 bdb438d24cabbf93c0789a4ec6665c9ee9893e81ce5aa64a993911ac6bd52abd
-DIST firefox-10.0.1-ca.xpi 248218 RMD160 010cd45508ba71d3a17c66b43bc853e7e24a7688 SHA1 02d1133b55d06f13e7089a0a5806ead71f975ea4 SHA256 9688cef04c511e503a497dc3dadf3ccda7f900c1b37d30dce7436ce128c56687
-DIST firefox-10.0.1-cs.xpi 248767 RMD160 f7e03ce64547459740566ec50dda0198d3d2ecfd SHA1 332a3a4bbf7b8851b53bda4031ec6f31085e1363 SHA256 1bb457dde47871c46d795071d4a63962b83420db1555c5e3f53cba2027e00bf6
-DIST firefox-10.0.1-csb.xpi 266622 RMD160 d8ec82e32a17890af5afd73b6eaa96cf7758d73e SHA1 e15e04ab9aab673aba0053bec966e903d0980324 SHA256 8908161f3c1dace3cbf54be15f75075bc4dd9cd3a17d939069805837581a22c6
-DIST firefox-10.0.1-cy.xpi 244194 RMD160 80566f500cecc7d4b4e11e044840d2a4cfdd5181 SHA1 5218b7b2993445bfd97314325aed319d09bf035f SHA256 1bdbf6ac9cb4733a6168d49d3b023e339728c847e9b7db394f8cdb0301a80865
-DIST firefox-10.0.1-da.xpi 240325 RMD160 9b4e2208cfa7cc58eecf8a3f38f61ba5943a8fe8 SHA1 66973f7f0df4c9687de119040e7f9b19a9461703 SHA256 1453441467a5991cdc33ec56194d801554c69b87eaf677225a79020d59cdaf1f
-DIST firefox-10.0.1-de.xpi 249295 RMD160 ee46d85dc8fd09dbcfe20911d2b201826b174eb2 SHA1 4e4bb8866d25e769d101547729a3810de2d87449 SHA256 011a764ff081f3e6a4a44ddba104cc10680b3c37429c629f952ec702b3aa8424
-DIST firefox-10.0.1-el.xpi 264377 RMD160 0650153d4500dfad09d79d3c5f57564a870cc8ff SHA1 6a44fa015c906e006c206b80450894660f8ea009 SHA256 c9a3aad5bb766f1112b433f9920ac0b8a2042b2c52817cbf23ac3eeac9e81d33
-DIST firefox-10.0.1-en-GB.xpi 231191 RMD160 92394efc750597fa98add585d2bbc3387e4f9563 SHA1 b6d82b6a539c28434c7b38c8a6d862921de8f5a0 SHA256 8200d464f56f5edd6ccbf6e81620b9a444082f55b72c23382793501c31be8ab7
-DIST firefox-10.0.1-en-ZA.xpi 233917 RMD160 12d59a45632d0990f0b42f04aba649fe882070ac SHA1 fe901cf0b52db0bd24d0a4863c15dd3783c845a3 SHA256 bf2fc42e2ce825c191b1daf45b045c3c74b7e4b1f4d91794370dc4f7b21b88d4
-DIST firefox-10.0.1-eo.xpi 240899 RMD160 3ae93df5717fcd9ca1bdf267219e7ffada4926d3 SHA1 a16925ed0ebc8f39e380c02d92e56faf0befc2d7 SHA256 dcd2bb4b442b20aa29e7672c76b14186f576cc785cc36f695a82741c687fdb01
-DIST firefox-10.0.1-es-AR.xpi 245344 RMD160 48b884a43ce2db19863a9efacef467b6ef724283 SHA1 c4bf4b7ae593612e0cc72cf49b251a9e890191c5 SHA256 1eaa96672473ea0805faea4c2111c38d9e61d637b89068ef05f4577b1a3a752a
-DIST firefox-10.0.1-es-CL.xpi 250202 RMD160 1cd36720951fcd98829048486a70688bb91a3457 SHA1 2000e31dfd41cab58b712fb40a0b45db42fd90ed SHA256 5593268f5c528941d639ed7e6caec84bd7439e00838b2f8d7951277d311d7b4a
-DIST firefox-10.0.1-es-ES.xpi 215375 RMD160 b8e0509f3485ae7a0cd5b5215b21b4b71d0e1bc4 SHA1 006f56fa8b10fb272a85b8dab0d71a9bd99c3a5b SHA256 09b19ba4a7c3d84d2d8016a3d5b5447800bf5e5714b4a07ef46a27307339bac8
-DIST firefox-10.0.1-es-MX.xpi 224148 RMD160 a470655e82e8a1205902a22ee8afce6d5f6eba71 SHA1 62a8b78ed547474bd31eda331a27f230753abd09 SHA256 127b23931398cde56990204e0d62e6e5b91bf30e82d978c10b598e7eed7e666c
-DIST firefox-10.0.1-et.xpi 242628 RMD160 afe09bda19dae384d3c0d2aa49d99b5835a6d710 SHA1 9ecdf78c754cae4479c9e487157d9d95b5a8fef4 SHA256 f2e1121cbee28b8f279ce06ae1018f8eeab6a99ee8a8b3393ff71a3f9ed20474
-DIST firefox-10.0.1-eu.xpi 240248 RMD160 c22de406f9559b85bf54f95d08e77a70411f2b12 SHA1 a4d157214a82006343726dee0a8f0a5d61dae4b4 SHA256 4ffb6a1416c9aa1f1f1c32987781c2949f520976c31848f65d340a4304409442
-DIST firefox-10.0.1-fa.xpi 272850 RMD160 42e880a12eb7a6af51946fc8ac87874b0fc7cc2b SHA1 175ffc5421eb68049a90ab50f5b5bef223794024 SHA256 8d5a3ccbba009f415036abcd81165afb744548ec5bb2bc1cefd72be1e0caf0f5
-DIST firefox-10.0.1-fi.xpi 243627 RMD160 28e570d55ec693369a77efd6633d4191e3fd8781 SHA1 3fbf99e8f3322c1d3a970b9c61601b87b6247c7c SHA256 14741b89eb28ea486b4d57bc0e7ad348039a469b4e7ca40b98f1f83f1b6c0b75
-DIST firefox-10.0.1-fr.xpi 249565 RMD160 f5318f15ac7f2c15f86198531dfadfad5bfff43b SHA1 abe114cb743be6ed5e1e35d3317ae8adfc3fce7b SHA256 e4cf1401a5ff7f5f838862913e02b51c38157d7456d940d346997542e97ae0eb
-DIST firefox-10.0.1-fy-NL.xpi 249341 RMD160 02f4f4cec9a209f4d4d467f1f361c5f5788e2517 SHA1 0e6df79d065722ad9ebb1c01d75d6930f9c3ac8e SHA256 0babc0fec70fa7b170cddfd453aba5664ea0c96d8d4dba752b994c9dbb8eed66
-DIST firefox-10.0.1-ga-IE.xpi 252020 RMD160 76fc8cb8fa257bab0c4125ae6ec49375e648f198 SHA1 966011b1d41cf5e308b25832742d7c5d7f434780 SHA256 5f338afec8b7d82b38e806cc62dbe4a8543d81007ebba9425c30a5065bcc65fa
-DIST firefox-10.0.1-gd.xpi 253675 RMD160 cc45ea10e6e6de3c48a44263dcc8059a072c3831 SHA1 d6a686eec8c5cbe6778c89fea29e39efdb40d25c SHA256 c49964c7be3c339f3306b0c3c4be38e284f02d59a9a7119530976a4a15d4175a
-DIST firefox-10.0.1-gl.xpi 243247 RMD160 cf6e423d1da3a1e678a097e4e3b7f8b471bf47bf SHA1 81c30f9610fa1a4eff442c0248d2392fc8e5f9ec SHA256 312932f83d20f2353642c839667f1f2f5d82eef12e1c852858cf627e7908501b
-DIST firefox-10.0.1-gu-IN.xpi 275219 RMD160 f50efcc324b2df66d98c2d208d5299019be5246b SHA1 12d08fce1d0226b21bd82498173c12460a663d46 SHA256 b490a4d8441baf734a017fd29a70710160c5e18d2e5b41c57dcbc819267bd05e
-DIST firefox-10.0.1-he.xpi 264931 RMD160 a00b424c30271fd50fb2c508e5259e6457a2c384 SHA1 93ce061914b77a33580ca13d77605a7b912b9311 SHA256 ed442430002b6779a29a7688a4bac1aa175923d5a69226318ce1e30040a80c14
-DIST firefox-10.0.1-hi-IN.xpi 279998 RMD160 53024d5f1beaa11351beae0f7e7a822860d6cbd9 SHA1 5ee5543db73ca60e7244ea586f4ec19189e8c625 SHA256 56f6e3ec4d03256c438dfd4a1525601aceff82c9b803e543d4cdf7e2f63aba78
-DIST firefox-10.0.1-hr.xpi 249330 RMD160 796454f6ef4b59a69fe2e48f19e4afb0387d2bbc SHA1 bca88545a8d8ea1411036e4dad4f35c2180e1f46 SHA256 0f626ff4d716a02474e96df485c28854a0676c3b62678ef76b5fed03e0c320da
-DIST firefox-10.0.1-hu.xpi 253772 RMD160 9cb633755e3b031b35033ba3c25c7d6069cfa636 SHA1 f0ed575176309fd82b2d88d21fdcd399edbb6178 SHA256 6c29b51b72936f915b2c8d0231afe5c557111569227bfbc8e22e9a45c6865d3b
-DIST firefox-10.0.1-hy-AM.xpi 445449 RMD160 1d57601016554d9d45027bca523b2f124c3b1710 SHA1 9ae5b93e56e0169917e70f19beb1abd8ee54c47c SHA256 b5c4dd26fe506edaa3f884ac043dc12776f76be97ef81be10529bf41e5cea26d
-DIST firefox-10.0.1-id.xpi 236821 RMD160 435b3aca453296e65524cdb99920eea35a27b37c SHA1 8b78425a977d5598ec46556cef8ad33de43454d0 SHA256 f335838a8bcb1994f03769b95508dc260d786eb049307d444a2df17f7ffd88b5
-DIST firefox-10.0.1-is.xpi 243065 RMD160 82a249b5e3a9eaf741d03fbab3481c667fda6d37 SHA1 d5843906ad18be4522fc14eb8c30a685ce837cc4 SHA256 ef225faa4a51a5aa6f4f10726102bad4bcae0435994b2d2a75dff78623b40a0f
-DIST firefox-10.0.1-it.xpi 212714 RMD160 9ff12efa987bd091cfcffab1c8dfb3c7611bc317 SHA1 a7457d734fa12d121d9d686f92f331a4990bf175 SHA256 540ebd73da8ff20222a362ef25de78a41b7a123da7e80fc261bced258733c0ac
-DIST firefox-10.0.1-ja.xpi 273112 RMD160 7883cd1878286379cf1d3de22331e6b701bd4581 SHA1 48ea965d96db8fc47b28ac9bccc031a38ff8e157 SHA256 984d09e9bf05dcf25eaf46109fe64237763f860a6eecfb74c2352665d2e4c34f
-DIST firefox-10.0.1-kk.xpi 279772 RMD160 e31756818fe187e70e0eeee0a7e5c521e1ebcd73 SHA1 9d4099f13dc5a5440b001e498408fee805fdb5d7 SHA256 2f01fa76716bbd75b9f82fc4a5ffeec1cf87dbc5875e7860526ddbeeb4bf34d0
-DIST firefox-10.0.1-kn.xpi 299828 RMD160 066b5812558cba4fe57dfb6644766f71f6c60ff3 SHA1 9da6faaecd2470307090fb8221aeaea578ce544c SHA256 ef21cac9519ec6cdcba88d5fe567262cb7682c03e268dcdd0017e98c47acb912
-DIST firefox-10.0.1-ko.xpi 227940 RMD160 e7bc38431da02d6fda837426851fb357b595967b SHA1 f4173356d3456c2b71990d6acc66e8751234c6cd SHA256 fff73dadf6e3ee67945b816c944582a43201cee2b92234f2c55f43981c45f7a9
-DIST firefox-10.0.1-ku.xpi 254706 RMD160 b81488116c52a69c7f08dfff00fb6c4595e6966b SHA1 9ec39ce89d3455f771c2dc569f9a1375742bdffb SHA256 cc4654f2dd1a1d3036067fc5209b298ecd5ec37f447d6be7d98a4f689213476a
-DIST firefox-10.0.1-lg.xpi 247671 RMD160 8b2c510e4266a98d4f5fae4fdf0e5a2190246e33 SHA1 9e9a4c97f68065dfa4dc7b7e758dadef2d74d26b SHA256 902d50e925f2dce387a30602595428ff183784d96727b7fb11a52886430476ef
-DIST firefox-10.0.1-lt.xpi 330628 RMD160 c5efa7ffe5c0282edb06719a990e1178c2b6dc40 SHA1 4778e63e1a5ace2080c73c6d4f9858dfaa2f3a1c SHA256 5971027a413beb7e4f8323af913f6b3e12d767ab2d78f34e3fb45e8075479f33
-DIST firefox-10.0.1-lv.xpi 244350 RMD160 b1eb122a2ab0d4edd169781e4bab8390bb6eed32 SHA1 16f12a934697a1f05c73cd2b5db6070bc2f4d590 SHA256 8db5b21e06211584a7e1078ffa2471656c278ad4203707e9aa97b87343b6038c
-DIST firefox-10.0.1-mai.xpi 279251 RMD160 7ba498dc7eeb40cc2ed90adc54681a0ce311cf15 SHA1 dc928e364baa0393d7d6b7bac511d9cb447a8889 SHA256 54c839cd610e7771a843c6c31ba83c2bddace35a26ce4e7cfd1f0fdc4e6e7f08
-DIST firefox-10.0.1-mk.xpi 272936 RMD160 34abc20cadcb7ba55d94458703b860d799e0b39e SHA1 9e9c70440bcfc6f7342040d04141606a4d555eac SHA256 02dd54fe5188d0c57d0ff90f8293cf13135ff1b8d1858cd40b3085f311b1dc0f
-DIST firefox-10.0.1-ml.xpi 306673 RMD160 1d9b914f4020863160ee25500d75716933dad324 SHA1 df31f05047ba6096a84d2ce319fb55c33f7c0ae0 SHA256 d4bd5dc2661787b398475d5d2f19a98257a3213e73560a76fad1c8dd1efe6410
-DIST firefox-10.0.1-mr.xpi 281455 RMD160 e2adb7e4bf023e6e16a79ab94dc4431b7bef9131 SHA1 443e8a54a5e98709d9d33a09ada4c0f035cf04d5 SHA256 0fd5795640498f5887b836a974d5392b2f8b83c3e3658587968aa6102aab1219
-DIST firefox-10.0.1-nb-NO.xpi 241208 RMD160 4daaf03482090eb5102d43f49c21fcda61acf043 SHA1 43a242ce7ffc2167e658d364847a0cd1f4dd83a2 SHA256 f546cdcc2ff277253c799838e07f66fe3df7198ca071b77ccb4c123b5763ea2b
-DIST firefox-10.0.1-nl.xpi 242398 RMD160 91bdb52fcb898d54d95ce4c20bf8ad2d92e88f51 SHA1 a22f94f77a59eacaab34811d9ad386cb6e0ecfc8 SHA256 30f32977a92c31369f1624cdef77cfc093fbb947e6b13cde006c0eb277e633c4
-DIST firefox-10.0.1-nn-NO.xpi 242451 RMD160 4773d5ddc08f999703ace95504e1b7b93113bab6 SHA1 c44a00ff4f41616b5bb3f98b317206933bad4541 SHA256 37f6e75f021a29756ad6b417a4383407a3339c75a97de594a58b654bf7efd4cd
-DIST firefox-10.0.1-nso.xpi 245692 RMD160 8b9bb2cbca91bbd4ebecd52ea0c7528108dd4a9f SHA1 e8d93a1347616f7bfdf3ed93552760a00a9619bb SHA256 aa1f6df071934b0eca89abcb82a6276616dc463c4955f6a2003e27d950a02b7a
-DIST firefox-10.0.1-or.xpi 281685 RMD160 a336c12c8b73d1e7d5ee9185190ef46961129628 SHA1 09bbce92d00e92ad5ccfa3f269a9d0ff9ee24a8c SHA256 d341caa22028cd297f5231c6006d88c7d33e96efb1a20ab6521afa16063dab34
-DIST firefox-10.0.1-pa-IN.xpi 282142 RMD160 fcedde5534e0aadec702f700070831d03ccc66d5 SHA1 7a55bcac1e26d91ab9c1d57cb57c7feaba14f4fe SHA256 6992f5a16db99a510cb71fd308d5ebe8cf7ae8a0fc92a842b8f7e7755bc20d49
-DIST firefox-10.0.1-pl.xpi 252043 RMD160 0b2b882a7def312eee4c84722b0df210fd308adb SHA1 8978b32e319c10882136497df150c69f25136805 SHA256 644e3332e1661ecd04a9d36e46be0648937cd6f7852efee20195b67c821f2f00
-DIST firefox-10.0.1-pt-BR.xpi 246845 RMD160 65cf0647709158a8ada2627600e7483f51a52ac3 SHA1 ca10f2e3b902678330fe71dbf298760f4a315132 SHA256 d14ac8772ff65a978e6df01fad39eb93067e26a572bb0c39a00f4a205f01708e
-DIST firefox-10.0.1-pt-PT.xpi 246471 RMD160 03314fa236849c7d79c1ebe7f665d032d599bead SHA1 c2fea20ff8e9f4715dd43ef223094fc21829ad79 SHA256 648e52756b4c3ff986fe57b915c2cc41e5bc9cb473e16b9a7f272b806eaf9d66
-DIST firefox-10.0.1-rm.xpi 245768 RMD160 1a77abf685583ee945786e96d1943b75bf723c97 SHA1 438be863ceb8ba2ab4ffda4b188ff20879546d7a SHA256 6d330b3644d6e7a85968955ef6fc1aa140b77f8da675b1468c5d38ba0834deb3
-DIST firefox-10.0.1-ro.xpi 263249 RMD160 2877c0a259dfd7cddebc260c2508f345d25f0888 SHA1 f3939905d55343141af11f7bb1f3d557a14ce4a3 SHA256 20dff46763458f932c4d47c43a8d1b9e4dfe1dec54e169926e0c6635d8c93599
-DIST firefox-10.0.1-ru.xpi 254983 RMD160 4c99cfffe61e34d50fe5ccbca28e44fa9ebdc320 SHA1 4863e6a7d14a1d02a62187102910543592b96a33 SHA256 ab7dc6ff2120c388b008514f557cc46f5fe055b651920d06d2226084b66c2086
-DIST firefox-10.0.1-si.xpi 271987 RMD160 3dffaaffdab1eed56eac266026c8c522a240c86a SHA1 e138a0b2990720b833eaa2b16c982fbe5fc02117 SHA256 50a49c42f10daa00c9a8f293d538a9896ca8279b6c033dd90d6d9b86632b5775
-DIST firefox-10.0.1-sk.xpi 254286 RMD160 712e4d58422bff159b84aadd97ed8d0a6e190a40 SHA1 db11ff0647a857f11f3a9266de0cbc55ad5fac5d SHA256 2e00995ab6448f8f7edb5319256fe3df50229bbe9f8ce27c23758cd5cbafe17f
-DIST firefox-10.0.1-sl.xpi 241031 RMD160 114c5501f0087b66cc6305d237e75bd80365658b SHA1 793f56dcede8c5338ec7c8dfb6e2a488c634cf39 SHA256 3e5af9a4da42c8d5d50a6d942c64191dbb8286e08eda44120e41c4d78f842e34
-DIST firefox-10.0.1-son.xpi 239056 RMD160 89c5455f037db6cadc43bdde55bbad4c452212c0 SHA1 5f4e125624159ae6b0a86d07c5341fe2f85584db SHA256 642f8860faabc144c0ce2dbc76a93e635b8e977a1ee2f284947220be7498b955
-DIST firefox-10.0.1-sq.xpi 227693 RMD160 1d856d5f21b621aa53b0ed1c44907a9ed0e10047 SHA1 0f735acfda63de7461b4cbdf12def17133598fe4 SHA256 446eeac115ab23355e5a5fa913484ac42d558b2a3c7b1cbcd7c83e00518f8153
-DIST firefox-10.0.1-sr.xpi 277743 RMD160 fd2b2971fa5ebf80d9ee68830fc837b7b1adad55 SHA1 59d43057c6e5350b18c4d5ecc15fd7a2a5cd8c0a SHA256 162285aceb265fa4ac2bc00437e199126355d3d9680b9c88e8764c00a5b2e1f9
-DIST firefox-10.0.1-sv-SE.xpi 278878 RMD160 b9315ec01a413ff00d48ce98c63f6a3417d77929 SHA1 59e2719f6947d88034c57408b88497195dd621d5 SHA256 37d7d2dde1a9d320e005b67a23cc8866efc59fa0437867f0a25f8feffe552775
-DIST firefox-10.0.1-ta-LK.xpi 290616 RMD160 e19629a9bb8f3fcacc4bf215d9ce2513596a4bc0 SHA1 a60b217abbfca474f05df85a78148f4b964598c6 SHA256 a92e3ed52a308f8f72fa4d22c83048ebe1a5217c84875d22f3389f018deba270
-DIST firefox-10.0.1-ta.xpi 274052 RMD160 3e61352bc71333de73e8efcaa470417c149c42d3 SHA1 843bdbb0d5c94a0da9d95abfa3e7fb866066dbc2 SHA256 42a0146ba3a27cbe285afa47b9a7b6ac7004f3fa791a80c2a6f21d29e46d5590
-DIST firefox-10.0.1-te.xpi 289043 RMD160 4746502f2639cfd14f1c0bcc70ed785d730ba9d8 SHA1 52e2cd40aafc2e1389751ff0207aa198f14e6de0 SHA256 cdd662b558dd6e420a08cc0b03d3daa0d59b714243f6f5756f14ba88b2f5f328
-DIST firefox-10.0.1-th.xpi 272418 RMD160 ef034320d79ed63027feef9586ad54f95d137083 SHA1 4232ac25e8b819afcbaee1cdc92c7e288f9eb61f SHA256 f61511ac665a500075c835fe31c903f15aee725e221509ec0af9acde6c71c1e9
-DIST firefox-10.0.1-tr.xpi 249915 RMD160 8e432153bcd5768b13d14d3727a707d346fa5c9a SHA1 1e3aca258c5c42c6a1b9f562b10748a494d0b29f SHA256 2b6a8ad215194dfed9233d6e4954b014300fca96be521faae88d1dfff4c118a9
-DIST firefox-10.0.1-uk.xpi 279130 RMD160 bd0659c6f12405301e65e1fb396564c3728fe0fd SHA1 0a99bd9921c0afadb0110001458f474d9a41eb01 SHA256 99b549f4f9f18e6f273f7ae4159c23b59c16b4956b7a466e35468a3639a2255d
-DIST firefox-10.0.1-vi.xpi 262784 RMD160 bb16beba45985ba9b91a9e49e854fff7fb247a52 SHA1 dd2b6d6fc72115d146d7a7d5f746497f49eb7b9d SHA256 08504e38560f08cf9baec0f11e0f99c4ad09b38a1abbafd70d06ccff4ed00ae9
-DIST firefox-10.0.1-zh-CN.xpi 256544 RMD160 e37a0c73e39490816011afd1b0b0fd1ee831fffb SHA1 e3faf1c7869d8c964769c631d40dd09e78df9c1f SHA256 0b910abf322f75867186fb4af8d39a77a7b828e3d0d674a923f277f8ea4327bc
-DIST firefox-10.0.1-zh-TW.xpi 257489 RMD160 1803c05c1510fa518375b685bf745cc6cce44b1e SHA1 8414610485098dad4d3ff60c550bfc91454e6110 SHA256 435b98d0c72b62992f5c9766d4854099a5168e9695b312b4966df646ec016286
-DIST firefox-10.0.1-zu.xpi 246392 RMD160 cf7f822ca6e79e91ba6759a628719d11c262491f SHA1 e36db5ce6ae8f29fa219145eac84126bb433c3a8 SHA256 a33f506653f8a2c166e1fe6a8af728913ef459ea59859940e641f2c442669d88
-DIST firefox-10.0.1.source.tar.bz2 75537947 RMD160 853c76ee98b25664daee8ee3ad881f45010767e1 SHA1 8613957db84e6722ccf1ebf74fab927139614bfc SHA256 d06dc35607e354d4c1524ca3344cd316a6d7a38c8c0578a52caee6a3adb054f5
 DIST firefox-10.0.3esr-af.xpi 238740 RMD160 c07ec0e6a17165ac0d8cf0e510c25cce2f094acc SHA1 954189a69a389ca3eb8812e0cae2b5ea3c7bcaee SHA256 d6442ab62a00d6ea606b237f7901b81c1a62c29ad4ae74e1a153ef1fd08cacf3
 DIST firefox-10.0.3esr-ak.xpi 240568 RMD160 e4ae6935ba2bd452eeea157589d35e2f91e16c3c SHA1 3a749735fe3c7418283049f22bd4cf5d94deac60 SHA256 22649466e787cf3d53c6662b09a973f042b898ce4813b72d4bfe6ab3dfef0aca
 DIST firefox-10.0.3esr-ar.xpi 263699 RMD160 cea3d00de0411eccd492ba7e13924a1fe4eed6a8 SHA1 97c7fba4aa8bd70da1c688f546ec6473b184c0dc SHA256 b0920d61c7daee82776bd919dbded765320cbe49f72087cf46e582647472ddab
@@ -256,7 +84,91 @@ DIST firefox-10.0.3esr-zh-CN.xpi 256544 RMD160 39b8f49243efa9589e4a19295d6e3b280
 DIST firefox-10.0.3esr-zh-TW.xpi 257489 RMD160 be46b9681d869437ff9574ceb476c9708ccd4a6d SHA1 5a2a35024ff27bcb07d6be974a0a858a9f041ed1 SHA256 df2243c0d27ada14d8faffe17892ee09f9ff19745808252946952a84b9887183
 DIST firefox-10.0.3esr-zu.xpi 246392 RMD160 ca177faec411efb5a42b9fe17faf2425ffb6bbe7 SHA1 0d8a70a8af1a12ea3851fa200cfa2f915f3c98a7 SHA256 b03779b3ebc7ef4fd4ff80731f2f7150b751c4fc2bbfd7d7beb77275f07a99fc
 DIST firefox-10.0.3esr.source.tar.bz2 75471818 RMD160 3f0ba6e7e6450f9abae18b4801cfb502a9faf486 SHA1 26ccd609da69a9c4bcf4cd99456ba68b45c8d970 SHA256 3a3af286617c56e0f2843a530144aeb87fffe4ea76c254d2604f62ac589c4a01
-DIST firefox-10.0.source.tar.bz2 75538360 RMD160 5ebd640a4ce858c4c3c88dc5a8c2981d60016853 SHA1 cbf1fb0efe0a3a2b2dafaa324b136736e93de70c SHA256 b7392508c75ee5f326168883f696ea5ba6ae6ad57926588889e46648e5cfedb1
+DIST firefox-10.0.4esr-af.xpi 238740 RMD160 abbad41bc2e2116f4e9e1b903f3b3d9db289bbca SHA1 0298c0d209b043fa23db8370142facc50c9498c9 SHA256 375d0ef6e2c5543276704920fcaac881c8a852b17d300224848fa71636be7b5b
+DIST firefox-10.0.4esr-ak.xpi 240568 RMD160 6f1eed2ae5becf0ae26711979abe6687e88508d8 SHA1 9cfad2fda4c2d5ba8438889e120ac9a48fef7388 SHA256 246065e30882eeb5fe9017e65bec73e7bb60f35763b42a48c0adc6b375c28417
+DIST firefox-10.0.4esr-ar.xpi 263699 RMD160 7e2e14a2c0c3bdab00b10c882a08537a82ae41b1 SHA1 054b82ed27292178aef907503aaf6ac7710bd5c9 SHA256 6bf992eb757890ac79dc35b6ff7204435abf8070ca98260ce2940728b42a541b
+DIST firefox-10.0.4esr-as.xpi 278740 RMD160 6d751b5930d769dcc8894a435a9e267a44c80e04 SHA1 7636dfbc2144dbb2f33cb69a953f6084be6604a2 SHA256 948e2a1adbe0e963a9983259305407f243b6c500df7fd9e8c30d1e7f68f3cf9d
+DIST firefox-10.0.4esr-ast.xpi 237972 RMD160 f969299d4fa2e1a7389071cc2000e0c830cf907e SHA1 706a47df268e4161449769f237f16cec9a0f789f SHA256 c5c4f1308f958a12ce4123aeb1e6c0d428fbfab00f45f770d0433dac74d1cc92
+DIST firefox-10.0.4esr-be.xpi 245753 RMD160 6e716545d586ecc09d5b3b74e3c58ba68e89f19d SHA1 e53ce933b701e754c24e700644a47618c5d25cc3 SHA256 de3f31df5664f34caff2d0bcce7400a5cdfe93aa2ffa953de4e0525475511bab
+DIST firefox-10.0.4esr-bg.xpi 276752 RMD160 96e09eac649982f0c2393821cca164964a1391bf SHA1 efe9a476bc8f3153d3b06ba600ab7a2c0dad0fa6 SHA256 d4ba44ebb33cf1fb58fbb39604066e4d6774e033359c86f0a4692f84fb81182c
+DIST firefox-10.0.4esr-bn-BD.xpi 288290 RMD160 1a588039d7ef4cb635723cb1b3349593258da4e1 SHA1 ff056110cc308df95c48bd6577be63b72ad06b36 SHA256 d0b8776eddd3090a389fa17686ca912eef6f86836fd266bf60083a11af085bf6
+DIST firefox-10.0.4esr-bn-IN.xpi 319302 RMD160 3ed2f12bd263aa95dbd76b61e5f27df3d5b11aa9 SHA1 b9e2d8f90c50c3de424458322a4adfd4019f625d SHA256 fbcf9da2b5d81952d2f84d5608f5316d562b00593f18fc501f9780f2ace902eb
+DIST firefox-10.0.4esr-br.xpi 247648 RMD160 7a9003053cf3da7e81db1507396ea779b449a552 SHA1 a5ab1e13b54fc22740dc045e7eb24c1cd84a0bb7 SHA256 e56dd861af173ce5778f7ba1f77051c36fae6acb9fa2f3f44db6906047fb0cc8
+DIST firefox-10.0.4esr-bs.xpi 245305 RMD160 b5571e8b74baf85a17f452ccb58f6fcab4cc8ef8 SHA1 12bac7144f7af2662caeb16d083d9caaf36aab87 SHA256 520c99818b136c8c516c895cbb1309ac47991dffabe754467c3b538b5095cbd9
+DIST firefox-10.0.4esr-ca.xpi 248217 RMD160 50443a2604861a9039af9d3d9597e1da86f1da4f SHA1 aa5e860f1a8d9d87c98917b803f28ddb8ddf648a SHA256 3f7fc9f7753b38bf6054b8f43c1efdf01b7e93e4a9566320ec03599fde97406c
+DIST firefox-10.0.4esr-cs.xpi 248766 RMD160 1a07c2c8470a766a0d94931a3db8ccac15b8d5e1 SHA1 9fb6212f98c907c8a1e6b82b9dd5812c2286a840 SHA256 a5238f7ecaeab23b2ec383eeb4e93c98b17ac4dde280c5a8d8e390512433426f
+DIST firefox-10.0.4esr-csb.xpi 266621 RMD160 caa6b1b99d72813cb258017f26c35d70e7885192 SHA1 9271ed1a473199e7d59294d43b25c10fbe305e59 SHA256 9c717a2d1e04453d09f55176221bf4377571533b63ab9a1aa8ea996210d76fbc
+DIST firefox-10.0.4esr-cy.xpi 244194 RMD160 bdd349d26bbed86ada71c32b11711a2d00b91630 SHA1 0a11e0352445e731eb80fe0df7f66a7f9c487bbf SHA256 91007ba23e623a22c32f51f555ac4d3e48827ab2be17b299fc344ccea5b0d829
+DIST firefox-10.0.4esr-da.xpi 240325 RMD160 8d13728f3c26ac9cad2fcd5170912fd7e850feeb SHA1 51b77dd9bdd4ef508cfc7cc5a7d0f0fb8ebe8dd7 SHA256 f74e8887e08891d1f2527bb188c95de4e7d4bc95f29359e5eae8ee057d018281
+DIST firefox-10.0.4esr-de.xpi 249295 RMD160 f921c147fe1f765d515121c6e88165f55fd96363 SHA1 5e468f1bd6b042408d70d274e7d53c552490702c SHA256 c4da00e8bde6ff621f15a365771a2b7546a53524fc411564ddbb0e99d0eb32b3
+DIST firefox-10.0.4esr-el.xpi 264377 RMD160 4efbc481ef5a896468a44e4a4a2d4669bc05e13c SHA1 b642bf681732be60e371c3872aad621d30f0b479 SHA256 44049d0af162f864b71d8ed18e4e9f8870c0c12197bd5777269fa89e5fe0e454
+DIST firefox-10.0.4esr-en-GB.xpi 231191 RMD160 d2f04b32aff7bc6e9f5c2bf522eef41f60add299 SHA1 c0e46b26fa8f5d9a718a2b475b8306593617baa8 SHA256 ad0edc140d3d2594d5782970c9bbb4b8041eef157602cb81e9d1389c6c5334a0
+DIST firefox-10.0.4esr-en-ZA.xpi 233917 RMD160 fd3099f027f0b8ecd1aa6993f115a40bff3d1634 SHA1 5e4966723235357e09de6b4651e2b49b8c9d3055 SHA256 4bab5719e2575a07dc0137f87ca12273f398262917c7ad593d2a189bdeece1d5
+DIST firefox-10.0.4esr-eo.xpi 240899 RMD160 2dfe20096eebfa44dacfdee1953ef8fa199dc816 SHA1 d541848d24caffc051dd06e9b9a78562ef1037be SHA256 19869ed03e9510dfeb0bd2460aef718215fe6256b1a2ee852bcab9f0770be5d4
+DIST firefox-10.0.4esr-es-AR.xpi 245343 RMD160 09419f21db52153eff8891cc4ba53c92f66f07e9 SHA1 711faddfe3f76b84d580343485c53ffd9ef635d5 SHA256 677ba210f3365cffe4463d13b074a81495e71cd8f8b89b0392848ba6ca4f2325
+DIST firefox-10.0.4esr-es-CL.xpi 250202 RMD160 5d9f2024e4bc5056edb82042cf506477fd6bf80a SHA1 50d647f9a948f6510dbf564f5dcd54c78e692d82 SHA256 06e9c0a5cce1e424757a13df487faa6bbde461f25bee3d98bae35621d32653dc
+DIST firefox-10.0.4esr-es-ES.xpi 215375 RMD160 aafa00d412c10aa4436d0f497c29af019dd47892 SHA1 2a305d38f5d3163f5584310dba3d837e7a0d1aa3 SHA256 dc735944dc5b32fcf43bc4c59b4425b80b88b03b92465b93756152bec4cc10ea
+DIST firefox-10.0.4esr-es-MX.xpi 224149 RMD160 d0bd4c15c81b943fce3054313c79e2e0d7097e90 SHA1 93e96669db0e7e794eb3b8054f5159ff44f9b8a4 SHA256 59110269809bb00f29c49e71097cf82325e668a1411ff5c7281e0b48745c934f
+DIST firefox-10.0.4esr-et.xpi 242628 RMD160 462eb3b4d2676dbbb5af4360be34b0c60cfc7dee SHA1 06aa603a0abd8b26827c3087eefd2f4eb7ece307 SHA256 c775a9f2a743a29750639df3e819c71420816ab08a35b342cb0fa4376ddbde86
+DIST firefox-10.0.4esr-eu.xpi 240247 RMD160 3fe620e36b71bb92960ea8d791c1616887621fc9 SHA1 ded3ecdf5f9cc6fe206797f597109789ad8fa27b SHA256 1bbb22f8145567733dfca7c93ade6a8abd02a834ab2e046919df29b934faadfc
+DIST firefox-10.0.4esr-fa.xpi 272850 RMD160 07dd7985ec467d623c154220feb69a96c0d46f27 SHA1 c0e08d6e1607fb9a1850a0d27070cd3a66063ff3 SHA256 b0c1111e45bdff1cf1a283099d72a9a1ce7232c4de1c6e5cd93336f81b4d6f44
+DIST firefox-10.0.4esr-fi.xpi 243627 RMD160 0c167d37fe98a33126385b591d920c5818438a26 SHA1 b114f4ba4072ab578962970664c34394a8938df7 SHA256 056a3b3e5335e3b6af07c9583231ad38349260c64fd44c491dff4aab50a215e4
+DIST firefox-10.0.4esr-fr.xpi 249565 RMD160 6e2bf1c36d30426d02a931719bf2aac135bdb270 SHA1 4de3b7d308af34ebcc7dd47272458975abf56374 SHA256 cddb3616058d202b379ccf4c60c27f95fd3d31bc70157804610439752865c4cd
+DIST firefox-10.0.4esr-fy-NL.xpi 249340 RMD160 4ea4eb86d6b744ee3bc251836bda48e293fca35e SHA1 7401a0a1a1807cd4eb9e752e47591959ec571cfa SHA256 010c2c32a3427242d7ace11e7b8eb2c05f102bb0886abd2a5314e9fc34f40fbf
+DIST firefox-10.0.4esr-ga-IE.xpi 252020 RMD160 26d31c24c2f6fbe86ece1c91861c80551464621b SHA1 a3ac7a400a6e779bb0b2a49280c39e42fa65d9f0 SHA256 6c83b3e8f2c9b26d03537f75b56a719e3a2d49354390a4420509b9b952142c5d
+DIST firefox-10.0.4esr-gd.xpi 253674 RMD160 fdc0534f21d301ebdf1f128858296009f638b918 SHA1 533622dee6777d5785646ac370d74288f6beb951 SHA256 89dfd1c094b415beb34e7bde8964920e97c1ffe9e2f2684322a517191676adb3
+DIST firefox-10.0.4esr-gl.xpi 243247 RMD160 3a252c6f9c9c927150e7be0bb36eda52e4d54382 SHA1 bcb54818c10de075133af2e2d2f9f61d936c79cb SHA256 2a57e3d26a19ab8134467b5292951f112c9ff2fff037b56437660495c701a964
+DIST firefox-10.0.4esr-gu-IN.xpi 275219 RMD160 a3bfd5633aace7469e21b388f1e83e9404f75217 SHA1 ecf5b3bdb17a538c3b6beab2ab73ef41b0896c68 SHA256 65dca364e03d29028a61ff8ac98e5ba5303c49f174b967038be8c163a6bef916
+DIST firefox-10.0.4esr-he.xpi 264932 RMD160 1598da719da294f5689afba9ae916dd7944da947 SHA1 08d2423a019e903f3018c18ecb7d5bd16dd1d06c SHA256 ab92ccb00f750d2a8eca49671dc87ece69f02291ba5fbf38c775ec9f78e369b7
+DIST firefox-10.0.4esr-hi-IN.xpi 279998 RMD160 97b62a335a939e81b473281fd0df9407dc595a7d SHA1 da990408872ed366d263d6c2230843de307693fa SHA256 5faaf108c5183f81e976c29f54ebb3a02e8e13ad9832bb98e34eb2f51057a6b9
+DIST firefox-10.0.4esr-hr.xpi 249330 RMD160 c76096053f7d71cfef1b700a9226f8a034c4164e SHA1 32afb617eda93ef2fed5936db1c13756818d9f34 SHA256 4804c901dcdf70d4ee147acfd91575548f6a76226c4fba00e4574d96ad484807
+DIST firefox-10.0.4esr-hu.xpi 253771 RMD160 e42f3d233da092cbf208ad13ed30f5c688636ba8 SHA1 0e764a197ee45827908ae6395a643b9b63e8818e SHA256 b9dda9541afe4eaae3234e50558c469f0a567b4c5e4b537d554e3fb4c38c4831
+DIST firefox-10.0.4esr-hy-AM.xpi 445449 RMD160 55bb9b76552899a5abb6ba9f89729fa50387e264 SHA1 55b2856d47c75e0b5a4c12f524a85f2f033bef89 SHA256 11c7e5500098360faf71ea932841b7f49dd02ce847fa2b4971228dae904fd9ee
+DIST firefox-10.0.4esr-id.xpi 236821 RMD160 595f2a771c94f9e1fd9bb83b861bca8da19266b3 SHA1 aaf4f59a56249651d177e703755aae659c35f574 SHA256 15f899db6963b3ce456b08b898f48691e6d2d7938120370d3ebedbea05cac789
+DIST firefox-10.0.4esr-is.xpi 243065 RMD160 6b6bf0da686ce3e8497986587ae5398f196639f2 SHA1 dc4e7a29cb6a018a99286f91148d3385d0037d19 SHA256 600cefdc4fe5ce693ab59677db88b6fd42cc3fe40d84d2c5c96276c85cf0b89c
+DIST firefox-10.0.4esr-it.xpi 212714 RMD160 c92a0783ad7d68872ab31aedbf40c07ffcdf05c8 SHA1 f4b40c62e495170be30ca8b5755a4b1fa166f772 SHA256 7118b065151879a8efb5b2194b7084a4121755845711be250b7657e3bb989220
+DIST firefox-10.0.4esr-ja.xpi 273112 RMD160 5159ff5649580f005c0c51c634bc7cdbff45750e SHA1 f00ab15d4ce133785db2ed6bd62d6664bff1ca92 SHA256 b929980df42ee72f51521b1c42d6e3322c22f4231ab91dd48dc7960b37bb80d6
+DIST firefox-10.0.4esr-kk.xpi 279774 RMD160 ea55f176f2348c6fefe9706c0c850e750a8c5041 SHA1 4c153aaa4c239d7622f534fc43e63202fba439e4 SHA256 388107619d6d8490aa7f57406a919a997aa9825012fd47b84b1265c0adb996b8
+DIST firefox-10.0.4esr-kn.xpi 299828 RMD160 47ac91ea12a0f1adce296a514191bacb8669fee3 SHA1 699560f23174319896ba53a19c8ff930ab7b6848 SHA256 21ac7b0d3441d7757a4e7c33266998c924f14747da95b44f20a6906b5b4f56f4
+DIST firefox-10.0.4esr-ko.xpi 227940 RMD160 b52cae5b6bc0f6bea83d1c7bfb37f0ff903b41cc SHA1 dc83a4c75b1e801c52b48c6e9fa34ffe29ff63c6 SHA256 98f2ac793628cd93f3f86f6c9be2f573fbf58ff1655061681aa89b9a45d84fd8
+DIST firefox-10.0.4esr-ku.xpi 254707 RMD160 58535e55c0f610c5475b2189128398a357f01f2b SHA1 897751d4ee736b0417024152712595955ca0fc09 SHA256 45ec44785bd6af66454dbe3be11793bdf90eb28ee3df5ddde3f990c004f4998d
+DIST firefox-10.0.4esr-lg.xpi 247671 RMD160 737e1cec1319fca4342cafe1628fc13c3dd7e613 SHA1 36694a659ad42ff5589abe8e53b736c65c998303 SHA256 f4b39c662b95e1c0c4c470c7e1202ff409023b8239684b54e089d526a7ee4420
+DIST firefox-10.0.4esr-lt.xpi 330628 RMD160 3bcda40c432e5a7c4740947006cfd9f92feba582 SHA1 cf1e679974aa3b15625e3d33de901ce1f2d0c5d5 SHA256 43e5ab0f64a314e9da3f78ab2383ca9a998a1130ca005cd4a51316c729e06c42
+DIST firefox-10.0.4esr-lv.xpi 244349 RMD160 a734f8666bfbd6ee6214f36e7a52f5a1a05d755f SHA1 ca58959ec48ec5911f43e0e007400fb0eca603b4 SHA256 5169752cc649581f11a6dfabbe41a0698cd7708e55cd60f1d9a6126b362ccefa
+DIST firefox-10.0.4esr-mai.xpi 279251 RMD160 7bf6bbc7837b278b6cc4c10a05d103a3ff51b852 SHA1 db250ef7fef28e88a9c9b3e7297f5028ce572eae SHA256 45dd7cfb023a9ece20faf94daf43b6399586a69dba16404bd0b84109bd08aa00
+DIST firefox-10.0.4esr-mk.xpi 272936 RMD160 55e4911bf2005be3eb72227351d060bcd2696ae8 SHA1 c8af39466916d2ff7c12a471c650be9592988b09 SHA256 648a913256a64ce445cb8ffa4c53dbce635af451772c6cbc9c227bf48446e31e
+DIST firefox-10.0.4esr-ml.xpi 306673 RMD160 f9e78dbc2890bac47eb344acecaa3217758e9b68 SHA1 a98db3a820eebe30587fed78062dfd3780070726 SHA256 00795d1bab6c8dd1a41d051f3f8c941bd2d70d3d0546650fea88192bc6f31db7
+DIST firefox-10.0.4esr-mr.xpi 281455 RMD160 0f84d25c4aa2f14e2a813957b13e5f23a8081ce7 SHA1 d9de9cdaf6dafa7e9bb62b31dbe84d1af4980532 SHA256 045809988140f7c7df532d695f5a98afb87dab4d9cd69af3ff87e7507e97e103
+DIST firefox-10.0.4esr-nb-NO.xpi 241208 RMD160 f0b18aae9d9c7f6b4154ca47aec1606223aba931 SHA1 966e47176ff80896345cf46558301903ded3f31b SHA256 319f21a013aed41faffa238b5ec569b7a7bbd05830763e9befa8e8997b433bc9
+DIST firefox-10.0.4esr-nl.xpi 242398 RMD160 877fdf65f1c14f3848881a5a9f9d5705f447975a SHA1 5138313682775e5787dac4f89f977bd86c99d4c1 SHA256 30f29b6c99bf6b361ab51f097720c938c5985f93bdb22729f1af40ce84d6d6d1
+DIST firefox-10.0.4esr-nn-NO.xpi 242451 RMD160 aab164940f8c497026d46c7ce41f8576f6166694 SHA1 a2a829af14091a073e13129bc3cd9bd0f25b9462 SHA256 eb0fd49839e38fd06a206241261ec80af54f9478ea7dddf62ae43f685264722d
+DIST firefox-10.0.4esr-nso.xpi 245692 RMD160 7b0fe1cac7c5142b9e772349e294320ac6ba1e04 SHA1 b9a6c091a6c4c0faec7525b79dd1628fa8dd8004 SHA256 91062d27b1d6e53001c2cc3df61c6dbb79a760e1d6fad63b019f142216b40d60
+DIST firefox-10.0.4esr-or.xpi 281684 RMD160 684cc35f7101e1a678782fdb9672649ab0bf72ac SHA1 b9685b76f8920207eae93cd1296c460dddb46d2e SHA256 da63d476209fee28fac311a532761f53ce38942f5c8eca32c23ca94bc464487f
+DIST firefox-10.0.4esr-pa-IN.xpi 282142 RMD160 9b22bef2cbf1a6c6bd36d5d3e903764b02266f05 SHA1 e14ece60b96b631836b896c100802dae5e80ea2b SHA256 f58c26374beaa43bde80624a553646281d0471e0ea6a5e14365141a415940d54
+DIST firefox-10.0.4esr-pl.xpi 252043 RMD160 d3c8018e934f0a978c01dcd4802dfed01617a810 SHA1 98bb2ea94d499c4b4f954aa350bcb4a821abd8fa SHA256 e5c0523fcb8b7d6bdf877acbc13999d685f4fe1af361d4713ad46df057b3dd57
+DIST firefox-10.0.4esr-pt-BR.xpi 246845 RMD160 4d61571744c128636126ab7bc471fb22a6b4b047 SHA1 c537c27dbd34588d03df919f572117cc0d8b103c SHA256 5a16ad83498cb495f47da38b4d78e03d45babb0af2b817279084d57ca1a24be0
+DIST firefox-10.0.4esr-pt-PT.xpi 246471 RMD160 2f4efc922dea62c65d201a4b4ddcad5cef257389 SHA1 c09d552f8f0c5c76acfb7b92e934cd8f409b205d SHA256 0d905cc55163c4f22260b368118c2e5a4bbda94fabd298da0adc66ad903571e8
+DIST firefox-10.0.4esr-rm.xpi 245768 RMD160 b52ce11966941c368a83fa5df9b4bae87ccfc871 SHA1 aa8a93acfa2b5d5bf167602f043b20739c161ca0 SHA256 eda7ec6d1f2a4af0cd4d1d3310276305d86de6b0adaccab11f041e03ae7f0973
+DIST firefox-10.0.4esr-ro.xpi 263249 RMD160 dc658987f312e5b8db80abe03baf1fac41e1da46 SHA1 d4489f5d7e19c68d1a42af59d093d165e232ceda SHA256 13760bc76e3301d88d38159450062224ab849f47070d3effb16e0eea45666c66
+DIST firefox-10.0.4esr-ru.xpi 254982 RMD160 17ca10c744ee0717a9d8dc45740a3d1fb67367f4 SHA1 0c868968a3b95eb7c798676459fa85861d23e7c8 SHA256 a51ee9da4dae375a459dd8ffa402a57a335c19102f96fba4dacd24fbf4e691a2
+DIST firefox-10.0.4esr-si.xpi 271987 RMD160 9dab98549c61f26b58fca4570b3311dca5680f69 SHA1 e87f8dc36fd72f9bac89af26cfefb31126760acc SHA256 33f0838a17e4bfb9a1b94184011f40e4cac316c48cc92d9fa84caeb11c44e422
+DIST firefox-10.0.4esr-sk.xpi 254286 RMD160 30ff0b9086338462bc299a31e40ca9c29c9cd95d SHA1 3f92e0619dbe23b073ed8a39175dcfda20b84bf7 SHA256 fc8d6c7b040828946deda2cce08647d953cc6b4962e3e60dbe153d89aec2741e
+DIST firefox-10.0.4esr-sl.xpi 241031 RMD160 d8491be0b8517c440f6093e0ae97f1e2a0d56a2f SHA1 156995525dae36d07c738ab6d0381bbbc4b42e32 SHA256 99e5b4936817aee29a930aa07649212868bf304b2f00c1a1119cebb5f24402e3
+DIST firefox-10.0.4esr-son.xpi 239057 RMD160 442721aaa6f51cd54567e3ff71ed9ac6d6e7fb79 SHA1 3d839addcca49ac7edc59c1c560b949e32088a4d SHA256 36970881af28cc5d5f0085aeddf4f8fd62a8d69a93b32c075756b4044e19c356
+DIST firefox-10.0.4esr-sq.xpi 227693 RMD160 47f8a72b1575baf16e9073e3e77654b4834be151 SHA1 c8d7472a865e8fb8d15b0a497487f8fb6ece51f9 SHA256 b8e5143f0391dbb2719a1f4b2dfe285d821d10929b774180764c86c1e1ac91e0
+DIST firefox-10.0.4esr-sr.xpi 277743 RMD160 b685b6a097184f0304f97b083ba6cdd81687555e SHA1 9b5ae0564abc6d97dab7eda2774fc089407aff00 SHA256 30055512a7812cd19ed88ce4c864bd76d5651398fae04958b8c0272f77a65fce
+DIST firefox-10.0.4esr-sv-SE.xpi 278877 RMD160 954a59a6dd95856cefe83d50c91e32a1bd4ee6f2 SHA1 df0b8dd862fef07a5ab2386ae8e62258be2b79bb SHA256 2f077a94bc2348255271cdad2e5ba7b87077444b345029b9e3ba9a7f30741ffb
+DIST firefox-10.0.4esr-ta-LK.xpi 290616 RMD160 33b0ea12eda629985c8eee45e7a1d0697f8c6cef SHA1 68e4e34edc4d966b4e3d1dc7a133f33586d246c4 SHA256 e6b1c89e1c39461402a95b66df0e116702654277eee376d08baa9008723ceaa2
+DIST firefox-10.0.4esr-ta.xpi 274052 RMD160 2204311813534d2555dc87376416b1221af48ead SHA1 c7ea6be9e83d0da58a88d3ff74a4ba0ac1556792 SHA256 977a0f0880b587a75affc15924cca25bed7876f628a1308d579cd273c46e748a
+DIST firefox-10.0.4esr-te.xpi 289043 RMD160 a74230f1684fb2b967f57d591d2f843064dba507 SHA1 241cd92879a97ffec7ef1862574fc93fad6c5053 SHA256 1cf73e705370503df7315353a589ff719046dc03b316487389bba54ec67b580a
+DIST firefox-10.0.4esr-th.xpi 272418 RMD160 d320851f4e6b4499c204b2235903828b8ef54e2f SHA1 598e4a74003e4ba057b83e1c590e775fa49ec23e SHA256 3d5ace42b2f7bcbd0dafd013e77478df67b645105b4fc8fa0e70803761d7d133
+DIST firefox-10.0.4esr-tr.xpi 249915 RMD160 c85216ecbaa925c8e842cc66b49565f490e8f810 SHA1 0053f574461a47879d37759fd64d0c0d878ed917 SHA256 86d718c4721cb945af3e3e1e66a043b142298533272692511c1ed1aac9f42a02
+DIST firefox-10.0.4esr-uk.xpi 279130 RMD160 7ab8ba6dffc6802010089bb654c03d482b904ce3 SHA1 b14a9ff70d0b0398c5bc8e6512552657467874d2 SHA256 e134316824ec76efa72907d80ba98e97ab19bed1af7b57728f704fbddff06349
+DIST firefox-10.0.4esr-vi.xpi 262783 RMD160 d12f5fede1fb35ed0859d9675e15b342a7d25ef6 SHA1 eb10befffc8e440f7d89bd37c4800766f9479690 SHA256 9ca45a0eda9696d8769f26fcd9fbe4ac84af7c60e905156a57368a4db3bae74a
+DIST firefox-10.0.4esr-zh-CN.xpi 256544 RMD160 0d2102ae66aa03fd11cda5523e83a20104e2ad04 SHA1 15a759f3a5c16f356291fc2d15fa91c469f9f508 SHA256 57c7767969ecdda513cec23a540488152369c6121b8091941255cba64f45776f
+DIST firefox-10.0.4esr-zh-TW.xpi 257489 RMD160 130fdc757225a89c48b3caaf7f2b85ba86449281 SHA1 a8c5b5bc9939a8ff75311ef961b51801c8442b76 SHA256 bb0b95ca4a489178f0e0f765e5d166bc853872878f0e3ed1dab95ccd68194634
+DIST firefox-10.0.4esr-zu.xpi 246392 RMD160 899747d1c870c22b5b1bf6da0f05b867bd196a54 SHA1 da4f9069a24f47af48b189cc0a4c96e0d869c23e SHA256 7467cae292d3a13976a1e7b8f3526474e646fbeab17ca378c38b923b7530e59b
+DIST firefox-10.0.4esr.source.tar.bz2 75714917 RMD160 094c5017a0061293e31144d768877189e2064cdd SHA1 d20c07f40fec96b7d267bddc8d1b41b47b6495ba SHA256 9bd156fee8297617935179b2906c69f9b0f3c0ff5273494b5acd27b4fbc5f51c
 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
@@ -492,171 +404,3 @@ DIST firefox-3.6.22-vi.xpi 129057 RMD160 b5ca67f37dc07145ae1334d8eb320d7e1aa6173
 DIST firefox-3.6.22-zh-CN.xpi 127122 RMD160 9913f627ab6d61397855b4fd10499b4918d455f5 SHA1 3769f80cd7fcc2766cef34568ca56386abd173f2 SHA256 9504543fffd60418283998371ae53e825a28b7026ff728e86c8c176e1084ed3b
 DIST firefox-3.6.22-zh-TW.xpi 128514 RMD160 2fdecb3fa108eb5f3cfc292bbc4044a29d75ccee SHA1 bdba3a5a3178dcbe1e017924180a4694baab0cdb SHA256 e79523b5b61c85ff58a592ab3ffb512ab1db0de58edf1f8a60ce8451dae126f3
 DIST firefox-3.6.22.source.tar.bz2 51675082 RMD160 7b5cd6bb9264b97b0059bb254c383d9237982e4c SHA1 db7953b20568126a3ffe7c5a89ab0cecac4b0a53 SHA256 788e5a64f8bdb07183405c568fda70d8cb7759d3a8d75c404f3589fe8a039229
-DIST firefox-8.0-af.xpi 227038 RMD160 2e8ddd25cdb6a25f6a3a7ff38528342136e712a9 SHA1 4893b99cdf7020d608af2e4805af312e3e559421 SHA256 5c63d809c19a6332a728bc1a818b804c09b2ec122f42e773285c8f247529c7e9
-DIST firefox-8.0-ak.xpi 228653 RMD160 64726a43b8cf4d1ca6a8c896655c4e222e55a98f SHA1 985510e14a3ad29308e492747a0a1fd5e84b3e37 SHA256 926dee62d6c8cb24892d9a5bc38943f20213f408d58c1fcf441e8d566cc7323c
-DIST firefox-8.0-ar.xpi 248245 RMD160 75f4ea69e4ffe92002131083510ebb6302464e8f SHA1 0876e6b069b5d422ff5c1e98bffdacfd829c8324 SHA256 aa0c13ad9e4ac94ea49727b64d8397a1888b1631971570591a1ede0d3250f5f0
-DIST firefox-8.0-ast.xpi 222524 RMD160 abfb12f5c98c185910aa3e996833efc31725adea SHA1 b742e09f61dfa5e4942db3b7e4e8ad6e6c33dcd3 SHA256 cbc5f9e4d8fdd4ea6999f5707b703ed05095011d607437f0ae556a23f17ea2e1
-DIST firefox-8.0-be.xpi 236531 RMD160 5c6a49bcf3eb43092968b6cbfb67fea7195b93d4 SHA1 bd08a835f47653e4ef0daf414270ae3d4b1374ee SHA256 8fd1c686f787859bd89662c7048550d8026e046aeaf8a690fa66532c557fbbf4
-DIST firefox-8.0-bg.xpi 259782 RMD160 5d5b2fbb455b62192e6ef6b85da3da2683893d03 SHA1 6e21fc90a57485e90741e229e440a7f5885a3764 SHA256 2e2a6a187728e43e5af33bf47e14db4bf6e881aee2af39a4e7bad6be91c7710f
-DIST firefox-8.0-bn-BD.xpi 273609 RMD160 02c11df530a68b4ac1caaae4f47c9dcd5580a88b SHA1 e2e6611c1ff61a295240015e2aaad159fabfdfad SHA256 a89ec80b1979872d4686cff3c13b6ac5f2aedfb264000f7089fa7e6534e4de8a
-DIST firefox-8.0-bn-IN.xpi 303021 RMD160 efea8d816b5f892e77525e3476afe0d08acf1fa2 SHA1 9ee2384a76775228902ad586e23fbbcfaf5f0ce1 SHA256 0fac4cc2e617397c1a06964effff860e67270c3be00f346616d225be863a706c
-DIST firefox-8.0-br.xpi 235604 RMD160 23b34d18eb521f27d1c16e2f4119b5b6ff0d9986 SHA1 36d7786271bd3b52179ca4a0823983d455ddc64c SHA256 8d3ca1680e14a6d34354cf52f9481b2ef3a8b85466e8c8a3fcfbeda1bc1ed057
-DIST firefox-8.0-bs.xpi 233304 RMD160 cd743ceb04fd044fb754f00f2c7a571299f1d09b SHA1 0f29d6ac65c2b55d1a7ee5118c8713a6936c893b SHA256 77ecb7f0ac79fce5fd453bbfe92314e0946960a35b84b1b3f6a2871b8e107487
-DIST firefox-8.0-ca.xpi 235712 RMD160 14e2a458e8e1ae3862c7c07f83c13d8344e13e09 SHA1 a7e85b4773efaa7e17c707bbd5b566280737747c SHA256 e371f655bf66f7ae0762be939d0e959485a3ad9058ee1024ea47a3320f754518
-DIST firefox-8.0-cs.xpi 236152 RMD160 fa8d25d55e7a4388625e456de2587a879da2f196 SHA1 a4b148c9bf5f2373d2665daabcdf6ce91a5a666a SHA256 98cea1111f70a09daff0619f2fa682cd64ef2f8c73ef769f051fdafeae15afbf
-DIST firefox-8.0-cy.xpi 229663 RMD160 cec962893cc7eba999f76bf87aa3bfe52422d73c SHA1 00f90ef5cc344b6b9009c4099df29cc291c032e0 SHA256 38081615bfc4e26e904f535be3cec0957d5134b2e45e3d61bc47260b71c07965
-DIST firefox-8.0-da.xpi 228371 RMD160 10141b0df5cee564cdb92975f0113c5955d17b47 SHA1 cd7b97df4fadc4bd3eecbc57524bdef206484730 SHA256 e372f176a186b3b733f98881cd94d1513647bdbc3370e6646c399087d5808a96
-DIST firefox-8.0-de.xpi 236423 RMD160 3131a3eeab3753cb001f1ef871fa9d0de192762a SHA1 1173240f7dffcaacf30e90f938ffd18cbc094c33 SHA256 700bb5248a270045700a6f443a877730ae99707c23acf61c117f8c627c6db1a3
-DIST firefox-8.0-el.xpi 251484 RMD160 fdb896915f993954ae38bf420b403583a2b3edc8 SHA1 ff1f511b64a9257c36ac6b9735faa688b0758f31 SHA256 eb88d7e66a7309e0ea10586c522ab6b3d74da1ab9339d51903a525369cec9d90
-DIST firefox-8.0-en-GB.xpi 219604 RMD160 77a82ede5381c7f20da53e82689c798702c11c15 SHA1 ea8c3c5036a0ee152fcb8ae6147c71c9bd66edf9 SHA256 43d362e55380ba57813fa929a4f2ac35f63214e72c660e836e7ef44fd328d9cb
-DIST firefox-8.0-en-ZA.xpi 220975 RMD160 bddd488511d9564160223c817e00636863e8e431 SHA1 284673a1f9174f28b97d9d274ddb27af647da1f0 SHA256 ab3163185d4add78486c3459a962885a623e87d3b4d30dd05ed5ff086ee47e1f
-DIST firefox-8.0-eo.xpi 228870 RMD160 adc317de4d4859a856745e1a16bc81738dd9ec12 SHA1 22386b6671324a7bc8f5bce2eaef3ec37b3badd7 SHA256 6628d7e61f2ad420dc9dc8857684a86dec4930947064af59931018a748ac1f1f
-DIST firefox-8.0-es-AR.xpi 232815 RMD160 9fb0868da33a0d6beb95461305ee6e004d321e6b SHA1 c4aa7a0bf92862d18dbb6e56b28148d9bcd8e9b2 SHA256 5bf026d3f6f50c6ecc410d77dfcd9f032925e63f95d56f724e307ba71b792951
-DIST firefox-8.0-es-CL.xpi 235293 RMD160 f9b2cc7411c5fe963bd1f2e2166ee56650d97b45 SHA1 71cc176ed4b7cc8702cd8cb4a67c9a7e1e791794 SHA256 394b327d90e4a3affc250d499cd8854a5589cbbb3f3c7501e9211b753d6b8400
-DIST firefox-8.0-es-ES.xpi 206605 RMD160 35b54f8aa323e4ec969ce278f056accd16241f59 SHA1 45ada38670c8239060118feb7bbd9c370af433e4 SHA256 3d8caa12b35d65e85ad24b7ee62db58ec44fdbeb896d87886a8ebb645cb1ea1a
-DIST firefox-8.0-es-MX.xpi 207459 RMD160 968e20ce602a10fc2c17ec5e967c1cf255ee7815 SHA1 14b87444c98dc8254e229f04c2e7fd401670082b SHA256 4f1b6eae47f912a03d07a4cba2fc4f9d8ecb5619d3bb6ec367f1d22804442151
-DIST firefox-8.0-et.xpi 230283 RMD160 10223ce2807c967c4e175394b3aff3d658c060b4 SHA1 9fb2cc5a3e57c548eb355932082b517443eae038 SHA256 1216729dff3f60aaa70f46c3b6a4b1b057b6a1e20c39c48fe12422557e0df221
-DIST firefox-8.0-eu.xpi 228065 RMD160 06e61259d0208b87cf05f1ca5f9ddaf57724683e SHA1 e39a63a3814d4a5aeb749fec5c35cf18028be949 SHA256 96b011d99bdb19ca4536080bf95699b5d5320602d730a8baf7b9663fad7e8262
-DIST firefox-8.0-fa.xpi 257339 RMD160 4c4e679e584c2fe6b551ed775e61270f7f645517 SHA1 0bc04d03fc239c2da89e1c7d72fc72a28260134a SHA256 c74bdff47aadf36ef485cb88bfaccd5f06afb3b8f0d545697a5221d5c608dc88
-DIST firefox-8.0-fi.xpi 231178 RMD160 04d4daa406354728c96b1b000b11f5d9141b034b SHA1 66fa4a3a436a4867eb299d14d41ec130e908dffc SHA256 99524102c61b27f7fa6cddbc477cb5b45dd088453e5fb7a164a3d83a7213125b
-DIST firefox-8.0-fr.xpi 237069 RMD160 b6048e037e904e5861fd0d9ace446cf6556e4737 SHA1 cca0114141d2b372478acc3633ce2a2885bace73 SHA256 41448fa45220f5e0c556c4e160cf49a670481a11d922a620f5d7ff94cf7ae318
-DIST firefox-8.0-fy-NL.xpi 234377 RMD160 55212d5399061499635880877e469356ffe52064 SHA1 753d025d137d4803bab5e00657007d6b002da595 SHA256 c1e953d64fb61f2ee522873128d23dac726eacc3343526098d499039ff2a7c5e
-DIST firefox-8.0-ga-IE.xpi 239393 RMD160 05014c17d2ba94d976b22ad17e374c2c2dc8ddbc SHA1 51543223e4241ae3754fec22534d109f995671db SHA256 b66ff1d60e8ae58a8f60f873370c653bd3f35906dfea8a6f2ec3f540aeb3a1c9
-DIST firefox-8.0-gd.xpi 240921 RMD160 ec378cb84bcaea473d56951f86bd75192680e755 SHA1 da111967490096fe21b3229b4008069a5fe521d4 SHA256 7ea2ad77a1ea63481a23519906357b39f8c28e94d5299ec5e91614cc83ea9658
-DIST firefox-8.0-gl.xpi 230996 RMD160 ba36869b82140a0b175e46373ff4033fdd8379ac SHA1 7b968801be717b8c4f5ea5d9a5ed4c0c31d5eb81 SHA256 55e0fa621c74acec4a40c67638b90a34983be2652ce66111f6cea79ff7f7f428
-DIST firefox-8.0-gu-IN.xpi 260852 RMD160 cd484bf7b550c5698093f073eacfc473858688eb SHA1 427f5c54589f6a769f64268a7e831c29429972e0 SHA256 de3cadb8379a4109f867da9bc7d584673ba7c56c8565d8e2da1772659917401a
-DIST firefox-8.0-he.xpi 251243 RMD160 9160d6973fdbf8ce392777baa1591f628cb43d21 SHA1 803811492ba842b587d4acca551814d3b430ffab SHA256 b898f7f61773af974ee66a466fdcbcedb713c45a049c1fabe1bdfc0a9483ce66
-DIST firefox-8.0-hi-IN.xpi 264513 RMD160 6ae31e88bd7dfe537fc4783efeb648614ff67b1c SHA1 aaf94004733eb9f6fdcd5f720236219d2289355f SHA256 22a78f7f9f56b0a6f7f2dbac5dfc327a09c9e68584cd18dd50c10ce90b4d6f92
-DIST firefox-8.0-hr.xpi 239498 RMD160 6e4bce60947c213b41f49a37da8c42c185ec11d1 SHA1 7829ded21be7b5985e2383728f1c227323358c82 SHA256 4317ae1d89de2a28add1aa5891d8a3e9e5c7c2ee34e13883da0bfcd0d6c80cb3
-DIST firefox-8.0-hu.xpi 241689 RMD160 8c4fe08072bc476e434cbfc623a8d947a94de702 SHA1 8a17320afc7a41ad7e153f6c17d728173590a950 SHA256 47fb39be733931cb46e34adf3a206fe58f52f6b48b3acbe5e4e5b3aece4edd6a
-DIST firefox-8.0-hy-AM.xpi 431335 RMD160 8743befaa41033908211eeb283ada7bf5f45be9d SHA1 c7d4c4f146ef330c72034df386e1d784e631c5dd SHA256 861dc7b5088cc06cc2cb932babedd2d151c542583dc3daf367f9f4c0a1095d9e
-DIST firefox-8.0-id.xpi 224907 RMD160 f929a0678cac082f3085bd1fc0f7376f0e8f5b16 SHA1 f00fabeed18d7a0f099e21130bdfe8ca94af1ede SHA256 59d7c13ce9ad90fcc9954c0c51af2d5642d680ca1592fcce93f7d4a8e0a9cb8b
-DIST firefox-8.0-is.xpi 230806 RMD160 24358ea960652f4f210cb1d5cb4b04e7c3d19d93 SHA1 cb3d8b7209382b31c3897c46826684b81d1ca6be SHA256 15d7917b61e520af9d3fcb14a4cc8cbf4870c64cadb1c034e46ef5ec4b3adf04
-DIST firefox-8.0-it.xpi 204075 RMD160 daa250538119f1f21372716d5276ec9ae456e1c6 SHA1 9e4a285946889eb917159d290eabae208dab0574 SHA256 91296fab514450cceeb4b926d7224350456e1ec434a55503be1abbd78e051356
-DIST firefox-8.0-ja.xpi 260221 RMD160 d0568b1a2b03660acfe1c6e8437ae0affefd0447 SHA1 25b73b9ca041aca73bf3c98dbb80f4d43f9220c4 SHA256 61b44806b3890fe1016960c5c0d827640b15b3b549d0d8c093120e000d51e04a
-DIST firefox-8.0-kk.xpi 263696 RMD160 c8e8b8fc62adb4c077662ec4048d554fb1acbf1d SHA1 2d0a40213d0ee94aa47df28eade506080a0ffa22 SHA256 1a0bfa5f0ffca6634fedfa9fa4e2b87528873a82fb589fdaec48c0b40270d5de
-DIST firefox-8.0-kn.xpi 283736 RMD160 ab89748d336be2e9f9cc3c7ae412abd657352e19 SHA1 1210edb6617c48f0837c6fb552e35e4b66ce7525 SHA256 16e2eb4ae179f1216ca54480a086e553ea418f722bb93cc45630001c8f6a83d1
-DIST firefox-8.0-ko.xpi 215216 RMD160 d562634ba168af86ed15387b0522f10795cc81b6 SHA1 016ef140a01ef0f426dcf37c5c26e317fa2f8967 SHA256 c27a6c0abce063b2ac3cb2e56a90555b10809b555c0a2a0fe98f4da207ed86d4
-DIST firefox-8.0-ku.xpi 239272 RMD160 84711d9fc8c5a2866e18b4c812d0f7cc16698766 SHA1 527eb7fd61a04f8db4f6b1224ba2c1655718e50e SHA256 3bfe1871bacd12857c1e20bda83f569bc21d372de8ec1ad70dd3ef839d46523e
-DIST firefox-8.0-lg.xpi 235459 RMD160 5130628e268d2764cac3a07ef60780c83827cf75 SHA1 1dd9cd5dbd699702e5646164f00d2fa9d64f7046 SHA256 9435b77ff439aa19ea98cc6d8de8bbb7d54d27e7f94a29db035b0890a4b886f1
-DIST firefox-8.0-lt.xpi 320556 RMD160 ed20a7d44cca378085b44436966fb9b04a362df1 SHA1 5066ff8cb6f186e2cf431ff4d5cb7247c6cf01c4 SHA256 81c169c8137d8c3e2c0885f2fc52894984015057e3b192fe7e47015e5b6596d0
-DIST firefox-8.0-lv.xpi 231978 RMD160 8096fcc1ad4ca195ac2a6e96081ec004655ae388 SHA1 3b73960b424244846f71e4f1fee7533691ca7b84 SHA256 b0f1863e5f5ca1a1c003eddeb0bbf4af6fe04e02acb759ae30c121d5764f3aee
-DIST firefox-8.0-mai.xpi 264043 RMD160 fb29ddf5c8c2a34c99787364f5aa48e7feb34f6f SHA1 4e8ea2d3e0f03d80dcfad9616da236fc2f6e01cb SHA256 3e9581657a47bac7b8729ff6d9de0a9da6eedcfc4c3691779af07c79f94752e0
-DIST firefox-8.0-mk.xpi 258223 RMD160 adbe5d92be5d5b755ee46ffb3de833a0df2c9bba SHA1 026dd37487023a492c97a100ee3a7f5f64026372 SHA256 98fe000b35a3ba06540d1897decfac3387e222698ac29cfd73f888a2b709591b
-DIST firefox-8.0-ml.xpi 290671 RMD160 43289cb1fe3b900b5c4b891f6e4ac24658c59663 SHA1 00c663c0c89b80785a462a8bd7b4542f9f2337aa SHA256 28c61c03a5bf402c9a47c34cc0d8d9a8c4987f776080578ef611f63cbc9061ba
-DIST firefox-8.0-mr.xpi 266706 RMD160 0df10dbe63e157f305d1fe4a20e2e404de3ee48d SHA1 54e5f088f871e7e389d4b8d6564c7f9a0aeae187 SHA256 e2612fd058b5903cb071b12d45db7eef42e96121be9a919eef7243bd6b9f6d23
-DIST firefox-8.0-nb-NO.xpi 229160 RMD160 0846d05e208cba5b1a49fbaf54f70d7a7f2f7b83 SHA1 3c2708f36c831bb80bc08fab2d562fed6cc58ca8 SHA256 755ecf80fa1bba5c97eaa9046bd0776a8438a4c0989a9a91b6d073ba57a962e8
-DIST firefox-8.0-nl.xpi 230348 RMD160 a54005d2355822e2c7cf53c822c9fc3332fff839 SHA1 3e555aae4009c3f2133d0c1e092f83c6c716e512 SHA256 94da51857d398e916e396a9b5fb5acd971e945445641c0ea74b72902c6a80e1d
-DIST firefox-8.0-nn-NO.xpi 230399 RMD160 626612eb55103be0cfc83ae109b1f432ecf86786 SHA1 7c157d4b3b9e3d488616e1aaa6ab1a08884253fb SHA256 a65f70af550eb01b59e9ace4090848d8492d825b13b2ff968d2d326c250d46f4
-DIST firefox-8.0-nso.xpi 233834 RMD160 41a1735a8a443c2a7e36edcf1c6ff5bf6b8397d6 SHA1 a0e61c2008625546f56dfefb79b980d5e745b36d SHA256 caa8b7ed1fa2fb736996370aae1393d0bfc3dd76b8f86ec07c2d1e313a1ab63f
-DIST firefox-8.0-or.xpi 269665 RMD160 ba4c3d379989c7abce4e8e8a1ba1c8080594861f SHA1 d0e76f379bc5f38261fed113996388ef922a59d5 SHA256 bfa96aeb4d6f0dd4acbaadaac8d9c36d45e14ec1b30004f2ee7e71574a12f966
-DIST firefox-8.0-pa-IN.xpi 266300 RMD160 374f4427079e62b62da93f17b5da7f09726f3f1e SHA1 b1d52f19ffa7d450d1a9066f4a0ae65d4ec1277e SHA256 677f2b8ccac8b72c6dd6198c7ef0684a066e836b5bb2c9f515ae533824f5f6c8
-DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
-DIST firefox-8.0-pl.xpi 239375 RMD160 47b213e0f40899e11a2dcae592390f303626d985 SHA1 999c76b0bd8fdf2e5a66371c1fb8c8c606ffdd3d SHA256 603d0b3ffc00551fe1f2f27255e5b756821805ba634efd2bd1474d4dd31b9f2f
-DIST firefox-8.0-pt-BR.xpi 234489 RMD160 2f009a0ff591216390859ffe69958d0122304ce8 SHA1 5599af4e8c8c1c8f78e7aada928eb2406ec9428b SHA256 9938b9d0790913b409ce81d2ff4094293503274a06230f521b8ea0949d79b235
-DIST firefox-8.0-pt-PT.xpi 234235 RMD160 b1524fefe5e58ac43bb0dc58478e7461f3d94c58 SHA1 0cb8eb593ed54eb7f6dec08a707d3dd69e2f21f3 SHA256 884d4455c18de3a41c2a449015235469bda9019ac5b95e44e6ee30ff7938df44
-DIST firefox-8.0-rm.xpi 233467 RMD160 f964196e5df584d5a378399b532deb46e4c8d83f SHA1 398dbe0e58bc55d81a47cc724e86e3bd8747a82b SHA256 e975177e48cb1f74ab39c6d5d9d0b3c3e9b3f7052539b2773ee1600ec2d3c528
-DIST firefox-8.0-ro.xpi 246673 RMD160 42a2121ad0ac4bb7c27e56ac7ce968a6f2e2f7a4 SHA1 b4e6463bc5a991824e041b996f63ced9a6dd4bf2 SHA256 3daff1cd78ccb248a4b64cddb58e692c54c295d90cb5dd08ebf8f5b5a4e0c267
-DIST firefox-8.0-ru.xpi 244641 RMD160 525fbb0e39742ace176fb623725594e5686c5730 SHA1 8fb3ea7a009567f56fb601548f99c1b9dc67398b SHA256 f9668155d5c51ab38e2d31db92e754a44dfa20544d08e10979a10194134fa727
-DIST firefox-8.0-si.xpi 259613 RMD160 34cb700ba98250aa6ecfc3dc440bb97ddd864e79 SHA1 1a44763e96b119df749fc812993945b48df10028 SHA256 299b9c58e704ae4072bff8d49901804d262d546ae04b1dafd30719a3eb7d0bc2
-DIST firefox-8.0-sk.xpi 241442 RMD160 f97319be89a221e728588b89e10e4bf719af0635 SHA1 2e8f10e469e2221006f8bd1faae551035195cab3 SHA256 530f15f397fcc69992e31f3b3f116ec395eb3c2a2a49f591d317185b20060860
-DIST firefox-8.0-sl.xpi 228920 RMD160 860d7281d590cab9341e0ee8d477a472f5e80e50 SHA1 5ea49c7dc7f2382b997828559090cb323f14fa81 SHA256 53443126e247c1bd59ec2e182a993c2773ef703003213bf03f0ac5409fac2aa4
-DIST firefox-8.0-son.xpi 227126 RMD160 f55d28c70c648bca63ebea699fb7e6ffdfa2aae9 SHA1 8ed337e4cea470bfb95a569afee929b7fa037c56 SHA256 0a34481858859c55f3bb7a603e3032b8b0e6bc10a3129ac0c583b6b02d03aa88
-DIST firefox-8.0-sq.xpi 214501 RMD160 aaa720189ceabd3f8f3c60b25449e4c02c40f4cf SHA1 1a16d4ac93621a65779fa450b2d9083cd2f83084 SHA256 c9a5bcc021af2652f05fa200e51e26d06b7e5ba10e1e468b1c9dccaa42673189
-DIST firefox-8.0-sr.xpi 263534 RMD160 8b56c58f59ef1aa31371b4008539fba08f4706cd SHA1 d5aa92636b4e15ebfd9577a28ff12ab8eb1c0563 SHA256 688bbade22a5165d70a9bf95d222a4c9332689d836d53abb695e90e4c2c29f6a
-DIST firefox-8.0-sv-SE.xpi 266714 RMD160 6ecd41bac85f8135cd8c41d2d9eaf2cc9778def6 SHA1 d5e230770fddf0af62dd8a93f5df3a3a70ec3793 SHA256 9575874c5632940338f6f26fe25dcabc9e7679820253fd12f07c449caabf10e1
-DIST firefox-8.0-ta-LK.xpi 276080 RMD160 afb05c40bb51bcb60698642d2bc47fad8942af74 SHA1 3cd519a6f65b55c391059ad40d3442d4b7afda55 SHA256 00f45c5146b0925d9a82d95cb5dc2e102341d15cbd29944578b3aaec04a84cfe
-DIST firefox-8.0-ta.xpi 259828 RMD160 579b8fca05d8a4c7092b2b8e0e3362eaa6f9b955 SHA1 88a5a5cb3daf24fd4837e85a1b742821ee7254cf SHA256 9be67d46d130807d08b7e8b333914003efec60691b19252ea9dc6cce30522e91
-DIST firefox-8.0-te.xpi 274087 RMD160 d882d75af16e48c603549e1a4d79436dc12e6860 SHA1 ac7156ed5cbddb01b6ec223417902a857367a69e SHA256 ddeebd051e18a3ed4fa7827dd1c8d02dc35ccbe0d48b10eec4ff110c88ebf88d
-DIST firefox-8.0-th.xpi 261251 RMD160 0c891d7ba70ba2cae7ac5731ff5d56a630023254 SHA1 a6b92c887ad807442a79e739a4167fdafdbd035b SHA256 d2cbf744ec3bcfb172a592c249ad418928fd3d4a66038f23947df89c59ae20af
-DIST firefox-8.0-tr.xpi 233606 RMD160 2f3b83b5a9cb9f7240353722fd78ed8615a69140 SHA1 d4a4c5dab683541d83d954ca2b1573f5b8e26614 SHA256 df554696d93c32460a86cbbb727e27de1640da6e58a116b3a21cedfa71eb908e
-DIST firefox-8.0-uk.xpi 267710 RMD160 4ed37860a5af5831beb405eaeba0ca4c8ed00a3a SHA1 114cea611f958723d41bbcf75fa8d839bd37dcf4 SHA256 ebe03cff3f6962d6d7bab20025a684a54951964347fd43dd955d524005237512
-DIST firefox-8.0-vi.xpi 248529 RMD160 25b37ac6891edf53512f8f784f10b9b66c099304 SHA1 ab2f854488b666ed269937f070e28a8845b26b56 SHA256 c4988705cffe66b6803fe880e2773d2e3d1e77a60e34b136c59a77a3321f7f26
-DIST firefox-8.0-zh-CN.xpi 243430 RMD160 50781f9c1e56671b71958962d8047f1c1e69e992 SHA1 4c524381b5e7789c678dde8b7703d9d215164b78 SHA256 c5f0a12db5fee1e2a755012d400a79527a150347ce1aff0208517afbe3a8a014
-DIST firefox-8.0-zh-TW.xpi 244296 RMD160 b61ad8ada60b9841a23c72579b9f903773b70e77 SHA1 faa4fa00a67585fd9cfba9e6cea2d4e4dce0f938 SHA256 bf988457d2174eaeba9272a6d049e27431fc2413f3b43ee8bab2924675dc24fa
-DIST firefox-8.0-zu.xpi 234633 RMD160 c8163fab204bf8b412345089cdc9a2a79aea4b27 SHA1 5120fdf77cbfd09d7cf211cfb1ec988eae1654b9 SHA256 856bfe9ea1251e1104046c1da1452298cd12280b8e281fa00a0618d7e91ab01f
-DIST firefox-8.0.source.tar.bz2 70377448 RMD160 f87ec7668b2dcc1bb581b97e1dbe85e4b97cb31c SHA1 843cf4ad70d2fc4b16654c3ff9b080d3eb357452 SHA256 d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139
-DIST firefox-9.0-af.xpi 229979 RMD160 1b49da15a50d211998fccb04e66a3dc149c5ae71 SHA1 87a972fdd3aaf034534c6d5fee32e9d78792a381 SHA256 341c153a31a4edee2f2a1b3977b8178a555a2254a9da968b87a4118311a4da6d
-DIST firefox-9.0-ak.xpi 231746 RMD160 9695550d7725636345ed3332fa922f3f097f6cc9 SHA1 0b1aeff4c1c3eb2839888eae24b44719713a29ef SHA256 225458a3bcc1dfe541c6e820c29d4ab30c9691555cadbd0abf76b499026416c3
-DIST firefox-9.0-ar.xpi 251469 RMD160 29cade7f24fdcbb17adbf3be78934f06754e7f03 SHA1 15b69da37ecd0a819f3fb9177f505c9d2e22df1c SHA256 377e03cd3af36b64d82a359a6fc2e5ba5242da8819d65bda0b540042b9c93e3a
-DIST firefox-9.0-ast.xpi 224384 RMD160 e13d9f4b09bbe0f8eb6eb5a8452f8cc56edc88a8 SHA1 47a76169420ec2bedc48a2820d8d879874323346 SHA256 dc941f6ba8956647ed97ea5023723b8803096f017dff3cbe11868beff1713cc2
-DIST firefox-9.0-be.xpi 238851 RMD160 16ae1ba067b73c0ec0cf4751333b1eade81015b4 SHA1 f9c9f0b0dc321214a915bb30084562bacf0a67bf SHA256 a89e0cd4241c3b07caf746e07a9a0078d37497e0dbe47267ac3a6548f972efae
-DIST firefox-9.0-bg.xpi 263298 RMD160 2136ffa24f4c2ad78045d88a3f0d633aeced8ed4 SHA1 503f94906b1107df5e641ecba17c972c7724a254 SHA256 fdb7d91aee0f7b3695abbbe0e4eb475be46bb837146b05e5bb7fb0831f3b3071
-DIST firefox-9.0-bn-BD.xpi 277691 RMD160 8d171639dbf5ae9ba6664829582a4f9d89c823eb SHA1 7ea919c8685e47db73c0ef58369ee3263ba7385d SHA256 97b75a0f3b40b64e2469ed682b622ba741167d3854bdfce682fc67b72d2a9ab6
-DIST firefox-9.0-bn-IN.xpi 307120 RMD160 d699e9c75c69c98b4d25ca3fd537d40d06a30c89 SHA1 da02d7e6518a8e32d3daa866402ca80f7cb38ea4 SHA256 61f40e7b53326d9498d64f9388f99a23f38d63af1966dda1af90e561f1bb3447
-DIST firefox-9.0-br.xpi 238630 RMD160 438201fe940561df2953cab614b0e892651e7a97 SHA1 47423901fc4fd4d92cee7c6aa60114305696ef86 SHA256 12c9352f0b03c02c3ecf49df6239c10ff5fdc864e419090c674026384a8ec0a3
-DIST firefox-9.0-bs.xpi 237061 RMD160 887cb94a7cbcc5bcca7f43d4064f49d558a813a8 SHA1 0d9aaf10ac0e8320c0071d01169fc230d0838146 SHA256 01ec8b3a8e1ea63b61ec3b050398f9a2a8583c15ea395c01ed591faf19e2caef
-DIST firefox-9.0-ca.xpi 238851 RMD160 a3849fbc848af0e0d536c4ce54098935d14784a4 SHA1 89e9fd0250903164e8fa8da4a52e0724580f931f SHA256 f4dec2012e8e21d045868e4b97bd69d0ce3b41790fa4687a73bb044a65683ccc
-DIST firefox-9.0-cs.xpi 239236 RMD160 efb65befd85f25f952d154c1f5e45ab41d3f3a03 SHA1 ec04528056f525aac333a634b9e3a5a41e96f451 SHA256 8c35a680cf461fd13a5495b4052c6f657f37a1a4f314651c6468efd6fe2996a0
-DIST firefox-9.0-cy.xpi 233606 RMD160 e92c352b3efdb22114ec4abe06d342d111086832 SHA1 4c281313d55241ee41fce03c0239ab3f434d906b SHA256 cfcc7aca2f80f770edb84773a2d051b3ae3a3e407341e77bf59f0752c09d0d98
-DIST firefox-9.0-da.xpi 231351 RMD160 5c1ab69ec5cbb8037429b80dda7f5af0ce7aa807 SHA1 7f9c00de6356eb00ca69b9068d1326d14bd1bd76 SHA256 9fe9f975d87edd0bbab0bde4017b93eab43cb70177a144773a2d97c6d48c60b7
-DIST firefox-9.0-de.xpi 239616 RMD160 e6c6a53a07c708502559228d5642aa2dc0dd15d9 SHA1 bb018dc41791c663306080ec1c99906d4720b0aa SHA256 4a87b32c82443e8851edd0b1bdaa991d40f03f650332977a4de97fb0e8184041
-DIST firefox-9.0-el.xpi 254828 RMD160 9c3ad853f48effba963763df95f5e723b7e9b3d0 SHA1 e2cb5756c16fe2d829d8f5c8bfab97086735e181 SHA256 03f04db0767fcc4cb706a01478e898774710ff098e557699dc1af03e3bacd883
-DIST firefox-9.0-en-GB.xpi 222870 RMD160 d321ea9d08c6641a51afdbd8dfffb08bc669e874 SHA1 e636889ff9ead851e24db04bd9b9644aa9003050 SHA256 4056f09ce19ba33520975bba26c2f428aed7b95cee8ab9bf82080dbbcd8ed573
-DIST firefox-9.0-en-ZA.xpi 221988 RMD160 56ee6f086c5fa1476577a1acae1232cb6f253219 SHA1 c37dbdf2c4948c935493d501287d3763d30a5b21 SHA256 b5ad42011b20eccbb53788ae38dfae548006b4234e97556b4f7fcbebd6799ef0
-DIST firefox-9.0-eo.xpi 231844 RMD160 48cb1e5bbcb974425916e635382dfbd1d4e6b36b SHA1 8e901c251db410dac46a72a4d20600d657b19765 SHA256 a59b658d12380e68f4d779c3c90ba0bedf6c8649de0a63d817a5281537d698e3
-DIST firefox-9.0-es-AR.xpi 235874 RMD160 c6e5cf5c28c115549839080c833c940e0f846b87 SHA1 fbb5fe8189b838cf349ec818b4c27a6439da2d1f SHA256 a24610a26e98de1060ed209e2411764b10b8307e4b52c116e7962ea861d6d34d
-DIST firefox-9.0-es-CL.xpi 239085 RMD160 35d3ee531bb1ddd4880e8815be540e08d32539ab SHA1 5841b34e922ea00dba2b599b69836967d81313fd SHA256 0619766763e80bf6b79d6ed656f06296853b6123db54f9fe3b7cc636a04b2346
-DIST firefox-9.0-es-ES.xpi 208558 RMD160 81d9ddac20e0f1d3ef1818c356e62cf1bc8f271d SHA1 d4d10bad0d25705d30c72d6f325e19db6e65b2cb SHA256 dddf213c5c47438677d789c1599c75baf4ccb55b3ae54800048924a95c8c0778
-DIST firefox-9.0-es-MX.xpi 211590 RMD160 69d0796dec76e3f2b6be16e18ed529d85f40c481 SHA1 75bc7d7270033fd3ac05835aa549d54aec7fbbaf SHA256 a5593638557b25e4266630224ebdd4b84de2d23903b3e2fab77c2ed4b656b554
-DIST firefox-9.0-et.xpi 233331 RMD160 fa261b2528795647f258190d7e7a4e08988dfa24 SHA1 ca8cfd59043a996a0d801ea395da14992c4bec35 SHA256 a0d98f92b22308daaab71a46b4dd0952b1d6c6ad4297a0d2ef18314d13fefba3
-DIST firefox-9.0-eu.xpi 231090 RMD160 1f5bfc07596aa2b9c1571df0e066a6e177f2ed6c SHA1 efe2b7eb97298fd6dffcf368e0f2701e9a48aef8 SHA256 8de1c48423d659c23e248ec0526b7d02150d1c57a5007443ff4f7e32d2e30e36
-DIST firefox-9.0-fa.xpi 261480 RMD160 3f496de445dc2d9f3c8e73a5163d60fc271cfc29 SHA1 e9ee0384d933d453abe94e708f4f690584ea85eb SHA256 039831158e675de9574eefdd16049e3c0f4339471178f453398270073ea26400
-DIST firefox-9.0-fi.xpi 234223 RMD160 d7c477ba251de73e1570695c86a7493905f66e30 SHA1 d109a8d814f85e3ef4b9baf8098eb1c022649555 SHA256 412c5098822f2ec89183ee93e2c0e3afb42c51836f2f909fb26edffc891624c6
-DIST firefox-9.0-fr.xpi 240143 RMD160 b459468f5f78e881020e0e027d0fc91c6773c746 SHA1 c8f946f33a89b6bece408c7ae74fca541254834d SHA256 7b490696b0f7077750f0d33dd174c17c9692212f4361924b243e5cfe82944bee
-DIST firefox-9.0-fy-NL.xpi 238159 RMD160 72dc1fe1651c899c6150160c1e5f5d5ab71ff7a0 SHA1 f99854c3ef2bbd4f87fc509cf36d0bad308cdab6 SHA256 64fcb84b96700a61885aebd3fe116ab5a8c675b83d41627b3d4089a4f1386e46
-DIST firefox-9.0-ga-IE.xpi 243530 RMD160 db0b8a23ac850c9c7c3cab22a5df75bf6770e603 SHA1 df4eb14a0693f70edebfdb8d3df584a9edc443bf SHA256 fa61064db020a9d077af6fa21526b620b2d3928440f08866e9912249b5d187a4
-DIST firefox-9.0-gd.xpi 244186 RMD160 c2160feeaa921897fbc7374658adceeb81b5eea2 SHA1 b763061f0afa85314ae7f533dc1d88ebbf57cc88 SHA256 2ce74794715224fea48f7e075a5b4f7781e6263eba8e20c1800a7097c668678a
-DIST firefox-9.0-gl.xpi 234759 RMD160 10fcb6bd018d411d4a527f045aeeaa2285a87719 SHA1 17bc7c056f46268a4c3696a955a9b27d6d5b7e2c SHA256 8f051e1135d9ae74f3296a731db1be9319a50716c67c5238fee8f2ed0b53f290
-DIST firefox-9.0-gu-IN.xpi 264953 RMD160 c559f3e6655c4368b5fde8a012cd412162d8649a SHA1 e433828fa89f8471f7b1b3cbc892137abe57cc07 SHA256 d15f36b7f5fa63af139d8794fface82e7422907b71b7def385f8540fc74a8f8c
-DIST firefox-9.0-he.xpi 255066 RMD160 4f6d8e9002af56928d6bd5b6c0d8685d42f1fbfb SHA1 e5486e376e5f657c2526fa02000222982f274c34 SHA256 451f4daecab87a00391aa1835e8ec097aec2b16a063be633c07b3c39e2af676d
-DIST firefox-9.0-hi-IN.xpi 268229 RMD160 b976fdde16f1b6b29328efe564435f9a81a181a0 SHA1 d7f26c30a1dcf9cdf6d9dd3df803ef4fcac4f184 SHA256 d6ce105abacb13d7d7d0fcaad89a43e757569782599d281b63fb708b7e8a42c3
-DIST firefox-9.0-hr.xpi 241130 RMD160 4c7673baf4f9dfeb047baaa8d583cdd3224716d1 SHA1 9c2c18a7f135bc17e35e7ab35c4e51bf7ae19db0 SHA256 521e480aa44f0f48cd8ca8c3b451bc186fadee18992f7ca372bc12c337601de2
-DIST firefox-9.0-hu.xpi 244797 RMD160 c60e0e24c399f29ed136a871c01f459ba37c4568 SHA1 9c514e45c8b4ec9581297dfca154665323b0de34 SHA256 803859c8424003c93edb4a2e8539cf9fa89dfc02bfadf5371e5be54be304e4fc
-DIST firefox-9.0-hy-AM.xpi 436968 RMD160 8cbb006fd525c1709bdf7478c40310b6fc59c438 SHA1 ecab4c38b6be908d5937f96e251fbfe033d033a2 SHA256 e304a4c10f80bf2ffc76f3c0fe5d2572cdae55a72dc91eff30332825451038a6
-DIST firefox-9.0-id.xpi 227822 RMD160 5cb0f5dbc749022b59b93bc32e71191426bce2a0 SHA1 7d423d475c5cb4cd5980e6a8d1e7a112b7fd6d37 SHA256 7f98ce6c4e890b8c0ec6e6ff513efbc222cc5e2e83ec5308cec5211cfdb00c5f
-DIST firefox-9.0-is.xpi 233869 RMD160 64c21915ebc535882ecf2dbfdba01e03aaf497b1 SHA1 e56386524364edca29f577ab1f4c35d189f7647c SHA256 7139fef72bde23f11dae021e1ea87648217a5c5ff780f079d9dce3865fde654d
-DIST firefox-9.0-it.xpi 205993 RMD160 036bf9016fe5747dbb3340d884e701b939ae1b67 SHA1 84c1d94270c92042c284948ba3a3d8d0e28cb34d SHA256 05554b78be9151bf2f61b96adbbc4114d5cdfff2798efe933a1699577fa780aa
-DIST firefox-9.0-ja.xpi 263442 RMD160 b6228a24a133812100932b37ba65a750b05ccbfe SHA1 0d7e783f59e63c0de16c1cb8438f24477463c2b8 SHA256 13d017b53b4f8a71a6faae5de92ef6ae1fa39de1752ea53fcacfff81147a96f4
-DIST firefox-9.0-kk.xpi 267634 RMD160 cbdc20af57354e83ece625fe92481f0a275e5d5f SHA1 92bf7dea50cbea8b896699bda195875d13f2bb47 SHA256 432318c41cbe4d11809fabf1e12750559c5c55e1380f8711355473ac46e6faf3
-DIST firefox-9.0-kn.xpi 287537 RMD160 875fbafd80611ecf86bb7be95743d0af7348137c SHA1 4a554fe508ac700c0406693337c943f003a552f1 SHA256 371887991bbacec6664dd88997dccc875a7ad745e9eb15758c82c6c95544d35e
-DIST firefox-9.0-ko.xpi 218493 RMD160 4bf04b83786a24000cb39ebd65863568b1011df6 SHA1 c04e975e49bcbcbde36cb304dfc8c1c1ec6e0cba SHA256 b93504b46fead572f5ee11dfafcf841d1623a847479cfac86a19b1836302ec1f
-DIST firefox-9.0-ku.xpi 243262 RMD160 576862dd44660f8f650b173950a9d317c58de890 SHA1 254b81bc1745de3a7adef5188c721e7e2b54572d SHA256 662f3ebfad413e72f8d2442d18b7b199c24f8ceb334ae65f3bc587b3535db994
-DIST firefox-9.0-lg.xpi 238539 RMD160 5d4c7bffdddd55cd26245a45a4a7e3d8b197fb8b SHA1 7455e5b53e166820317a7dc4a0cdf46fc80fb3fb SHA256 18c35c6577b1c029707f1b9f3ca3ed5fe77a150f0e2522efeb59dc3ee14e6f75
-DIST firefox-9.0-lt.xpi 323721 RMD160 5fb2a0ae1b3a13d2f1f11b93181f9464cb31df05 SHA1 97f398d66fe50bcd1bc62a3d64098e3d25aeadb4 SHA256 b1bdebe281b290854af263ff948cbec2843e73162f1702e5615ebdb0ff8503c7
-DIST firefox-9.0-lv.xpi 235454 RMD160 ea5f39796ee1883b298f2c22a30ce31ec84384fe SHA1 041b0f37979d67e46fec9044f09ea74d87c4c2a3 SHA256 12b93f6d8c97dcd50c5ad3acdc0f892a1d3cc241ed68e1952b519c2c6d61d47d
-DIST firefox-9.0-mai.xpi 267559 RMD160 ade9ae104adfb35fe088c4ffbf949619bed52460 SHA1 879fae3f3b527a8794524b586c9600d6e8573f71 SHA256 7b683a8e9f67ffcc6bbab7a9f96b509ca355cabe685e0730eb1219880d09b156
-DIST firefox-9.0-mk.xpi 262044 RMD160 058b0d903f79f1badb54ad5a67903674301c4a98 SHA1 3cc6890d585ba97f1a205de8fdc9335b957aa1a2 SHA256 7a42b964507998b82d3addd9be368a601655f64ff0dfc1f19611ff6b086be5ce
-DIST firefox-9.0-ml.xpi 294757 RMD160 5c3f965ee970c288c107f9746dbc344e6482f2db SHA1 f4d84423eed5bcfed6e66f4e5b6fc3af17b2be73 SHA256 f854bf64b94f4aaf2315912c8ece5f5d965d558d2f5eff0ff0f8a823d0443c5b
-DIST firefox-9.0-mr.xpi 270657 RMD160 355d55c709f694199bb24a5e30746948d58fa006 SHA1 93f92c6582681141601a27bd528da7eeb82e78bd SHA256 64b96063bc55a6fbbce0e95b44ab4afed07671e9fd04289bd766bea054d82d0e
-DIST firefox-9.0-nb-NO.xpi 232126 RMD160 fea556876d8d2fec59f604fce229d6acfaa6a091 SHA1 4eaaa05a864f41f30b634dddebc09c364900c278 SHA256 5aaae9c845bf2c959db6264425256d363333484b7ed06d1a6218d6dc2106d8d2
-DIST firefox-9.0-nl.xpi 233327 RMD160 4821e213e48794b25059e3e6af150edbbd005fc2 SHA1 8d38c09d003c2831d00922bafb73dc83692a373c SHA256 0b07ca47ebce693c7d79ae9fb3ca5f9c27c0f1632aa2dd10cf38cefa3da3724a
-DIST firefox-9.0-nn-NO.xpi 233350 RMD160 6fdf0b88ca79f3a36b248af1ed262b61f59965f9 SHA1 8e1f689e0e36f515f8066d70646955865f527665 SHA256 a8dee79462f6900d5db8dd672535f6b19cda56eb7e6dd50c1414237ffafc11ac
-DIST firefox-9.0-nso.xpi 236893 RMD160 b76b0d8c41222c096df5d6f30ad5a07c474c9421 SHA1 cb2d6dc5e170a7eb95ab5cc5ac24f23c64eb9e94 SHA256 7a9062c6a91d8ec59634dcc1e67f2298bd6e1a7ee7e37a4242ce679d5325b0e8
-DIST firefox-9.0-or.xpi 272422 RMD160 4625f1f1674c875054714ad07fab68589f8b42be SHA1 6de182e3e3817b33fd1c0b27c83f63773b6ff662 SHA256 56ff2877c7c373e041787d7f724bafb42b2c0535b82facf8483d7f4030a92dea
-DIST firefox-9.0-pa-IN.xpi 269489 RMD160 62d30d410ffc1e4d6b5b47c18150a1b7b4d03983 SHA1 2066294b420fcf64c39122c51313f152645e5c4b SHA256 758832b22877e9d6061e559396f6add61e4426d7aa31985f03f21acb67f4f711
-DIST firefox-9.0-patches-0.5.tar.xz 18580 RMD160 66870e2e194454cda309458d3793bfbe659d0598 SHA1 9f1f60e68330462e24eb81b27f2e3348689321ef SHA256 dc88f027f73bc6352da0dc873bc5ed63e72ea4d7db0aebfc44834f0b967ecd4f
-DIST firefox-9.0-pl.xpi 242494 RMD160 754ae18620261677cd46e4e8fc7d668e7d5c5b87 SHA1 a3deac1053a947bb71af457c648b6a50411cf020 SHA256 0a5f82a6c49dd6bc4cbad5475dfa351f5529f3fb913f7de82fed2f5183d3c6e2
-DIST firefox-9.0-pt-BR.xpi 237429 RMD160 9a71594267537fc8c9db4d409b50124f31176417 SHA1 b632497ae96217e5af7c8550153839d8c90bf19a SHA256 d7c4c756660e8513cdcee78bb3e616ba650b727ca863e637a90bbf9b8da3c0e8
-DIST firefox-9.0-pt-PT.xpi 237147 RMD160 9f1d3787c8c2554cb68907e25071b14b71cc8caa SHA1 a8be1d34f9e492d5ed8a75ce093f96cf389c806e SHA256 8f3756e3484556aeb52ba28d5526dcaf83f9daea25d2a434a5a144ba7b653141
-DIST firefox-9.0-rm.xpi 236524 RMD160 6da82635c0eb5c9d052bac7da425fde8b04b9f7d SHA1 2a44d1e9c52539ea5080e071f9e47161469c28f8 SHA256 e44bde159afc476cff5fbb07767b534b23737f1bf7def716ddaecc99d54375cd
-DIST firefox-9.0-ro.xpi 251133 RMD160 6b3d4ca5a59c09c0529f4f6c5506b7e9d75b49bd SHA1 22d906d4d5528ff44b5cd0685d26cb0ba9384e40 SHA256 72dc6c300adf7f3145049641076268ff1e039b85fa9718cf66e0783e24600208
-DIST firefox-9.0-ru.xpi 246963 RMD160 453536dfd814c1edc76fa81c5c01f7a9c629eeb3 SHA1 564ef0cf6397b81d4f869766828bf9299fdae50e SHA256 d47225b74cc31ec806913968d8769d13d68c0702250989a6392693abd06b6ff3
-DIST firefox-9.0-si.xpi 262754 RMD160 a1986da857bd312fe49e7e17c5945450bb1d4f1d SHA1 cd29757be2f39794125ce621285ed68c40ccd2a1 SHA256 de2b63e11ce06604b476c12dd05584eea91b4cef1159772ad52efde3e3791e2a
-DIST firefox-9.0-sk.xpi 244589 RMD160 3a31649ee0bfa03aad270e87f87cbb9b036c608d SHA1 970845d524fda52e950c79faaeb3d98660616ec3 SHA256 0da253cf9098e5824fa8e349f50d3c4fbe242cf1319bf496b935040c1abd3bf4
-DIST firefox-9.0-sl.xpi 231929 RMD160 7b34d598d0f6e13d00d4771c5ccc77ffd42036bd SHA1 548cf355c614ecf2cc28fba9dbab407a7c862afe SHA256 fa105ffa7a129f55a5eaab7f4a413891cbc78fdf1898fc4411c7f1c8c7124168
-DIST firefox-9.0-son.xpi 230225 RMD160 631a477daad26bc667784308abb6bf262a08ee17 SHA1 dd866355649281bc3614cff6a4579c8d28df62a3 SHA256 f37a357652d09dc9c0cbff13c617522e2f52bd500698fd1fe8a0065600cdd94f
-DIST firefox-9.0-sq.xpi 217505 RMD160 44d74259b943e94032c534c6f2c8f1c82025cf1c SHA1 9d8dd16434a78d5056be3c981e6fa1e573a736fd SHA256 606bb1d20fc9b1914dfd4010bdb3769cf95c52dc7974a0a3908be73d6dadf1f5
-DIST firefox-9.0-sr.xpi 267692 RMD160 a514046e380dac1df397ddd24acc9d16aa3d2733 SHA1 919b5c00bec65ccda16a7b34a65410a74d58e24b SHA256 31075b3e9286b401d0d49b7011683818ba22d41362cbbc7b4a79e9d43c0e098f
-DIST firefox-9.0-sv-SE.xpi 269772 RMD160 7f7558249f7887ea7677a05283703c82832157bc SHA1 ae5c9b7d1746c729a7bce7a97a7dc5317003174c SHA256 a7afb47d355e89a28f3b7395d458bcbbe10ec9858ca230aedfa7272d0342f72d
-DIST firefox-9.0-ta-LK.xpi 279901 RMD160 6b177281d967c300214f407cc4dad5eba93ac1fc SHA1 7b18ff1b80d07d81d4f4c5c9950e0acdf6c713d9 SHA256 a1951be8549b4462991f779d40410af0e10135b7cd8bbbb94e7096b84ac7a6ba
-DIST firefox-9.0-ta.xpi 263463 RMD160 ac0d643b11d51c93f6938196055e8e7c1c1cbf28 SHA1 e23ce6df928e2861b30f15e54ea1eecf543922e3 SHA256 91bc6de5e9ec60ae0d6b683482c953c250733774d8b4c125a39b1ef2d94d97d2
-DIST firefox-9.0-te.xpi 278021 RMD160 4bbbb46e1ea233fdc877a56db140ae8aff92b104 SHA1 75660202cddba16424204a53b66704f9a8ab83ed SHA256 62c973c5bd72ad7228ac27434c4e67cfcbdc22465642e856f571274d9e764222
-DIST firefox-9.0-th.xpi 265278 RMD160 ea6ee94e22986d0537e4a88de01e7f596c73c22b SHA1 8cebde5865ea6f91e81eb94be0ba2b80fe427947 SHA256 336c5577090d0889240da7381c9c49a4f5c14525a8284a7b8371b8c209bc364f
-DIST firefox-9.0-tr.xpi 236800 RMD160 065c3a6c853ac564196047d9fb6ab417b9396b11 SHA1 67c12b3c600045c1d54842772d304f79743e3c6c SHA256 64aabd6ced49752ae423f910a34689de6d4cea6ffb31108a006c99d8ea2c992a
-DIST firefox-9.0-uk.xpi 270603 RMD160 ebffae1aef41ab1f5d719bd444727031719b0fc1 SHA1 4411b4c0bc83d32daec508aa4c5567d19bb2bbe0 SHA256 d75d2215593864a2b9eaa91b6117d7ae02f1af2276d8bf1ee6fc50911725a906
-DIST firefox-9.0-vi.xpi 252531 RMD160 c105055370c6827fdab9176ff047343743670a53 SHA1 9b33f82656b01bc381a1e8503445e7eb03cfaeea SHA256 883515cafdde67e439b5a3a47baacfd7b983c5389f6adbb81f2995a776c07aa5
-DIST firefox-9.0-zh-CN.xpi 246728 RMD160 96aef0ad9287f41589f59246eba1d2445d18a0ce SHA1 6f7965ecc3f8418524f68f08fc576392bbe89ff1 SHA256 5fa200b09d050a10d8bfc63b8f5b7da6fdb606dc0d1ce1106d73ee5f6cc5dbbf
-DIST firefox-9.0-zh-TW.xpi 247498 RMD160 163fa9dde9caa2e209eff47a1bdfee6cfd807aaf SHA1 f6c14facb1556002fcfb414533c171c2b9e08582 SHA256 6b50bd60567a46fd7af62160271ab9e0d5a40666c6a812fb9adcd7bce474a936
-DIST firefox-9.0-zu.xpi 238395 RMD160 67afb3fd7bd9006830747a75b5175facf8615f86 SHA1 1b7c947e15d5fb2f75503e1cad9940283edc87d5 SHA256 aedf4ab70c7cf603210e4ece1c21faf0c031f7b488dddc074c3f00e9d9a2feb5
-DIST firefox-9.0.source.tar.bz2 74197197 RMD160 4631b103aa80ae2ae22b61453f4e02c89962f1c1 SHA1 f79324ec6205e4c23d51d8ab2e790de1b2541657 SHA256 9e876498da6c2eb2a49b57b461d5b969b11810f6af9eaa858d8e4cb514a9bd05
diff --git a/www-client/firefox/firefox-10.0.1.ebuild b/www-client/firefox/firefox-10.0.1.ebuild
deleted file mode 100644
index fb3ae9d34615..000000000000
--- a/www-client/firefox/firefox-10.0.1.ebuild
+++ /dev/null
@@ -1,337 +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/firefox/firefox-10.0.1.ebuild,v 1.4 2012/03/01 00:13:44 dilfridge Exp $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-
-# This list can be updated with scripts/get_langs.sh from the 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/_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
-
-# Changeset for alpha snapshot
-CHANGESET="e56ecd8b3a68"
-# Patch version
-PATCH="${PN}-10.0-patches-0.5"
-# 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/${PN}/releases/"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
-
-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:2
-	>=media-libs/mesa-7.10
-	media-libs/libpng[apng]
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( ~media-libs/libvpx-0.9.7
-		media-libs/alsa-lib )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-mozilla )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-central"
-elif [[ ${PV} =~ beta ]]; then
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-beta"
-else
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-release"
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/js/src/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	# 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
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -n "${cards}"; then
-			# FOSS drivers are fine
-			addpredict "${cards}"
-		else
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		emake -f client.mk || die "emake failed"
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}"
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox + xulrunner
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/unofficial"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="tumucumaque"
-		name="Tumucumaque"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-
-	# Plugins dir
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-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/firefox/firefox-10.0.1-r1.ebuild b/www-client/firefox/firefox-10.0.4.ebuild
similarity index 95%
rename from www-client/firefox/firefox-10.0.1-r1.ebuild
rename to www-client/firefox/firefox-10.0.4.ebuild
index 8e0a0fe97022..52ef139d3189 100644
--- a/www-client/firefox/firefox-10.0.1-r1.ebuild
+++ b/www-client/firefox/firefox-10.0.4.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-10.0.1-r1.ebuild,v 1.5 2012/03/06 20:54:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-10.0.4.ebuild,v 1.1 2012/04/26 19:53:46 polynomial-c Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
 WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
 
 # This list can be updated with scripts/get_langs.sh from the 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
@@ -18,10 +19,15 @@ 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
 
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
 # Changeset for alpha snapshot
 CHANGESET="e56ecd8b3a68"
 # Patch version
-PATCH="${PN}-10.0-patches-0.6"
+PATCH="${PN}-10.0-patches-0.7"
 # 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/${PN}/releases/"
@@ -31,7 +37,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm"
@@ -77,7 +83,11 @@ elif [[ ${PV} =~ beta ]]; then
 else
 	SRC_URI="${SRC_URI}
 		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-release"
+	if [[ ${MOZ_ESR} == 1 ]]; then
+		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+	else
+		S="${WORKDIR}/mozilla-release"
+	fi
 fi
 
 QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
@@ -126,6 +136,7 @@ src_unpack() {
 
 src_prepare() {
 	# Apply our patches
+	EPATCH_EXCLUDE="6012_fix_shlibsign.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
diff --git a/www-client/firefox/firefox-10.0.ebuild b/www-client/firefox/firefox-10.0.ebuild
deleted file mode 100644
index 4d43572d0e05..000000000000
--- a/www-client/firefox/firefox-10.0.ebuild
+++ /dev/null
@@ -1,332 +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/firefox/firefox-10.0.ebuild,v 1.4 2012/02/07 20:19:20 swift Exp $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-
-# This list can be updated with scripts/get_langs.sh from the 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/_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
-
-# Changeset for alpha snapshot
-CHANGESET="e56ecd8b3a68"
-# Patch version
-PATCH="${PN}-10.0-patches-0.4"
-# 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/${PN}/releases/"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc pgo selinux system-sqlite +webm"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
-
-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:2
-	>=media-libs/mesa-7.10
-	media-libs/libpng[apng]
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( >=media-libs/libvpx-0.9.7
-		media-libs/alsa-lib )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-mozilla )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-central"
-elif [[ ${PV} =~ beta ]]; then
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-beta"
-else
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-release"
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/js/src/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	# 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
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -n "${cards}"; then
-			# FOSS drivers are fine
-			addpredict "${cards}"
-		else
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use software rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_SOFTWARE=1
-			fi
-		fi
-		shopt -u nullglob
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		emake -f client.mk || die "emake failed"
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}"
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox + xulrunner
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/unofficial"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="tumucumaque"
-		name="Tumucumaque"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-
-	# Plugins dir
-	share_plugins_dir
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-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/firefox/firefox-8.0.ebuild b/www-client/firefox/firefox-8.0.ebuild
deleted file mode 100644
index 06b63389d786..000000000000
--- a/www-client/firefox/firefox-8.0.ebuild
+++ /dev/null
@@ -1,359 +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/firefox/firefox-8.0.ebuild,v 1.6 2012/01/28 05:49:49 nirbheek Exp $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
-
-MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
-FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
-FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
-CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-8.0-patches-0.2"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm"
-
-FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
-# More URIs appended below...
-SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
-
-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.12.10
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10
-	media-libs/libpng[apng]
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )
-	crashreporter? ( net-misc/curl )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-central"
-elif [[ ${PV} =~ beta ]]; then
-	SRC_URI="${SRC_URI}
-		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-beta"
-else
-	SRC_URI="${SRC_URI}
-		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-release"
-fi
-
-# No language packs for alphas
-if ! [[ ${PV} =~ alpha|beta ]]; then
-	# This list can be updated with scripts/get_langs.sh from mozilla overlay
-	LANGS=(af ak ar ast be bg bn-BD bn-IN br bs ca cs 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)
-
-	for X in "${LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${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="${SRC_URI}
-				linguas_${X%%-*}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-# 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 en_US; 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
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in "${linguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/js/src/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	# 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
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Firefox tries to dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-		shopt -u nullglob
-		test -n "${cards}" && addpredict "${cards}"
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		emake -f client.mk || die "emake failed"
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}"
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox + xulrunner
-	cp "${FILESDIR}"/gentoo-default-prefs.js \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_install "${WORKDIR}/${P}-${X}"
-	done
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/unofficial"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="tumucumaque"
-		name="Tumucumaque"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-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/firefox/firefox-9.0.ebuild b/www-client/firefox/firefox-9.0.ebuild
deleted file mode 100644
index f8f999f1054d..000000000000
--- a/www-client/firefox/firefox-9.0.ebuild
+++ /dev/null
@@ -1,378 +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/firefox/firefox-9.0.ebuild,v 1.10 2012/01/28 05:49:49 nirbheek Exp $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins
-
-MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
-FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
-FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
-CHANGESET="e56ecd8b3a68"
-PATCH="${PN}-9.0-patches-0.5"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm"
-
-FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
-# More URIs appended below...
-SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
-
-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:2
-	>=media-libs/mesa-7.10
-	media-libs/libpng[apng]
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( media-libs/libvpx
-		media-libs/alsa-lib )
-	crashreporter? ( net-misc/curl )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} ) )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-central"
-elif [[ ${PV} =~ beta ]]; then
-	SRC_URI="${SRC_URI}
-		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-beta"
-else
-	SRC_URI="${SRC_URI}
-		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-release"
-fi
-
-# No language packs for alphas
-if ! [[ ${PV} =~ alpha|beta ]]; then
-	# This list can be updated with scripts/get_langs.sh from mozilla overlay
-	LANGS=(af ak ar ast be bg bn-BD bn-IN br bs ca cs 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)
-
-	for X in "${LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${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="${SRC_URI}
-				linguas_${X%%-*}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-			IUSE="${IUSE} linguas_${X%%-*}"
-		fi
-	done
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-# 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 en_US; 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
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in "${linguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/js/src/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# 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"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	# 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
-}
-
-src_compile() {
-	local cards
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -n "${cards}"; then
-			# FOSS drivers are fine
-			addpredict "${cards}"
-		else
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		emake -f client.mk || die "emake failed"
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}"
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox + xulrunner
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_install "${WORKDIR}/${P}-${X}"
-	done
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/unofficial"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="tumucumaque"
-		name="Tumucumaque"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# The 128x128 icon has a different name
-	insinto "/usr/share/icons/hicolor/128x128/apps"
-	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-
-	# Plugins dir
-	share_plugins_dir
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-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/lynx/lynx-2.8.7_p1.ebuild b/www-client/lynx/lynx-2.8.7_p1.ebuild
index 0241b93492f5..63e44da8d45d 100644
--- a/www-client/lynx/lynx-2.8.7_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.7_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/lynx/lynx-2.8.7_p1.ebuild,v 1.13 2009/10/05 17:31:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.14 2012/04/27 05:12:03 flameeyes Exp $
 
 EAPI=2
 
@@ -63,7 +63,7 @@ src_prepare() {
 	# add '+' prefix to lines using $(MAKE_RECUR),
 	# making sure '+' comes after leading whitespace
 	sed -i -e '/$(MAKE_RECUR)/ s/\([[:blank:]]\)/\1+/' makefile.in || \
-	    die "failed to update makefile.in"
+		die "failed to update makefile.in"
 
 	# fix configure for openssl compiled with kerberos (bug #267749)
 	epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch"
@@ -112,6 +112,11 @@ src_configure() {
 		$myargs
 }
 
+src_compile() {
+	# see bug #403905
+	emake -j1 || die
+}
+
 src_install() {
 	make install DESTDIR="${D}" || die
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index c6d03040c498..56a967689a13 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -100,6 +100,7 @@ DIST seamonkey-2.9-nb-NO.xpi 810285 RMD160 2b9a1e2a77ee9aa1b8d73df21e7eed26511ba
 DIST seamonkey-2.9-nl.xpi 808494 RMD160 d5b7a88972d96c10b683fa2bdb0f16f45fd4ee9b SHA1 0f88fa768fef3d2876d5d43c25591a46a204e6fd SHA256 927ae08f5b312940b5412b52deea56771da9c1f6b7812dab868f85945912d8cc
 DIST seamonkey-2.9-pl.xpi 832375 RMD160 9eeeba1132f5eddffda0829d2eb2122b2532cb52 SHA1 892b2d6a528941644f40b3f762920831194a393e SHA256 0c4db3e733808403428281c05ec454809e78374b7b8654d3d3e21f80e33dbd2a
 DIST seamonkey-2.9-pt-PT.xpi 847905 RMD160 37b0b74d3f17aef0f85cf8f7f6b280274ce11536 SHA1 6c8ddf0138c26f565107b1bc58b52548cab982c9 SHA256 b2a17ff2312b5eae95f87a3d8d18f3cd81afcdd99ad8a8807643716144517602
+DIST seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 4056 RMD160 1ded73be2ddc2d592ce72047ae9d3305ba0655fd SHA1 30f64705951349f1eb4da129db9c3fb3b671b113 SHA256 b44ae89fa9ca8e0ae9607bdf737489a204803660eb9c86d84c3c081210f5dfb6
 DIST seamonkey-2.9-ru.xpi 895673 RMD160 7dddcdc6c72ecafede63666459030c0c607e3191 SHA1 19a36fbb41623fdbd4345f57cb145a0e9dd9c5b8 SHA256 02eae91a197815f0dffc568144d39786979834903528e8b0d7250e35d6defa0b
 DIST seamonkey-2.9-sk.xpi 845682 RMD160 858c1aedc2043f7da0123d8a03a98079727d98c7 SHA1 07e685ac4d90b2ed5683a63355fc8559d876a446 SHA256 4776d13bebda0fc62ad50e500314df69d53957a2ebe420eb7aa55de4b3db6b02
 DIST seamonkey-2.9-sv-SE.xpi 873453 RMD160 88e93ea68ba1cc25a124ea1a113eb6a2102a29bc SHA1 d9a76678d0238e8bd80fdc501f545519a542b5e6 SHA256 a4e16dc0640ade710ae3cdafc5121dbdb7e11233744dbb2495cd85dc476087a1
diff --git a/www-client/seamonkey/files/seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 b/www-client/seamonkey/files/seamonkey-2.9-revert-system-cairo-breakage.patch.bz2
deleted file mode 100644
index 1d94df7c218c..000000000000
Binary files a/www-client/seamonkey/files/seamonkey-2.9-revert-system-cairo-breakage.patch.bz2 and /dev/null differ
diff --git a/www-client/seamonkey/seamonkey-2.9.ebuild b/www-client/seamonkey/seamonkey-2.9.ebuild
index 0d511d1688cb..31baff671082 100644
--- a/www-client/seamonkey/seamonkey-2.9.ebuild
+++ b/www-client/seamonkey/seamonkey-2.9.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.9.ebuild,v 1.1 2012/04/24 23:24:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.9.ebuild,v 1.2 2012/04/26 23:26:30 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -52,6 +52,7 @@ SRC_URI+="${SRC_URI}
 	${MOZ_FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.9-revert-system-cairo-breakage.patch.bz2
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
@@ -114,7 +115,7 @@ src_prepare() {
 	epatch "${WORKDIR}/firefox"
 	popd &>/dev/null || die
 
-	epatch "${FILESDIR}"/${PN}-2.9-revert-system-cairo-breakage.patch.bz2
+	epatch "${DISTDIR}"/${PN}-2.9-revert-system-cairo-breakage.patch.bz2
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.3.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.3.ebuild
index d230e591dc4c..547f0c912bff 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.0.3.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.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/x11-apps/bdftopcf/bdftopcf-1.0.3.ebuild,v 1.9 2011/02/14 18:40:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.3.ebuild,v 1.10 2012/04/26 21:05:56 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libXfont"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index ff4d29d119e2..00ee84c3750f 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1 +1,2 @@
 DIST fstobdf-1.0.4.tar.bz2 108528 RMD160 a4434bb2f1e5ab2bbde96ac7f43ed023b3e8327d SHA1 5310493f53277fd196f93bbb7f2a204cad8997b7 SHA256 f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
+DIST fstobdf-1.0.5.tar.bz2 119822 RMD160 fbda34b1b4f551d05932f618773f028f9483c8f1 SHA1 7c316ab446f6efa0862570bc137e1c103311ace2 SHA256 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
new file mode 100644
index 000000000000..f949bfdb29ca
--- /dev/null
+++ b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.5.ebuild,v 1.1 2012/04/26 16:39:58 chithanh Exp $
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="generate BDF font from X font server"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
index 44db6ac9a19c..17f9f009c8b6 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.1 2012/02/24 15:34:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.2 2012/04/26 19:26:35 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="create an index of X font files in a directory"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-apps/mkfontscale"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild
index d7ce99c30ace..5a7f2b545eb8 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.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/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild,v 1.2 2012/03/02 19:33:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.1.0.ebuild,v 1.3 2012/04/26 19:26:06 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 75e34ac6088f..9c5ed2720ce0 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,2 +1,3 @@
 DIST xmodmap-1.0.5.tar.bz2 124742 RMD160 af2c2ed9e36b82d058776a116d62371506d07dd7 SHA1 c97fb42f40b094868f6ef445f25c600f326b1942 SHA256 421ee7a17b0cf559c4901225f70c497e3c5ca205ec7dcc84712055818d2f3402
 DIST xmodmap-1.0.6.tar.bz2 133170 RMD160 131d95e1d21e969caff7c9131c1225cec9e55bad SHA1 0d235069c87f365902cd36ac8b2ccb01205fa9fb SHA256 c58bfc948b11877c399b03240a83571ae574779b9c531f258a17acadaa9f3a5d
+DIST xmodmap-1.0.7.tar.bz2 135223 RMD160 964413b9100a94406194e6ea424430056f31d8bd SHA1 9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef SHA256 ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
new file mode 100644
index 000000000000..0d1b2e605248
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.1 2012/04/26 16:41:26 chithanh Exp $
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 27073d119e3e..d2908ca68bb0 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,2 @@
-DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
 DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
-DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+DIST VirtualBox-4.1.14.tar.bz2 73260319 RMD160 68bb81486dad190a1bd74251ad32ee16d47be625 SHA1 126e61d5f7187d62b2b213b658912c83f49e6de6 SHA256 034cfd19d5dd701cd1375b994ad6f2d41c207b6760c6b8c5fe3005e53134dff8
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.14.ebuild
similarity index 98%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.14.ebuild
index 232b808d2bae..7a90818e615a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.14.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/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.10.ebuild,v 1.2 2012/03/15 16:51:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.14.ebuild,v 1.1 2012/04/26 18:22:05 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
deleted file mode 100644
index 02735b5953b4..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild,v 1.5 2012/01/19 14:24:29 lxnay Exp $
-
-EAPI=2
-
-inherit eutils linux-mod multilib python versionator
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-
-RDEPEND="x11-base/xorg-server[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		=dev-lang/python-2*
-		>=dev-lang/yasm-0.6.2
-		sys-devel/dev86
-		sys-power/iasl
-		x11-proto/fontsproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-		x11-proto/xextproto
-		x11-proto/xineramaproto
-		x11-proto/xproto
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXext
-	    dri? (  x11-proto/xf86driproto
-				>=x11-libs/libdrm-2.4.5 )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-		python_set_active_version 2
-		python_pkg_setup
-}
-
-src_prepare() {
-		# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-		cp -a "${S}"/src/VBox/Additions/linux/drm \
-		"${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory"
-		cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
-
-		# stupid new header references...
-		for vboxheader in {product,version}-generated.h ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-		done
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-		# Ugly hack to build the opengl part of the video driver
-		epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-		# unset useless/problematic checks in configure
-		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-			"${FILESDIR}/${PN}-4-makeself-check.patch" \
-			"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-}
-
-src_compile() {
-		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
-			KBUILD_PATH="${S}/kBuild" \
-			|| die "kmk failed"
-		done
-
-		if use dri; then
-			# Now creating the kernel modules. We must do this _after_
-			# we compiled the user-space tools as we need two of the
-			# automatically generated header files. (>=3.2.0)
-			linux-mod_src_compile
-		fi
-}
-
-src_install() {
-		if use dri; then
-			linux-mod_src_install
-		fi
-
-		cd "${S}/out/linux.${ARCH}/release/bin/additions"
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-
-		# xorg-server-1.11.x
-		if has_version ">=x11-base/xorg-server-1.11" ; then
-				newins vboxvideo_drv_111.so vboxvideo_drv.so
-		# xorg-server-1.10.x
-		elif has_version ">=x11-base/xorg-server-1.10" ; then
-				newins vboxvideo_drv_110.so vboxvideo_drv.so
-		# xorg-server-1.9.x
-		else
-				newins vboxvideo_drv_19.so vboxvideo_drv.so
-		fi
-
-		# Guest OpenGL driver
-		insinto /usr/$(get_libdir)
-		doins -r VBoxOGL* || die
-
-		if use dri ; then
-			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-		fi
-}
-
-pkg_postinst() {
-		elog "You need to edit the file /etc/X11/xorg.conf and set:"
-		elog ""
-		elog "  Driver  \"vboxvideo\""
-		elog ""
-		elog "in the Graphics device section (Section \"Device\")"
-		elog ""
-		if use dri; then
-			elog "To use the kernel drm video driver, please add:"
-			elog "\"vboxvideo\" to:"
-			if has_version sys-apps/openrc; then
-				elog "/etc/conf.d/modules"
-			else
-				elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-			fi
-			elog ""
-		fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.8.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.8.ebuild
deleted file mode 100644
index cf6da6e9f1b3..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.8.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.8.ebuild,v 1.5 2012/04/09 12:05:29 maekke Exp $
-
-EAPI=2
-
-inherit eutils linux-mod multilib python versionator toolchain-funcs
-
-MY_P=VirtualBox-${PV}
-DESCRIPTION="VirtualBox video driver"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dri"
-
-RDEPEND="x11-base/xorg-server[-minimal]
-	x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.999
-		=dev-lang/python-2*
-		>=dev-lang/yasm-0.6.2
-		sys-devel/dev86
-		sys-power/iasl
-		x11-proto/fontsproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-		x11-proto/xextproto
-		x11-proto/xineramaproto
-		x11-proto/xproto
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXext
-	    dri? (  x11-proto/xf86driproto
-				>=x11-libs/libdrm-2.4.5 )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-
-S="${WORKDIR}/${MY_P}_OSE"
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-		python_set_active_version 2
-		python_pkg_setup
-}
-
-src_prepare() {
-		# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
-		cp -a "${S}"/src/VBox/Additions/linux/drm \
-		"${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory"
-		cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
-		"${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
-
-		# stupid new header references...
-		for vboxheader in {product,version}-generated.h ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/vboxvideo_drm/${vboxheader}"
-		done
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-
-		# Ugly hack to build the opengl part of the video driver
-		epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
-		# unset useless/problematic checks in configure
-		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
-			"${FILESDIR}/${PN}-4-makeself-check.patch" \
-			"${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-		# Patch to link with lazy on hardened #394757
-		if gcc-specs-now ; then
-			epatch "${FILESDIR}/${PN}-link-lazy.patch"
-		fi
-}
-
-src_configure() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-}
-
-src_compile() {
-		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
-		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
-		/src/VBox/Additions/x11/vboxvideo ; do
-			cd "${S}"${each}
-			MAKE="kmk" emake TOOL_YASM_AS=yasm \
-			KBUILD_PATH="${S}/kBuild" \
-			|| die "kmk failed"
-		done
-
-		if use dri; then
-			# Now creating the kernel modules. We must do this _after_
-			# we compiled the user-space tools as we need two of the
-			# automatically generated header files. (>=3.2.0)
-			linux-mod_src_compile
-		fi
-}
-
-src_install() {
-		if use dri; then
-			linux-mod_src_install
-		fi
-
-		cd "${S}/out/linux.${ARCH}/release/bin/additions"
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-
-		# xorg-server-1.11.x
-		if has_version ">=x11-base/xorg-server-1.11" ; then
-				newins vboxvideo_drv_111.so vboxvideo_drv.so
-		# xorg-server-1.10.x
-		elif has_version ">=x11-base/xorg-server-1.10" ; then
-				newins vboxvideo_drv_110.so vboxvideo_drv.so
-		# xorg-server-1.9.x
-		else
-				newins vboxvideo_drv_19.so vboxvideo_drv.so
-		fi
-
-		# Guest OpenGL driver
-		insinto /usr/$(get_libdir)
-		doins -r VBoxOGL* || die
-
-		if use dri ; then
-			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
-		fi
-}
-
-pkg_postinst() {
-		elog "You need to edit the file /etc/X11/xorg.conf and set:"
-		elog ""
-		elog "  Driver  \"vboxvideo\""
-		elog ""
-		elog "in the Graphics device section (Section \"Device\")"
-		elog ""
-		if use dri; then
-			elog "To use the kernel drm video driver, please add:"
-			elog "\"vboxvideo\" to:"
-			if has_version sys-apps/openrc; then
-				elog "/etc/conf.d/modules"
-			else
-				elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-			fi
-			elog ""
-		fi
-}
diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
index 476536c0a9c8..80a0c47f5d0d 100644
--- a/x11-libs/cairo/cairo-1.10.2-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r2.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/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.1 2012/01/29 15:53:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.2 2012/04/26 22:26:09 aballier Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://cairographics.org/"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
diff --git a/x11-libs/cairo/cairo-1.12.0.ebuild b/x11-libs/cairo/cairo-1.12.0.ebuild
index 994f99626292..adc5efdfe78b 100644
--- a/x11-libs/cairo/cairo-1.12.0.ebuild
+++ b/x11-libs/cairo/cairo-1.12.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/x11-libs/cairo/cairo-1.12.0.ebuild,v 1.1 2012/03/24 23:15:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.0.ebuild,v 1.2 2012/04/26 22:26:09 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://cairographics.org/"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
diff --git a/x11-libs/libICE/libICE-1.0.8.ebuild b/x11-libs/libICE/libICE-1.0.8.ebuild
index dfa52baaeab1..260223754cf7 100644
--- a/x11-libs/libICE/libICE-1.0.8.ebuild
+++ b/x11-libs/libICE/libICE-1.0.8.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/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.1 2012/03/04 21:02:50 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.2 2012/04/26 19:01:55 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ICE library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libSM/libSM-1.2.1.ebuild b/x11-libs/libSM/libSM-1.2.1.ebuild
index 0e5a936a3583..6c42ea17937e 100644
--- a/x11-libs/libSM/libSM-1.2.1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.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/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.1 2012/03/04 21:03:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.2 2012/04/26 19:03:10 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND=">=x11-libs/libICE-1.0.5
diff --git a/x11-libs/libX11/libX11-1.4.4.ebuild b/x11-libs/libX11/libX11-1.4.4.ebuild
index 24bfddd0a165..02cd139f5a5a 100644
--- a/x11-libs/libX11/libX11-1.4.4.ebuild
+++ b/x11-libs/libX11/libX11-1.4.4.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/x11-libs/libX11/libX11-1.4.4.ebuild,v 1.9 2012/01/15 20:45:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.4.ebuild,v 1.10 2012/04/26 18:57:55 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
diff --git a/x11-libs/libX11/libX11-1.4.99.901.ebuild b/x11-libs/libX11/libX11-1.4.99.901.ebuild
index 2571132c928e..9e38626792ab 100644
--- a/x11-libs/libX11/libX11-1.4.99.901.ebuild
+++ b/x11-libs/libX11/libX11-1.4.99.901.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/x11-libs/libX11/libX11-1.4.99.901.ebuild,v 1.1 2012/03/16 23:29:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.99.901.ebuild,v 1.2 2012/04/26 18:57:55 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
index 02c6c53abae5..4a4ad5d07b6e 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.1 2012/03/09 00:01:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.2 2012/04/26 19:31:53 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXau/libXau-1.0.7.ebuild b/x11-libs/libXau/libXau-1.0.7.ebuild
index 261d6a282024..2aea60c67afd 100644
--- a/x11-libs/libXau/libXau-1.0.7.ebuild
+++ b/x11-libs/libXau/libXau-1.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.1 2012/03/07 21:24:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.2 2012/04/26 18:40:34 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xau library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXaw/libXaw-1.0.10.ebuild b/x11-libs/libXaw/libXaw-1.0.10.ebuild
index d175ab0a67ea..6f8e9b8251a7 100644
--- a/x11-libs/libXaw/libXaw-1.0.10.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.10.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/x11-libs/libXaw/libXaw-1.0.10.ebuild,v 1.1 2012/03/23 15:28:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.10.ebuild,v 1.2 2012/04/26 19:10:55 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
index 94cd583a1817..45ee5547b912 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.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/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.1 2012/03/08 23:58:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.2 2012/04/26 18:44:02 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdmcp library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXext/libXext-1.3.1.ebuild b/x11-libs/libXext/libXext-1.3.1.ebuild
index 6a63c6abcb16..08886ac4aeb7 100644
--- a/x11-libs/libXext/libXext-1.3.1.ebuild
+++ b/x11-libs/libXext/libXext-1.3.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/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.1 2012/03/08 23:58:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.2 2012/04/26 19:06:49 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.2
diff --git a/x11-libs/libXfont/libXfont-1.4.5.ebuild b/x11-libs/libXfont/libXfont-1.4.5.ebuild
index f0fb1bcd87d1..83068ccb8c76 100644
--- a/x11-libs/libXfont/libXfont-1.4.5.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.5.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/x11-libs/libXfont/libXfont-1.4.5.ebuild,v 1.2 2012/03/07 04:25:39 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5.ebuild,v 1.3 2012/04/26 21:05:12 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXft/libXft-2.3.0-r1.ebuild b/x11-libs/libXft/libXft-2.3.0-r1.ebuild
index b9bccb5d1c7f..95ea78219819 100644
--- a/x11-libs/libXft/libXft-2.3.0-r1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.0-r1.ebuild,v 1.1 2012/03/11 20:10:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.0-r1.ebuild,v 1.2 2012/04/26 19:29:34 aballier Exp $
 
 EAPI=4
 inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
index 5f3ba908b2ed..cc7a655088c4 100644
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.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/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.1 2012/03/07 21:24:20 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.2 2012/04/26 19:07:10 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-libs/libXpm/libXpm-3.5.10.ebuild b/x11-libs/libXpm/libXpm-3.5.10.ebuild
index 43e2829fbe9c..85b28f43b001 100644
--- a/x11-libs/libXpm/libXpm-3.5.10.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.1 2012/03/09 00:00:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.2 2012/04/26 19:09:14 aballier Exp $
 
 EAPI=4
 inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXrender/libXrender-0.9.7.ebuild b/x11-libs/libXrender/libXrender-0.9.7.ebuild
index e7a107b1ab05..00bb3b784668 100644
--- a/x11-libs/libXrender/libXrender-0.9.7.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.1 2012/03/09 00:00:33 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.2 2012/04/26 19:15:11 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXt/libXt-1.1.3.ebuild b/x11-libs/libXt/libXt-1.1.3.ebuild
index 568f59e0d17e..85949bd4ebe2 100644
--- a/x11-libs/libXt/libXt-1.1.3.ebuild
+++ b/x11-libs/libXt/libXt-1.1.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.1 2012/03/16 23:31:01 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.2 2012/04/26 19:04:34 aballier Exp $
 
 EAPI=4
 inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libfontenc/libfontenc-1.1.1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
index 5a79646a1184..ff136e03346d 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.1.ebuild,v 1.1 2012/03/04 21:04:04 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.1.ebuild,v 1.2 2012/04/26 19:22:58 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libxcb/libxcb-1.8.1.ebuild b/x11-libs/libxcb/libxcb-1.8.1.ebuild
index 6a6dbbb164dd..272d1d5baf98 100644
--- a/x11-libs/libxcb/libxcb-1.8.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.8.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/x11-libs/libxcb/libxcb-1.8.1.ebuild,v 1.2 2012/03/10 01:13:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.8.1.ebuild,v 1.3 2012/04/26 18:51:23 aballier Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="dev-libs/libpthread-stubs
diff --git a/x11-libs/pixman/pixman-0.24.4.ebuild b/x11-libs/pixman/pixman-0.24.4.ebuild
index 319e66e48f07..b1c7f5b6b726 100644
--- a/x11-libs/pixman/pixman-0.24.4.ebuild
+++ b/x11-libs/pixman/pixman-0.24.4.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/x11-libs/pixman/pixman-0.24.4.ebuild,v 1.2 2012/03/14 18:06:52 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.24.4.ebuild,v 1.3 2012/04/26 20:52:25 aballier Exp $
 
 EAPI=4
 inherit xorg-2 toolchain-funcs versionator
@@ -8,7 +8,7 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt mmx neon sse2"
 
 pkg_setup() {
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild
index 977ebe44d6e9..27caec3ac70d 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.8.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/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild,v 1.9 2011/08/20 15:47:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild,v 1.10 2012/04/26 22:24:31 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild
index 8f312c3078b8..83526553b957 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.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/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild,v 1.9 2011/08/20 15:48:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild,v 1.10 2012/04/26 22:24:35 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
index e1b86d582443..b079be81a93a 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.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/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild,v 1.9 2011/08/20 15:49:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild,v 1.10 2012/04/26 22:24:21 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild
index d9a9843bf274..a3901ce814c3 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.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/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild,v 1.10 2012/02/08 23:44:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild,v 1.11 2012/04/26 22:24:25 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util/xcb-util-0.3.8.ebuild b/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
index 01daca86b698..dc21f874cf8f 100644
--- a/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.3.8.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/x11-libs/xcb-util/xcb-util-0.3.8.ebuild,v 1.8 2011/08/20 15:50:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.8.ebuild,v 1.9 2012/04/26 22:25:07 aballier Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.7
diff --git a/x11-libs/xtrans/xtrans-1.2.7.ebuild b/x11-libs/xtrans/xtrans-1.2.7.ebuild
index 6528d83a9b42..28cb289670b4 100644
--- a/x11-libs/xtrans/xtrans-1.2.7.ebuild
+++ b/x11-libs/xtrans/xtrans-1.2.7.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/x11-libs/xtrans/xtrans-1.2.7.ebuild,v 1.1 2012/03/23 15:28:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xtrans/xtrans-1.2.7.ebuild,v 1.2 2012/04/26 18:37:44 aballier Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/util-macros/util-macros-1.17.ebuild b/x11-misc/util-macros/util-macros-1.17.ebuild
index 7041e1cf3acf..d907c296ec08 100644
--- a/x11-misc/util-macros/util-macros-1.17.ebuild
+++ b/x11-misc/util-macros/util-macros-1.17.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/x11-misc/util-macros/util-macros-1.17.ebuild,v 1.1 2012/03/14 01:15:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.17.ebuild,v 1.2 2012/04/26 18:36:41 aballier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
 DESCRIPTION="X.Org autotools utility macros"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
index 1491951bc931..734b91412c24 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.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/x11-proto/fontsproto/fontsproto-2.1.2.ebuild,v 1.1 2012/03/23 15:20:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.2.ebuild,v 1.2 2012/04/26 21:04:39 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Fonts protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/inputproto/inputproto-2.2.ebuild b/x11-proto/inputproto/inputproto-2.2.ebuild
index 323ccc6cce85..38c557428b0d 100644
--- a/x11-proto/inputproto/inputproto-2.2.ebuild
+++ b/x11-proto/inputproto/inputproto-2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.2.ebuild,v 1.1 2012/03/04 21:04:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.2.ebuild,v 1.2 2012/04/26 18:35:09 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Input protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/kbproto/kbproto-1.0.6.ebuild b/x11-proto/kbproto/kbproto-1.0.6.ebuild
index 465f5ae37e97..86e952c80937 100644
--- a/x11-proto/kbproto/kbproto-1.0.6.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0.6.ebuild,v 1.1 2012/03/23 15:22:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0.6.ebuild,v 1.2 2012/04/26 18:32:15 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org KB protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/renderproto/renderproto-0.11.1.ebuild b/x11-proto/renderproto/renderproto-0.11.1.ebuild
index bcb3beb405e0..8385a1677f32 100644
--- a/x11-proto/renderproto/renderproto-0.11.1.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1.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/x11-proto/renderproto/renderproto-0.11.1.ebuild,v 1.8 2011/02/14 14:00:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/renderproto/renderproto-0.11.1.ebuild,v 1.9 2012/04/26 19:14:24 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Render protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.ebuild
index dd859537cb19..93039dd0f808 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.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/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.ebuild,v 1.1 2012/03/23 15:26:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2.ebuild,v 1.2 2012/04/26 19:31:11 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ScrnSaver protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<x11-libs/libXScrnSaver-1.2"
diff --git a/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild
index 2530802abef7..17df29763872 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.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/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild,v 1.1 2012/03/23 17:28:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild,v 1.2 2012/04/26 18:39:15 aballier Exp $
 
 EAPI=4
 PYTHON_DEPEND="*"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xextproto/xextproto-7.2.1.ebuild b/x11-proto/xextproto/xextproto-7.2.1.ebuild
index 21cecff1147e..96235e95d31d 100644
--- a/x11-proto/xextproto/xextproto-7.2.1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.2.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/x11-proto/xextproto/xextproto-7.2.1.ebuild,v 1.1 2012/03/23 15:27:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.2.1.ebuild,v 1.2 2012/04/26 18:33:28 aballier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XExt protocol headers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="!<x11-libs/libXext-1.0.99"
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
index 325d7fff7c1d..361cd64f74ab 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild,v 1.12 2010/11/05 09:38:57 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild,v 1.13 2012/04/26 18:34:26 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org XF86BigFont protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xproto/xproto-7.0.23.ebuild b/x11-proto/xproto/xproto-7.0.23.ebuild
index a1fe77a3b1a6..fc2049e45d3b 100644
--- a/x11-proto/xproto/xproto-7.0.23.ebuild
+++ b/x11-proto/xproto/xproto-7.0.23.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/x11-proto/xproto/xproto-7.0.23.ebuild,v 1.1 2012/03/16 23:33:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.23.ebuild,v 1.2 2012/04/26 18:30:52 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-themes/gtk-engines-qtcurve/Manifest b/x11-themes/gtk-engines-qtcurve/Manifest
index ee353a753bc8..a6eaa60afc56 100644
--- a/x11-themes/gtk-engines-qtcurve/Manifest
+++ b/x11-themes/gtk-engines-qtcurve/Manifest
@@ -1,3 +1,4 @@
 DIST QtCurve-Gtk2-1.6.4.tar.bz2 142767 RMD160 fe4c6029b61c88133aea7b9bf2cba481a625b19f SHA1 0b4b3e183183c5f7c92a4afa51541e84c1acdf8f SHA256 cada5fbba041a050ddc34ca4059bbb9221f5585a003c1488b4878d32e51b7328
 DIST QtCurve-Gtk2-1.8.12.tar.bz2 184244 RMD160 e3bb22a8e35b85f5b15697d15ff3b93b9793b109 SHA1 3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f SHA256 86eec886449039f7c58db798b8c5b694c36d5502ef5d8420668e63c9cc113752
 DIST QtCurve-Gtk2-1.8.14.tar.bz2 184336 RMD160 add8f964bdb168375424b3baa01af515aa59fdac SHA1 2208a4a7c0c47f266541923571fac5442e97ca71 SHA256 0a496653bd38cd8364139b5fd53a81ddd3378446fc9526353ee0ff94c3f63356
+DIST QtCurve-Gtk2-1.8.15.tar.bz2 184361 RMD160 56180e69e39888e4cbd4dddf70ce0fdf7174b812 SHA1 8ef32b196cc2690a6eb8fec17f94d9c38dad2c33 SHA256 ee7f75ba6052b4c70924b70191856fac3cc93df5b69deef2b424514c88b85abf
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15.ebuild
new file mode 100644
index 000000000000..77293c2b8776
--- /dev/null
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15.ebuild,v 1.1 2012/04/26 17:46:57 pesa Exp $
+
+EAPI=4
+inherit cmake-utils
+
+MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
+
+DESCRIPTION="A set of widget styles for GTK2 based apps, also available for Qt4/KDE4"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mozilla"
+
+CDEPEND="
+	x11-libs/gtk+:2
+"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	mozilla? ( || (
+		>=www-client/firefox-3.0
+		>=www-client/firefox-bin-3.0
+		>=www-client/icecat-3.0
+	) )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="ChangeLog README TODO"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DQTC_OLD_MOZILLA=OFF"
+		$(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index df6fd40900a2..9e4ea624aed8 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,3 +1,4 @@
 DIST QtCurve-KDE4-1.6.4.tar.bz2 308223 RMD160 711f34d71a4063947f723ed860319eed24602478 SHA1 555032fd72d8540d23ea3f2782140798ff6dbd92 SHA256 14a534d54fdae63582d94535f46c2d11019ad27b1462c97867ce73fcabbe138f
 DIST QtCurve-KDE4-1.8.10.tar.bz2 383535 RMD160 d02d30e132f3afecfae31f1e82345377459be7c5 SHA1 dfa775689aa3e637652ae943f40ceb5f812b0992 SHA256 936aad438e7025914279ce472b2141db8ce6cb0752f1a4e4a4b8a725bdc5f08a
+DIST QtCurve-KDE4-1.8.12.tar.bz2 383523 RMD160 fdf9817e7425e126bef00afb00fc2a1d843aecb5 SHA1 89b7a459ca66893743c7a3bf265345bf9d0d7fb2 SHA256 6956805f3f8603a79445728bf73bd1e642b7a8de723196d364f1ceeea3575d64
 DIST QtCurve-KDE4-1.8.9.tar.bz2 353414 RMD160 1f6807e02f79142d3658a3af890872cbd29bbfe7 SHA1 93bc8ce3e5bed506521a8839a254f7076b4bc988 SHA256 7ba39e1d84f882f8141181d3fb1cc111efe01bba287d2be307c0544cf7fc01d9
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.12.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.12.ebuild
new file mode 100644
index 000000000000..17dfa4094f8b
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.12.ebuild,v 1.1 2012/04/26 17:39:53 pesa Exp $
+
+EAPI=4
+KDE_REQUIRED="optional"
+inherit cmake-utils kde4-base
+
+MY_P="${P/qtcurve-qt4/QtCurve-KDE4}"
+
+DESCRIPTION="A set of widget styles for Qt4 based apps, also available for GTK2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kde windeco"
+
+DEPEND="x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-svg:4
+	kde? (
+		$(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) )
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="ChangeLog README TODO"
+
+PATCHES=( "${FILESDIR}/${PN}_kwin_automagic_fix.patch" )
+
+REQUIRED_USE="windeco? ( kde )"
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+	if use kde; then
+		mycmakeargs=(
+			$(cmake-utils_use windeco QTC_KWIN)
+		)
+		kde4-base_src_configure
+	else
+		mycmakeargs=(
+			"-DQTC_QT_ONLY=true"
+		)
+		cmake-utils_src_configure
+	fi
+}