diff --git a/app-arch/dpkg/dpkg-1.16.4.2.ebuild b/app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild
similarity index 91%
rename from app-arch/dpkg/dpkg-1.16.4.2.ebuild
rename to app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild
index ed4ca5547828..2efef3f67194 100644
--- a/app-arch/dpkg/dpkg-1.16.4.2.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.4.2-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-arch/dpkg/dpkg-1.16.4.2.ebuild,v 1.2 2012/06/10 15:49:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild,v 1.1 2012/06/12 15:37:28 jer Exp $
 
 EAPI=4
 
@@ -41,6 +41,9 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="dselect? ( nls )"
 
 src_prepare() {
+	# do not expect Debian's gzip --rsyncable extension
+	epatch "${FILESDIR}"/${P}-gzip-rsyncable.patch
+
 	# Force the use of the running bash for get-version (this file is never
 	# installed, so no need to worry about hardcoding a temporary bash)
 	sed -i -e '1c\#!'"${BASH}" get-version || die
@@ -50,6 +53,7 @@ src_prepare() {
 	sed -i scripts/Makefile.am \
 		-e '/850_Dpkg_Compression.t/d' \
 		|| die "sed failed"
+
 	# test fails (bug #414095)
 	sed -i utils/Makefile.am \
 		-e '/^test_cases/d;/100_update_alternatives/d' || die
diff --git a/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch b/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch
new file mode 100644
index 000000000000..36610228c555
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- a/scripts/Dpkg/Compression.pm
++++ b/scripts/Dpkg/Compression.pm
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name"],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },
diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
index 35429ba97b6f..2dde20d91136 100644
--- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-23.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-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.3 2012/06/11 10:19:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.4 2012/06/12 17:28:39 jdhore Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="FDL-1.3"
 SLOT="23"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index 592ac11cf67f..0a8ec33c05ee 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1 +1,2 @@
 DIST scrub-2.4.1.tar.gz 166710 RMD160 cc0b4dd395c696a1609ef9808fdc48ff9ef494ae SHA1 1f980c22baf0514cfe375272a39b812dfbc71e8c SHA256 45089668b8116c3b81ab9621c1f4b7a2773b5695ceabfa4a03603fac17cdf43b
+DIST scrub-2.5.1.tar.gz 173072 RMD160 d180669e7f8b381c6018413d74f4808fb6fad4ae SHA1 fcba79b41e84d01882cf8533dfbc55cc91bd6bea SHA256 2c4312465d7daa1d6b2f256811794cdad8de994dd0628c031addba80c36dd199
diff --git a/app-misc/scrub/scrub-2.5.1.ebuild b/app-misc/scrub/scrub-2.5.1.ebuild
new file mode 100644
index 000000000000..33ab9d663fc9
--- /dev/null
+++ b/app-misc/scrub/scrub-2.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/scrub/scrub-2.5.1.ebuild,v 1.1 2012/06/12 15:22:23 dev-zero Exp $
+
+EAPI="4"
+
+DESCRIPTION="write patterns on disk/file"
+HOMEPAGE="http://code.google.com/p/diskscrub/"
+SRC_URI="http://diskscrub.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index edc30bab187a..971d7789b23b 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -1,2 +1 @@
 DIST autojump-20.9.tar.gz 32146 RMD160 cad4650a97c38af3dc1d8b857413473de252f248 SHA1 d96ad28d11eee6a8c8e9b4f06948f38b1f15d965 SHA256 678182dcd2854f096e3e468dfb9006ffedb2a178ae927dbc822789eb8107f5aa
-DIST autojump_v14.tar.gz 23425 RMD160 374baa11bc379d42733e281d3fae56517219468e SHA1 a80f0d81e88c0a286def5aa8365db5c2c1b39f2e SHA256 8b60351667f12ae2cd8bb7fb20f2871542d3b27e42bf0fbf9428a5f6b2ba3543
diff --git a/app-shells/autojump/autojump-14.ebuild b/app-shells/autojump/autojump-14.ebuild
deleted file mode 100644
index 2345ea9ffbf8..000000000000
--- a/app-shells/autojump/autojump-14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-14.ebuild,v 1.1 2010/12/22 23:47:00 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-
-inherit python
-
-DESCRIPTION="change directory command that learns"
-HOMEPAGE="http://github.com/joelthelion/autojump"
-MY_P=${PN}_v${PV}
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion gtk zsh-completion"
-
-RDEPEND="gtk? ( dev-python/pygtk:2 )
-	bash-completion? ( >=app-shells/bash-4 )
-	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin autojump || die
-
-	if use gtk ; then
-		dobin jumpapplet || die
-		insinto /usr/share/${PN}
-		doins icon.png || die
-	fi
-
-	insinto /etc/profile.d
-	doins ${PN}.sh || die
-
-	if use bash-completion ; then
-		doins ${PN}.bash || die
-	fi
-
-	if use zsh-completion ; then
-		doins ${PN}.zsh || die
-		insinto /usr/share/zsh/site-functions
-		doins _j || die
-	fi
-
-	doman ${PN}.1 || die
-	dodoc README.rst || die
-}
diff --git a/app-shells/autojump/autojump-20.9.ebuild b/app-shells/autojump/autojump-20.9.ebuild
index b6b7346fad5e..6164456ea33a 100644
--- a/app-shells/autojump/autojump-20.9.ebuild
+++ b/app-shells/autojump/autojump-20.9.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/app-shells/autojump/autojump-20.9.ebuild,v 1.1 2012/06/11 06:54:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-20.9.ebuild,v 1.2 2012/06/12 12:38:36 xmw Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit python
+inherit python vcs-snapshot
 
 DESCRIPTION="change directory command that learns"
 HOMEPAGE="http://github.com/joelthelion/autojump"
@@ -23,11 +23,6 @@ RDEPEND="gtk? ( dev-python/pygtk:2 )
 	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
 DEPEND="test? ( dev-lang/python )"
 
-src_unpack() {
-	default
-	mv *-${PN}-* ${P} || die
-}
-
 src_prepare() {
 	#https://github.com/joelthelion/autojump/issues/129
 	sed -e '/def test_db_load_migrate/,/autojump.CONFIG_DIR = ORIG_CONFIG_DIR/d' \
diff --git a/dev-cpp/gmock/gmock-1.4.0.ebuild b/dev-cpp/gmock/gmock-1.4.0.ebuild
index 1777a2ee36b4..744d1c074f86 100644
--- a/dev-cpp/gmock/gmock-1.4.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.4.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-cpp/gmock/gmock-1.4.0.ebuild,v 1.3 2012/05/30 20:03:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.5 2012/06/12 18:58:16 jdhore Exp $
 
 EAPI="4"
 
diff --git a/dev-cpp/gmock/gmock-1.5.0.ebuild b/dev-cpp/gmock/gmock-1.5.0.ebuild
index d02b8873aed4..f3da555b6bb2 100644
--- a/dev-cpp/gmock/gmock-1.5.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.5.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-cpp/gmock/gmock-1.5.0.ebuild,v 1.3 2011/11/11 20:35:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.5.0.ebuild,v 1.5 2012/06/12 18:58:16 jdhore Exp $
 
 EAPI="4"
 
diff --git a/dev-cpp/gmock/gmock-1.6.0.ebuild b/dev-cpp/gmock/gmock-1.6.0.ebuild
index a747b10ecba1..b67257fc9d0f 100644
--- a/dev-cpp/gmock/gmock-1.6.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.6.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-cpp/gmock/gmock-1.6.0.ebuild,v 1.1 2012/03/30 15:52:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.6.0.ebuild,v 1.4 2012/06/12 18:56:00 jdhore Exp $
 
 EAPI="4"
 
@@ -12,11 +12,12 @@ SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 RDEPEND="=dev-cpp/gtest-${PV}*"
-DEPEND="${RDEPEND}"
+DEPEND="app-arch/unzip
+	${RDEPEND}"
 
 src_unpack() {
 	default
diff --git a/dev-cpp/gtest/gtest-1.6.0.ebuild b/dev-cpp/gtest/gtest-1.6.0.ebuild
index d4c862c97f2a..78a053bf6c49 100644
--- a/dev-cpp/gtest/gtest-1.6.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.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-cpp/gtest/gtest-1.6.0.ebuild,v 1.4 2012/06/12 02:18:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0.ebuild,v 1.6 2012/06/12 18:55:16 jdhore Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="examples threads static-libs"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index bd3fb09c1f73..fdadebc0ab35 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -3,11 +3,14 @@ DIST sqlite-autoconf-3071000.tar.gz 1801640 RMD160 8932a5cd4b596632c63af30cbd94c
 DIST sqlite-autoconf-3071100.tar.gz 1807754 RMD160 09df3232f4eb7032c0a6081670b2bdcb6d80e865 SHA1 a768f76b10df84d6a2c66178544d42725a8fdaf0 SHA256 2badc75dc536249bcd68c44d2a655724285d054303251eaff9d355194cb3476b
 DIST sqlite-autoconf-3071200.tar.gz 1827241 RMD160 395d8d137a8d5627bd85a91c4751b0a24933cee2 SHA1 30e6b0912f074cff5563697367c2ba9608d83bd3 SHA256 ca1735d13975be84cba87ea1b62ae0ab01fdc01ef21d7547982a2b118c9fc649
 DIST sqlite-autoconf-3071201.tar.gz 1831193 RMD160 8b5f54564ff283532472d9c62ecafc4c7be69569 SHA1 295b9acdf9c0452017ca1af392c0e5db019e6874 SHA256 b4ce93881cb88e7d1d0f2ad50a206b600163b40fea6df9d0749ad152aaebf845
+DIST sqlite-autoconf-3071300.tar.gz 1845778 RMD160 4c9a959c4d2e162b72b90a965d9b68f97088b3c7 SHA1 d3833b6ad68db8505d1044f761dd962f415cd302 SHA256 ac566819f82ec4cc2ff6c5cc90987ca38e589efbd79ff263838bbc62356ab119
 DIST sqlite-doc-3071000.zip 3630343 RMD160 6a75f7c10a8421a99e28c5430ab4f0a0ac09e6d6 SHA1 9957b9f2e955d82b2484cb44cc6fb4a53313d085 SHA256 f74c3681111d35a58449b0c1851a8f852b9cb8c4ec19a6f0ecaae9f2d1f7ca28
 DIST sqlite-doc-3071100.zip 4069512 RMD160 388bbcccb69d458f48f044bd65d282d9cf48dbe2 SHA1 87cbed1918c2604daefd3588a8555067e55e53cf SHA256 78541dd7190208d604a933f522a86d775422df44262310212189015b4b0f26ca
 DIST sqlite-doc-3071200.zip 4083373 RMD160 ad50b126669bb04b1a69b56d967201c7c716f52a SHA1 a5a71f0440816d731d30ad080429c971497b068d SHA256 cf2e244190802836f73b0ab2036a33ac430f17c489f70fe4a14280d6c7e64986
 DIST sqlite-doc-3071201.zip 4088017 RMD160 05ce0e614c2e601d7c81f403b4da3da9c7fc9abf SHA1 0b917812c3c4cb9fdeaf918945aa5bbea2f2ed6b SHA256 e86542934b1d47780f9e1fe415b5b792feabc8d520a28f9f65b049922a8fa2e5
+DIST sqlite-doc-3071300.zip 3868922 RMD160 8f75103d1ff8a4f5ac8b90663f38985a6fe1204e SHA1 839f471d03de777b050bf585ab6175a27d96c360 SHA256 7212d48110b7b39a64be3dd48ab7ad9e782330dd0709c474f1ae4f3e394c04bf
 DIST sqlite-src-3071000.zip 4682084 RMD160 64f2fc871bcb129a2cedc92da02ef668bb95689a SHA1 23baab0a89d77e7b1a9a0ececd05dd629a2b098d SHA256 e976196a9c64bd152917760a134834a881c9eebc34f49125102a8918c5cd86a4
 DIST sqlite-src-3071100.zip 4705421 RMD160 4dd380ef7f29f957e5504ca9f7c5d48aec5b0bea SHA1 4bcb60c0a79e42fe01c64108deac66473123f4e7 SHA256 939262fe70b5e4dcd04f29d6f1d8221542f24e71adf72f0d4a8c671d8b6d9441
 DIST sqlite-src-3071200.zip 4648718 RMD160 e20b855c8348ce610705a600bc4bd5574df19151 SHA1 a0cd400fd9011972fb76f253ab7b6bb82259efe5 SHA256 cbdba7d03e24ca34550a9910036ccceb9e5173cb28c850c788a6da8d8b130725
 DIST sqlite-src-3071201.zip 4672290 RMD160 56b1ec4729cd09eeb4cf5a6300e72506b543c620 SHA1 61a5aaacf5d82158f5a8ab69378834dd5e988b35 SHA256 dc4508930f54cc96c6f20a5b6db810b531f4af416e1df8dde2b85af5f316da2e
+DIST sqlite-src-3071300.zip 4923284 RMD160 f82d2fd488ae2a32f9824aa8032ccb213fea7370 SHA1 186db0ce8c6aad212753f083272004e4c270ecb9 SHA256 4cf9b373cbdf1e1ae7f343b40e8a4007b298dee15a6ca7906feffa12c636f118
diff --git a/dev-db/sqlite/sqlite-3.7.12.1.ebuild b/dev-db/sqlite/sqlite-3.7.12.1.ebuild
index 13d0b3b12fbf..5237f0ff11f3 100644
--- a/dev-db/sqlite/sqlite-3.7.12.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.12.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-db/sqlite/sqlite-3.7.12.1.ebuild,v 1.1 2012/05/22 20:16:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.12.1.ebuild,v 1.3 2012/06/12 18:33:01 jdhore 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 ~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"
+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-db/sqlite/sqlite-3.7.13.ebuild b/dev-db/sqlite/sqlite-3.7.13.ebuild
new file mode 100644
index 000000000000..799208a10ae3
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.7.13.ebuild
@@ -0,0 +1,157 @@
+# 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.13.ebuild,v 1.1 2012/06/12 15:26:38 floppym Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+DOC_PV="${SRC_PV}"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://sqlite.org/"
+SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
+	!tcl? (
+		test? ( http://sqlite.org/${PN}-src-${SRC_PV}.zip )
+		!test? ( http://sqlite.org/${PN}-autoconf-${SRC_PV}.tar.gz )
+	)"
+
+LICENSE="as-is"
+SLOT="3"
+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 )
+	readline? ( sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl
+	)"
+
+amalgamation() {
+	use !tcl && use !test
+}
+
+pkg_setup() {
+	if amalgamation; then
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
+	use prefix && eautoreconf
+
+	epunt_cxx
+}
+
+src_configure() {
+	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
+	if amalgamation; then
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# Support column metadata, bug #266651
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support R-trees, bug #257646
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	if use icu; then
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if amalgamation; then
+			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# Support FTS3, bug #207701
+	if use fts3; then
+		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+	fi
+
+	# Enable secure_delete pragma by default
+	if use secure-delete; then
+		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
+	fi
+
+	# Support soundex, bug #143794
+	if use soundex; then
+		append-cppflags -DSQLITE_SOUNDEX
+	fi
+
+	# Enable unlock notification
+	if use unlock-notify; then
+		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+	fi
+
+	local extensions_option
+	if amalgamation; then
+		extensions_option="dynamic-extensions"
+	else
+		extensions_option="load-extension"
+	fi
+
+	# Starting from 3.6.23, SQLite has locking strategies that are specific to
+	# OSX. By default they are enabled, and use semantics that only make sense
+	# on OSX. However, they require gethostuuid() function for that, which is
+	# only available on OSX starting from 10.6 (Snow Leopard). For earlier
+	# versions of OSX we have to disable all this nifty locking options, as
+	# suggested by upstream.
+	if [[ "${CHOST}" == *-darwin[56789] ]]; then
+		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE="0"
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	# `configure` from amalgamation tarball doesn't support
+	# --with-readline-inc and --(enable|disable)-tcl options.
+	econf \
+		--disable-static \
+		$(use_enable extensions ${extensions_option}) \
+		$(use_enable readline) \
+		$(use_enable threadsafe) \
+		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
+		$(amalgamation || use_enable debug) \
+		$(amalgamation || echo --enable-tcl)
+}
+
+src_compile() {
+	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+}
+
+src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake $(use debug && echo fulltest || echo test)
+}
+
+src_install() {
+	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+	find "${ED}" -name "*.la" -exec rm -f {} +
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+	fi
+}
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index be02db15cee3..a831f9145517 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,2 +1,3 @@
 DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
 DIST ogre_src_v1-7-4.tar.bz2 67391570 RMD160 4259b45dc4b3c4f930053e0de5e4366eaf113840 SHA1 e989b96eacc2c66f8cf8a19dae6cfd962a165207 SHA256 afa475803d9e6980ddf3641dceaa53fcfbd348506ed67893c306766c166a4882
+DIST ogre_src_v1-8-0.tar.bz2 88682669 RMD160 0eaa5e6bd631b34326a0e49b351dbeece92aa9ab SHA1 0fa7afd1bd7915f33df0a7f96a0f55c2b01297ec SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6
diff --git a/dev-games/ogre/files/ogre-1.8.0-flags.patch b/dev-games/ogre/files/ogre-1.8.0-flags.patch
new file mode 100644
index 000000000000..3f8e89a21a33
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.0-flags.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed May 30 13:45:46 UTC 2012
+Subject: build system
+
+remove pre-set flags
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -97,12 +97,6 @@
+   if (OGRE_GCC_HAS_SSE)
+     add_definitions(-msse)
+   endif ()
+-  # This is a set of sensible warnings that provide meaningful output
+-  set(OGRE_WARNING_FLAGS "-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -pedantic -Wshadow -Wno-missing-field-initializers -Wno-long-long")
+-  if (NOT APPLE)
+-      set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter")
+-  endif ()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}")
+ endif ()
+ if (MSVC)
+   if (CMAKE_BUILD_TOOL STREQUAL "nmake")
diff --git a/dev-games/ogre/files/ogre-1.8.0-threading.patch b/dev-games/ogre/files/ogre-1.8.0-threading.patch
new file mode 100644
index 000000000000..13cf5634e53d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.0-threading.patch
@@ -0,0 +1,77 @@
+http://www.ogre3d.org/mantis/view.php?id=425
+
+--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
+@@ -31,6 +31,7 @@
+ #include <signal.h>
+ #include "OgrePrerequisites.h"
+ #include "OgreException.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ namespace Ogre {
+ 
+--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
+@@ -42,6 +42,8 @@
+ #   pragma GCC visibility pop
+ #endif
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
+@@ -31,6 +31,7 @@
+ 
+ #include "OgrePrerequisites.h"
+ #include "OgrePolygon.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ 
+ namespace Ogre
+@@ -58,9 +59,7 @@
+ 
+ 		// Static 'free list' of polygons to save reallocation, shared between all bodies
+ 		static PolygonList msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 		OGRE_STATIC_MUTEX(msFreePolygonsMutex)
+-#endif
+ 
+ 	public:
+ 		ConvexBody();
+--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
+@@ -32,6 +32,8 @@
+ #include "OgrePrerequisites.h"
+ #include "OgreString.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 
+ 	/** \addtogroup Core
+--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
+@@ -30,6 +30,8 @@
+ 
+ #include "OgrePrerequisites.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
++++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
+@@ -44,9 +44,7 @@
+ 	// Statics
+ 	//-----------------------------------------------------------------------
+ 	ConvexBody::PolygonList ConvexBody::msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 	OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
+-#endif
+ 	//-----------------------------------------------------------------------
+ 	void ConvexBody::_initialisePool()
+ 	{
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 7596d2bb0dcd..85edd44d5d6c 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -79,7 +79,8 @@ Exporters
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="devil">image loading support with DevIL</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-    <flag name="freeimage">support images via freeimage</flag>
+	<flag name="freeimage">support images via freeimage</flag>
+	<flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
     <flag name="ois">pull in Object-oriented Input System library for samples</flag>
     <flag name="poco">when USE=threads, use poco for threading</flag>
     <flag name="tbb">when USE=threads, use tbb for threading</flag>
diff --git a/dev-games/ogre/ogre-1.8.0.ebuild b/dev-games/ogre/ogre-1.8.0.ebuild
new file mode 100644
index 000000000000..c3c689827110
--- /dev/null
+++ b/dev-games/ogre/ogre-1.8.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.0.ebuild,v 1.3 2012/06/13 01:52:54 mr_bones_ Exp $
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_PV=${PV//./-}
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb test threads tools +zip"
+REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
+RESTRICT="test" #139905
+
+RDEPEND="media-libs/freetype:2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	boost? ( dev-libs/boost )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+# gles1 currently broken wrt bug #418201
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )"
+
+S=${WORKDIR}/${PN}_src_v${MY_PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-threading.patch \
+		"${FILESDIR}"/${P}-flags.patch
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_FULL_RPATH=NO
+		$(cmake-utils_use boost OGRE_USE_BOOST)
+		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
+		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
+		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use test OGRE_BUILD_TESTS)
+		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
+		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
+		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
+	)
+
+	if use threads ; then
+		local f
+		for f in boost poco tbb ; do
+			use ${f} || continue
+			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+			break
+		done
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index c604950e9056..8bc47f8c92fc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,10 +1,4 @@
-DIST apache-maven-2.0.10-bin.tar.bz2 2104924 RMD160 e2b292fc981298a8a3fc5d08caf390e3f484026b SHA1 d70a18bc119f60954fcf514312fe048d70996c7e SHA256 a3f62f0f3766a0b8279d650dcc47486bed54d9d0459c96d5caa60359e1f15721
 DIST apache-maven-2.0.11-bin.tar.bz2 2104711 RMD160 f74e8421518a38f300982ecd404f99376c007e53 SHA1 a4f36630522f45566ea0220776de20d5ddff69ce SHA256 f8e91b43def9b78d01f0ad8374644aa737365144dea04a97f9503ac0011ad39c
-DIST apache-maven-2.1.0-bin.tar.bz2 2903842 RMD160 fde285896606d8a380ad07656a6401f6d66b4f6b SHA1 7b18c2968b3c4e0c32aceb3203b776572c161fd3 SHA256 2accbe9358765973ce68f4cc11a9bc8de0358e72164647ac4c2041a83e0cde1b
 DIST apache-maven-2.2.1-bin.tar.bz2 2839688 RMD160 25d523d3dc86cf4695b0e343cf0f6e58ea8a54e3 SHA1 47ac0417a200cbc6d1b967d6b7c6ae1138e9e3e0 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f
-DIST apache-maven-3.0-bin.tar.gz 2899256 RMD160 eacd100b1ac8291d0ae32a5e10914596d1d9de77 SHA1 996f29b5a19e8145cb00926c68a0200dac554205 SHA256 046a0c7661ca85ac6cef6ac6c7cc2175b77bc5ee915e30897afba6c38fdb27a2
-DIST apache-maven-3.0.2-bin.tar.gz 2968629 RMD160 26214da3e72cd8b9ea0fea0bb81e740b94ae0463 SHA1 eedd18952c373824c32b2fa891569bdf3776f650 SHA256 c7a70e37cbd564a6025288e381e6ad56e20ae2fa537b2eddf3b9e3bc644b0814
-DIST apache-maven-3.0.3-bin.tar.gz 3054807 RMD160 f222733f32badab75c11e0ed3fbca2e594de7328 SHA1 cfd1f5ef8ebb2f09a9446159842cf7cfa1a3ccd6 SHA256 b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a
 DIST apache-maven-3.0.4-bin.tar.gz 4873043 RMD160 c55335fb5c10380db64e6b56ee26cd6f42307a72 SHA1 0de5dc162bafde3fcb0a6b009cfeea81a042523b SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f
-DIST maven-1.0.2.tar.gz 6060686 RMD160 3d94fad30086f462eb3dd238803d274346ef9e2f SHA1 2978ffff5526dad371b560acb052cc78b6a2cb6b SHA256 8895c3bc0cce94e03aede40322e7485c8c458ad88f377d8170986c18e8f34c83
 DIST maven-1.1.tar.gz 7625074 RMD160 82ef869218ac42d9132fc74316f0e8a5edcf9431 SHA1 d9174675f0e846a225278949869fa2d979fa7f3b SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731
diff --git a/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild b/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
deleted file mode 100644
index d0ad004a7296..000000000000
--- a/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
-
-EAPI="4"
-
-MY_PN=${PN/-bin}
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-admin/eselect-maven"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-MAVEN=${PN}-${SLOT}
-MAVEN_HOME="/usr/share/${MAVEN}"
-MAVEN_BIN="${MAVEN_HOME}/bin"
-
-src_install() {
-	dodir ${MAVEN_HOME}
-	insinto ${MAVEN_HOME}
-	doins -r bin lib *.xsd plugins
-
-	dodir ${MAVEN_BIN}
-	exeinto ${MAVEN_BIN}
-	doexe "${FILESDIR}/${MY_PN}"
-
-	dodir /usr/bin
-	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-1.1-r2.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
similarity index 85%
rename from dev-java/maven-bin/maven-bin-1.1-r2.ebuild
rename to dev-java/maven-bin/maven-bin-1.1-r3.ebuild
index 5609bfcbbe4d..d13130519202 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-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/dev-java/maven-bin/maven-bin-1.1-r2.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r3.ebuild,v 1.1 2012/06/12 12:14:04 sera Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SLOT="1.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="app-admin/eselect-maven"
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
 RDEPEND=">=virtual/jdk-1.5
 	${DEPEND}"
 
diff --git a/dev-java/maven-bin/maven-bin-2.0.10.ebuild b/dev-java/maven-bin/maven-bin-2.0.10.ebuild
deleted file mode 100644
index 298aa29ffc52..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.10.ebuild,v 1.3 2009/04/27 00:03:10 ranger Exp $
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=virtual/jdk-1.4"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn
-}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
similarity index 88%
rename from dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild
rename to dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
index 316045fbd4dd..e54065bc27ec 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-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/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild,v 1.1 2012/06/12 12:14:04 sera Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ SLOT="2.0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="app-admin/eselect-maven"
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
 RDEPEND=">=virtual/jdk-1.4
 	${DEPEND}"
 
diff --git a/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild b/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild
deleted file mode 100644
index 8496c4e8705f..000000000000
--- a/dev-java/maven-bin/maven-bin-2.1.0-r1.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/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-admin/eselect-maven"
-RDEPEND=">=virtual/jdk-1.4
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-2.1.0.ebuild b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
deleted file mode 100644
index 693b88c0fa24..000000000000
--- a/dev-java/maven-bin/maven-bin-2.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.1.0.ebuild,v 1.6 2011/07/18 07:33:22 xarthisius Exp $
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=virtual/jdk-1.4
-	app-admin/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
similarity index 86%
rename from dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild
rename to dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 1729705abc3b..a4d7c1bdaa03 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1-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/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.1 2012/06/12 12:14:04 sera Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ SLOT="2.2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="app-admin/eselect-maven"
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
 RDEPEND=">=virtual/jdk-1.5
 	${DEPEND}"
 
@@ -27,9 +27,7 @@ S="${WORKDIR}/${MY_P}"
 MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	rm -v "${S}"/bin/*.bat || die
 }
 
diff --git a/dev-java/maven-bin/maven-bin-3.0.2.ebuild b/dev-java/maven-bin/maven-bin-3.0.2.ebuild
deleted file mode 100644
index ace580226496..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.2.ebuild,v 1.1 2011/01/15 12:25:40 fordfrog Exp $
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild
deleted file mode 100644
index 4ba49bb7ffe5..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-admin/eselect-maven"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.3.ebuild b/dev-java/maven-bin/maven-bin-3.0.3.ebuild
deleted file mode 100644
index ab63c55ad187..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.3.ebuild,v 1.1 2011/03/10 15:27:23 fordfrog Exp $
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
similarity index 90%
rename from dev-java/maven-bin/maven-bin-3.0.4.ebuild
rename to dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index cba52aa09425..6b432b5584b5 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.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-java/maven-bin/maven-bin-3.0.4.ebuild,v 1.1 2012/01/26 16:42:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.1 2012/06/12 12:14:04 sera Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ SLOT="3.0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="app-admin/eselect-maven"
+DEPEND="|| ( app-admin/eselect-java app-admin/eselect-maven )"
 RDEPEND=">=virtual/jdk-1.5
 	${DEPEND}"
 
@@ -27,9 +27,7 @@ S="${WORKDIR}/${MY_P}"
 MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	rm -v "${S}"/bin/*.bat || die
 	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
 }
diff --git a/dev-java/maven-bin/maven-bin-3.0.ebuild b/dev-java/maven-bin/maven-bin-3.0.ebuild
deleted file mode 100644
index b0299379ee4b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.ebuild,v 1.1 2010/10/29 18:41:24 caster Exp $
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
-	unpack ${A}
-
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/proxool/proxool-0.8.3-r2.ebuild b/dev-java/proxool/proxool-0.8.3-r2.ebuild
index a871393061cc..0177ff5fa5a0 100644
--- a/dev-java/proxool/proxool-0.8.3-r2.ebuild
+++ b/dev-java/proxool/proxool-0.8.3-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-java/proxool/proxool-0.8.3-r2.ebuild,v 1.2 2012/06/11 12:44:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/proxool-0.8.3-r2.ebuild,v 1.3 2012/06/12 11:32:25 johu Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 # Tests disabled because they would need hibernate
diff --git a/dev-lang/go/go-1.0.1.ebuild b/dev-lang/go/go-1.0.1.ebuild
index e6d84fffe8bc..b06ce57c7e74 100644
--- a/dev-lang/go/go-1.0.1.ebuild
+++ b/dev-lang/go/go-1.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-lang/go/go-1.0.1.ebuild,v 1.3 2012/05/15 23:31:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.1.ebuild,v 1.4 2012/06/12 22:24:11 williamh Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ DEPEND="sys-apps/ed
 	${COMMON_DEPEND}"
 RDEPEND="bash-completion? ( app-shells/bash-completion )
 	emacs? ( virtual/emacs )
-	vim-syntax? ( app-editors/vim )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	zsh-completion? ( app-shells/zsh-completion )
 	${COMMON_DEPEND}"
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index ac9f6d2e22b8..ca1390cf5813 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-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/dev-lang/go/go-9999.ebuild,v 1.3 2012/05/16 00:26:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.4 2012/06/12 22:24:11 williamh Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ DEPEND="sys-apps/ed
 	${COMMON_DEPEND}"
 RDEPEND="bash-completion? ( app-shells/bash-completion )
 	emacs? ( virtual/emacs )
-	vim-syntax? ( app-editors/vim )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	zsh-completion? ( app-shells/zsh-completion )
 	${COMMON_DEPEND}"
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index c219433f41d4..ae5a690a62e2 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1 +1 @@
-DIST userspace-rcu-0.6.7.tar.bz2 326304 RMD160 68942c264c250487d2156a2f3100a7936a6f66aa SHA1 ff77001c7063c40e28a65840584740803b34730b SHA256 b0b09aead6fbcb4d5efb4270e12f84ffd115b99b55b2c745e052b2d87a47e75f
+DIST userspace-rcu-0.7.3.tar.bz2 385350 RMD160 96efc29d11339334adda3b8917aa74d2878d03fb SHA1 0585e06068f766c42602b32c20baf241258440ba SHA256 63f540a5d3c947fa3739711099fb87a66036d3c9560f26da763e500da296a1af
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.6.7.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.7.3.ebuild
similarity index 75%
rename from dev-libs/userspace-rcu/userspace-rcu-0.6.7.ebuild
rename to dev-libs/userspace-rcu/userspace-rcu-0.7.3.ebuild
index bf70744fd943..d2cfae220987 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.6.7.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.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/dev-libs/userspace-rcu/userspace-rcu-0.6.7.ebuild,v 1.1 2011/12/29 10:34:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/userspace-rcu/userspace-rcu-0.7.3.ebuild,v 1.1 2012/06/12 13:41:28 scarabeus Exp $
 
 EAPI=4
 
@@ -18,10 +18,11 @@ DEPEND="${RDEPEND}
 	test? ( sys-process/time )
 "
 
-DOCS=( "README" "API.txt" "ChangeLog" )
+DOCS=( "README" "ChangeLog" )
 
 src_configure() {
 	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static)
 }
 
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 3d3db08565e7..b083b3a2d552 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,2 +1 @@
-DIST camomile-0.8.3.tar.bz2 2646968 RMD160 56651ff4625dbdd9876784c1369c5a6ed6b290a6 SHA1 9f2600010820689805b5ab6e4048217ea821d535 SHA256 94c8d65d417c90301f6b3b21e4b00e151c434a3e2d406c3d5b3363859034f27b
 DIST camomile-0.8.4.tar.bz2 2649800 RMD160 a3c1cba2d4e8d2597bf420ae64e93128e9c85d70 SHA1 20fc38316e19bcca2401f799afb84e05a3553e3c SHA256 ef521f96fe984e6b0118041ed68a7a165beda54d8541c248ed402b7ef693de50
diff --git a/dev-ml/camomile/camomile-0.8.3.ebuild b/dev-ml/camomile/camomile-0.8.3.ebuild
deleted file mode 100644
index 8c0811caeef1..000000000000
--- a/dev-ml/camomile/camomile-0.8.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.8.3.ebuild,v 1.3 2012/02/06 16:57:45 ranger Exp $
-
-EAPI="2"
-
-inherit findlib eutils
-
-DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml."
-HOMEPAGE="http://camomile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/camomile/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug +ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 byte unidata unimaps charmap_data locale_data || die "failed to build"
-	if use ocamlopt; then
-		emake -j1 opt || die "failed to build native code"
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
-}
diff --git a/dev-ml/cryptokit/Manifest b/dev-ml/cryptokit/Manifest
index 5bf8bac33fbb..bb85f83587fb 100644
--- a/dev-ml/cryptokit/Manifest
+++ b/dev-ml/cryptokit/Manifest
@@ -1,2 +1 @@
-DIST cryptokit-1.4.tar.gz 128546 RMD160 0d80a934041bde8f462c9463cfb522739b7323a0 SHA1 2f93d0fddfdf731bff105e189ebcbbc1f5b9377c SHA256 9f2f6ad234006ab9665190f0f298d7f9da2dbb9e5e0cec4de9dfe41f22d1e92f
 DIST cryptokit-1.5.tar.gz 128907 RMD160 7e1e179c3970ac8b0cdbac1ef18e9ea79de6526e SHA1 63e1ca4918186bcc7f5e7f6566c765261c4abef3 SHA256 e2483a463ea57eee99c1e9c5aed1c34885255e47f0d4d872bb2bb3a8975eb3e4
diff --git a/dev-ml/cryptokit/cryptokit-1.4.ebuild b/dev-ml/cryptokit/cryptokit-1.4.ebuild
deleted file mode 100644
index 809912a7da52..000000000000
--- a/dev-ml/cryptokit/cryptokit-1.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.4.ebuild,v 1.4 2012/03/15 18:21:08 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit findlib multilib
-
-DESCRIPTION="Cryptographic primitives library for Objective Caml"
-HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/460/${P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="debug doc +ocamlopt zlib"
-
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
-		zlib? ( >=sys-libs/zlib-1.1 )"
-RDEPEND="${DEPEND}"
-
-oasis_use_enable() {
-	echo "--override $2 `use $1 && echo \"true\" || echo \"false\"`"
-}
-
-src_configure() {
-	./configure --prefix usr \
-		--libdir /usr/$(get_libdir) \
-		--destdir "${D}" \
-		$(use_enable zlib) \
-		$(oasis_use_enable debug debug) \
-		$(oasis_use_enable ocamlopt is_native) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-	if use doc ; then
-		emake doc || die
-	fi
-}
-
-src_install() {
-	findlib_src_install
-	dodoc Changes README* AUTHORS* || die
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This library uses the /dev/random device to generate "
-	elog "random data and RSA keys.  The device should either be"
-	elog "built into the kernel or provided as a module. An"
-	elog "alternative is to use the Entropy Gathering Daemon"
-	elog "(http://egd.sourceforge.net).  Please note that the"
-	elog "remainder of the library will still work even in the"
-	elog "absence of a one of these sources of randomness."
-	elog ""
-}
-
-src_test() {
-	echo ""
-	einfo "You must have either /dev/random or the Entropy Gathering"
-	einfo "Daemon (EGD) for this test to succeed!"
-	echo ""
-
-	emake test || die "emake test failed"
-}
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 0627c1193019..251e6b0580bb 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1,2 +1 @@
-DIST oasis-0.3.0~rc5.tar.gz 294647 RMD160 cd6057f9b8d7c4c8fc1ecdaccc6d469faad96531 SHA1 a41c75341bab01dba6214617a1a8d64a33af1c34 SHA256 1e3eb1056276cb40b1e90d3b46e74c1bdc42f3f876047ab122d441b45dd391de
 DIST oasis-0.3.0~rc6.tar.gz 294996 RMD160 267e400c1d087d655add4e288178db35251fde66 SHA1 0d9eda43d7274523e8b03174f5104951190c586f SHA256 d077717ced28e318020e1a2dda7839f81f0f71c121929786e4e0162554a20ef4
diff --git a/dev-ml/oasis/oasis-0.3.0_rc5.ebuild b/dev-ml/oasis/oasis-0.3.0_rc5.ebuild
deleted file mode 100644
index a3e8834caa3a..000000000000
--- a/dev-ml/oasis/oasis-0.3.0_rc5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/oasis-0.3.0_rc5.ebuild,v 1.1 2012/05/03 23:53:34 aballier Exp $
-
-EAPI=3
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_P=${P/_/\~}
-DESCRIPTION="OASIS is a tool to integrate a configure, build and install system in OCaml project"
-HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/855/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-ml/ocaml-data-notation-0.0.3"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlify
-	dev-ml/ocamlmod
-	test? (
-		>=dev-ml/ocaml-fileutils-0.4.2
-		>=dev-ml/ounit-1.1.0
-		>=dev-ml/ocaml-expect-0.0.2
-		dev-ml/extlib
-	)"
-
-STRIP_MASK="*/bin/*"
-S="${WORKDIR}/${MY_P}"
-DOCS=( "README.txt" "TODO.txt" "AUTHORS.txt" "CHANGES.txt" )
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index 433e336fce93..d0045e3398b4 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,2 +1,2 @@
-DIST ounit-1.1.0.tar.gz 52228 RMD160 f7d82446970f40eccc917a3ee57e7d6526b1b177 SHA1 e477f8a1b4fcd6a838cbbc04450a80b1cea3456c SHA256 1d57292ec2983943a00f4e0b448aa8ba4df89da40cdd216e44ac70dad35b7e8b
 DIST ounit-1.1.1.tar.gz 52677 RMD160 ed43ef3443d5b88ee25a7bd91f926d375e016123 SHA1 1ea95980d385d6e0debf4ef1b9819386ce4389fd SHA256 0ea290c639f5069656d43d05c7cb4999a9c7ec22733ee2d10ea2f8b8706ecd29
+DIST ounit-1.1.2.tar.gz 58055 RMD160 77793a4478a1ddc1f8775e7d51eed56b89545052 SHA1 c7311ac200138958eec9b49274083989a0b097f1 SHA256 e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3
diff --git a/dev-ml/ounit/ounit-1.1.0.ebuild b/dev-ml/ounit/ounit-1.1.0.ebuild
deleted file mode 100644
index 248be4ff1e29..000000000000
--- a/dev-ml/ounit/ounit-1.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.0.ebuild,v 1.4 2011/01/13 22:16:36 ranger Exp $
-
-EAPI="2"
-
-inherit findlib multilib
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/495/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
-RDEPEND="${DEPEND}"
-IUSE="debug doc +ocamlopt"
-
-oasis_use_enable() {
-	echo "--override $2 `use $1 && echo \"true\" || echo \"false\"`"
-}
-
-src_configure() {
-	chmod +x configure
-	./configure --prefix usr \
-		--libdir /usr/$(get_libdir) \
-		--docdir /usr/share/doc/${PF}/html \
-		--destdir "${D}" \
-		$(oasis_use_enable debug debug) \
-		$(oasis_use_enable ocamlopt is_native) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-	if use doc ; then
-		emake doc || die
-	fi
-}
-
-src_install() {
-	findlib_src_install
-
-	# install documentation
-	dodoc README* AUTHORS* changelog || die
-}
diff --git a/dev-ml/ounit/ounit-1.1.2.ebuild b/dev-ml/ounit/ounit-1.1.2.ebuild
new file mode 100644
index 000000000000..ad056d2440bc
--- /dev/null
+++ b/dev-ml/ounit/ounit-1.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.2.ebuild,v 1.1 2012/06/12 12:42:34 aballier Exp $
+
+EAPI="3"
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="http://ounit.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/886/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest
index 8b785d6a9dfb..d9eb637df5f0 100644
--- a/dev-ml/pxp/Manifest
+++ b/dev-ml/pxp/Manifest
@@ -1 +1,2 @@
 DIST pxp-1.2.2.tar.gz 685485 RMD160 3d282da4e63dbd821d6c313a97626f4e560e3881 SHA1 4120dcd85aa19a0d8b2a267c8daa83268701fb39 SHA256 0be6a4e5c1aa2caf60f4559a89a05d9d1ed41a00497dd4062b4709e8f04ec75a
+DIST pxp-1.2.3.tar.gz 702592 RMD160 276b19d06d89927c751518a36a36cef4f3f62fe8 SHA1 4d0846f9f22d354740bb5a6c638da170e7a04e36 SHA256 fc147dd154b4a853e72bf742d77971302b11ae253d8c4d15566b12c79ad30e0c
diff --git a/dev-ml/pxp/pxp-1.2.3.ebuild b/dev-ml/pxp/pxp-1.2.3.ebuild
new file mode 100644
index 000000000000..3d983e2032ff
--- /dev/null
+++ b/dev-ml/pxp/pxp-1.2.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.2.3.ebuild,v 1.1 2012/06/12 12:41:42 aballier Exp $
+
+EAPI="2"
+
+inherit findlib eutils
+
+MY_P=${P/_beta/test}
+
+DESCRIPTION="validating XML parser library for O'Caml"
+HOMEPAGE="http://projects.camlcity.org/projects/pxp.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0"
+DEPEND=">=dev-ml/pcre-ocaml-4.31
+>=dev-ml/ulex-0.5
+>=dev-ml/ocamlnet-0.98
+>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+IUSE="examples +ocamlopt"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	#the included configure does not support  many standard switches and is quite picky
+	./configure || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all || die "make all failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "make opt failed"
+	fi
+}
+
+src_install() {
+	findlib_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	cd doc
+	dodoc ABOUT-FINDLIB DEV README SPEC design.txt
+}
diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest
index aa0cce7e27e3..dc2c660543c4 100644
--- a/dev-ml/tyxml/Manifest
+++ b/dev-ml/tyxml/Manifest
@@ -1 +1,2 @@
 DIST tyxml-2.0.2.tar.gz 103193 RMD160 536eb6fa8d79fab29ca48986fb263f6368f52c6d SHA1 da716580bbd5de6644db4a36410af9680bceb87a SHA256 521fa55bbacb4ffc5da504eacaa138a88f0a74978423173f6f48ab22da7a16ca
+DIST tyxml-2.1.tar.gz 103875 RMD160 47c12dc0d175eaf191a284361c5fb06b917f32e4 SHA1 0e10c566fe7d3334a7d290adc4b00d89cb356caa SHA256 3cf2bb4a58fdcf8ad91ec3afcd0124ca5f762a99bb43494b9219521d93e6d009
diff --git a/dev-ml/tyxml/tyxml-2.1.ebuild b/dev-ml/tyxml/tyxml-2.1.ebuild
new file mode 100644
index 000000000000..1ef00e877d33
--- /dev/null
+++ b/dev-ml/tyxml/tyxml-2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/tyxml/tyxml-2.1.ebuild,v 1.1 2012/06/12 12:51:31 aballier Exp $
+
+EAPI=4
+
+inherit eutils findlib
+
+DESCRIPTION="A libary to build xml trees typechecked by OCaml"
+HOMEPAGE="http://ocsigen.org/tyxml/"
+SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc ocamlduce +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.12[ocamlopt?]
+	dev-ml/ocamlnet
+	ocamlduce? ( dev-ml/ocamlduce )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	export myopts="OCAMLDUCE=$(usex ocamlduce yes no)"
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake "$myopts"
+	else
+		emake "$myopts" byte
+	fi
+	use doc && emake doc "$myopts"
+}
+
+src_install() {
+	findlib_src_preinst
+	if use ocamlopt; then
+		emake DESTIR="${D}" OCAMLDUCE="$myopts" install
+	else
+		emake DESTIR="${D}" OCAMLDUCE="$myopts" install-byte
+	fi
+	dodoc CHANGES README
+	use doc && dohtml -r doc/api-html
+}
diff --git a/dev-python/enthoughtbase/enthoughtbase-3.1.0.ebuild b/dev-python/enthoughtbase/enthoughtbase-3.1.0.ebuild
index 66deee9b3e71..9d83d91bf48b 100644
--- a/dev-python/enthoughtbase/enthoughtbase-3.1.0.ebuild
+++ b/dev-python/enthoughtbase/enthoughtbase-3.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/dev-python/enthoughtbase/enthoughtbase-3.1.0.ebuild,v 1.7 2011/04/01 16:09:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enthoughtbase/enthoughtbase-3.1.0.ebuild,v 1.8 2012/06/12 11:53:59 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ MY_PN="EnthoughtBase"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Core packages for the Enthought Tool Suite"
-HOMEPAGE="http://code.enthought.com/projects/enthought_base/ http://pypi.python.org/pypi/EnthoughtBase"
+HOMEPAGE="http://code.enthought.com/projects/enthought_base/"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD LGPL-2"
diff --git a/dev-python/envisagecore/envisagecore-3.2.0.ebuild b/dev-python/envisagecore/envisagecore-3.2.0.ebuild
index b8b9b666ae2a..cb9cc04ec7cb 100644
--- a/dev-python/envisagecore/envisagecore-3.2.0.ebuild
+++ b/dev-python/envisagecore/envisagecore-3.2.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-python/envisagecore/envisagecore-3.2.0.ebuild,v 1.3 2011/03/27 22:38:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/envisagecore/envisagecore-3.2.0.ebuild,v 1.4 2012/06/12 11:54:48 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ MY_PN="EnvisageCore"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enthought Tool Suite: Extensible application framework"
-HOMEPAGE="http://code.enthought.com/projects/envisage/ http://pypi.python.org/pypi/EnvisageCore"
+HOMEPAGE="http://code.enthought.com/projects/envisage/"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/envisageplugins/envisageplugins-3.2.0.ebuild b/dev-python/envisageplugins/envisageplugins-3.2.0.ebuild
index 6b9bae5f86b6..311222cd63a9 100644
--- a/dev-python/envisageplugins/envisageplugins-3.2.0.ebuild
+++ b/dev-python/envisageplugins/envisageplugins-3.2.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-python/envisageplugins/envisageplugins-3.2.0.ebuild,v 1.3 2011/03/27 22:39:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/envisageplugins/envisageplugins-3.2.0.ebuild,v 1.4 2012/06/12 11:57:53 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ MY_PN="EnvisagePlugins"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Enthought Tool Suite: Plug-ins for the Envisage framework"
-HOMEPAGE="http://code.enthought.com/projects/envisage_plugins.php http://pypi.python.org/pypi/EnvisagePlugins"
+HOMEPAGE="http://code.enthought.com/projects/envisage_plugins.php"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0.ebuild
index d12b35d330ac..afcfff96b305 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.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/dev-python/nose-cover3/nose-cover3-0.1.0.ebuild,v 1.1 2012/05/30 06:27:05 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-cover3/nose-cover3-0.1.0.ebuild,v 1.2 2012/06/12 11:37:53 iksaif Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ DISTUTILS_SRC_TEST="nosetests"
 inherit distutils
 
 DESCRIPTION="Coverage 3.x support for Nose"
-HOMEPAGE="https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nosecover3"
+HOMEPAGE="https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nose-cover3"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index d2619e0036fd..6480cfcd334c 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,2 +1 @@
-DIST pyside-qt4.7+1.1.0.tar.bz2 3747682 RMD160 f274d82c855ea4e7ba2b011155374969a69eafcb SHA1 e0f0440cf2a3d20b305397faf8bfed74bdcab873 SHA256 e57ad83e7dfc78bcd72934240c14f59d31da7f429e1c9ee0a060a216ef162ddf
 DIST pyside-qt4.8+1.1.1.tar.bz2 3756704 RMD160 ecdba4d1ae0a62810694d4dfad9a770e33fcdb0d SHA1 37b4a2f666a84e39aa4b55f8909964c73ce47123 SHA256 acda876bb8e531682ce0a14e133021142c07988d505117299db3c00668749284
diff --git a/dev-python/pyside/pyside-1.1.0-r1.ebuild b/dev-python/pyside/pyside-1.1.0-r1.ebuild
deleted file mode 100644
index c233b3ab6fb4..000000000000
--- a/dev-python/pyside/pyside-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.0-r1.ebuild,v 1.3 2012/04/22 12:17:30 maekke Exp $
-
-EAPI=4
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-PYTHON_DEPEND="2:2.6 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
-
-VIRTUALX_COMMAND="cmake-utils_src_test"
-
-inherit multilib cmake-utils python virtualx
-
-MY_P="${PN}-qt4.7+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns"
-
-REQUIRED_USE="
-	declarative? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	test? ( X )
-	webkit? ( X )
-"
-
-QT_PV="4.7.0:4"
-
-RDEPEND="
-	>=dev-python/shiboken-1.1.0-r1
-	>=x11-libs/qt-core-${QT_PV}
-	X? (
-		>=x11-libs/qt-gui-${QT_PV}[accessibility]
-		>=x11-libs/qt-test-${QT_PV}
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
-	help? ( >=x11-libs/qt-assistant-${QT_PV} )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
-	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
-	phonon? (
-		kde? ( media-libs/phonon )
-		!kde? ( || (
-			>=x11-libs/qt-phonon-${QT_PV}
-			media-libs/phonon
-		) )
-	)
-	script? ( >=x11-libs/qt-script-${QT_PV} )
-	sql? ( >=x11-libs/qt-sql-${QT_PV} )
-	svg? ( >=x11-libs/qt-svg-${QT_PV}[accessibility] )
-	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/generatorrunner-0.6.16
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	# Fix generated pkgconfig file to require the shiboken
-	# library suffixed with the correct python version.
-	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
-		libpyside/pyside.pc.in || die
-
-	python_src_prepare
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DPYTHON_SUFFIX="-python${PYTHON_ABI}"
-			$(cmake-utils_use_build test TESTS)
-			$(cmake-utils_use_disable X QtGui)
-			$(cmake-utils_use_disable X QtDesigner)
-			$(cmake-utils_use_disable X QtTest)
-			$(cmake-utils_use_disable X QtUiTools)
-			$(cmake-utils_use_disable declarative QtDeclarative)
-			$(cmake-utils_use_disable help QtHelp)
-			$(cmake-utils_use_disable multimedia QtMultimedia)
-			$(cmake-utils_use_disable opengl QtOpenGL)
-			$(cmake-utils_use_disable phonon)
-			$(cmake-utils_use_disable script QtScript)
-			$(cmake-utils_use_disable scripttools QtScriptTools)
-			$(cmake-utils_use_disable sql QtSql)
-			$(cmake-utils_use_disable svg QtSvg)
-			$(cmake-utils_use_disable webkit QtWebKit)
-			$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
-		)
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	compilation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
-	}
-	python_execute_function -s compilation
-}
-
-src_test() {
-	testing() {
-		CMAKE_USE_DIR="${BUILDDIR}" virtualmake
-	}
-	python_enable_pyc
-	python_execute_function -s testing
-	python_disable_pyc
-}
-
-src_install() {
-	installation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
-	}
-	python_execute_function -s installation
-}
diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest
index 1649881f6da7..f236bd47b0f2 100644
--- a/dev-python/shiboken/Manifest
+++ b/dev-python/shiboken/Manifest
@@ -1,2 +1 @@
-DIST shiboken-1.1.0.tar.bz2 628866 RMD160 c99179381511e16cf1fd68fc8581e9c612d1d5b9 SHA1 c16300f72ea717e17e54bccd90d9494058c3f9a1 SHA256 99d26ee5982580a76826ca4c523736aa7853c694943d56208185ea62c6dc76c9
 DIST shiboken-1.1.1.tar.bz2 1065920 RMD160 4a0997c9474f433a6b0998d68eb84e98613bd010 SHA1 d24efc1e7499e9d7db4dfc85a975291e3cb3f311 SHA256 1cedad65d5d12e1b81a487b6aa7a1cb0a494934cb39c34f3cffcbc6c645d7e3f
diff --git a/dev-python/shiboken/shiboken-1.1.0-r2.ebuild b/dev-python/shiboken/shiboken-1.1.0-r2.ebuild
deleted file mode 100644
index 96ca46097859..000000000000
--- a/dev-python/shiboken/shiboken-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.1.0-r2.ebuild,v 1.4 2012/04/22 12:16:42 maekke Exp $
-
-EAPI=4
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-PYTHON_DEPEND="2:2.6 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
-
-inherit multilib cmake-utils python
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/apiextractor-0.10.10
-	>=dev-python/generatorrunner-0.6.16
-	>=x11-libs/qt-core-4.7.0:4
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
-	# caused by the usage of a different version suffix with python >= 3.2
-	sed -i -e "/get_config_var('SOABI')/d" \
-		cmake/Modules/FindPython3InterpWithDebug.cmake || die
-
-	python_src_prepare
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DPYTHON_EXECUTABLE="$(PYTHON -a)"
-			-DPYTHON_SUFFIX="-python${PYTHON_ABI}"
-			$(cmake-utils_use_build test TESTS)
-		)
-
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			mycmakeargs+=(
-				-DUSE_PYTHON3=ON
-				-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
-				-DPYTHON3_LIBRARY="$(python_get_library)"
-			)
-		fi
-
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	compilation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
-	}
-	python_execute_function -s compilation
-}
-
-src_test() {
-	testing() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_test
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	installation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
-		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
-	}
-	python_execute_function -s installation
-}
diff --git a/dev-python/traitsbackendqt/traitsbackendqt-3.6.0.ebuild b/dev-python/traitsbackendqt/traitsbackendqt-3.6.0.ebuild
index ac2fb7fa09f8..f828703d857b 100644
--- a/dev-python/traitsbackendqt/traitsbackendqt-3.6.0.ebuild
+++ b/dev-python/traitsbackendqt/traitsbackendqt-3.6.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-python/traitsbackendqt/traitsbackendqt-3.6.0.ebuild,v 1.5 2011/04/01 16:03:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsbackendqt/traitsbackendqt-3.6.0.ebuild,v 1.6 2012/06/12 12:02:05 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ MY_PN="TraitsBackendQt"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PyQt backend for Traits and TraitsGUI (Pyface)"
-HOMEPAGE="http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendQt"
+HOMEPAGE="http://code.enthought.com/projects/traits_gui/"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/traitsbackendwx/traitsbackendwx-3.6.0.ebuild b/dev-python/traitsbackendwx/traitsbackendwx-3.6.0.ebuild
index 915bb4c81150..3f416e3e8f8a 100644
--- a/dev-python/traitsbackendwx/traitsbackendwx-3.6.0.ebuild
+++ b/dev-python/traitsbackendwx/traitsbackendwx-3.6.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-python/traitsbackendwx/traitsbackendwx-3.6.0.ebuild,v 1.6 2011/04/01 16:31:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsbackendwx/traitsbackendwx-3.6.0.ebuild,v 1.7 2012/06/12 12:01:22 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ MY_PN="TraitsBackendWX"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="WxPython backend for Traits and TraitsGUI (Pyface)"
-HOMEPAGE="http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendWX"
+HOMEPAGE="http://code.enthought.com/projects/traits_gui/"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild b/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild
index 8258f00db661..30d001c06968 100644
--- a/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild
+++ b/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild,v 1.1 2011/04/03 12:31:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/traitsgui-3.6.0-r1.ebuild,v 1.2 2012/06/12 12:00:36 iksaif Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ MY_PN="TraitsGUI"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Traits-capable windowing framework"
-HOMEPAGE="http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsGUI"
+HOMEPAGE="http://code.enthought.com/projects/traits_gui/"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild
index d3f08c5be4b4..df832841c6dd 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.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/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild,v 1.2 2011/10/22 12:25:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.10.ebuild,v 1.3 2012/06/12 11:46:42 iksaif Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="http://github.com/nex3/ruby-progressbar"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
 
 LICENSE="|| ( Ruby GPL-2 )"
 SLOT="0"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild
index 5de9b435dcf6..04f136188ded 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-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/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild,v 1.1 2010/08/01 16:41:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9-r1.ebuild,v 1.2 2012/06/12 11:46:42 iksaif Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="http://github.com/nex3/ruby-progressbar"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
 
 LICENSE="|| ( Ruby GPL-2 )"
 SLOT="0"
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.ebuild
index d1475a76f295..8c59136f1e2e 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.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/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.ebuild,v 1.7 2010/09/30 01:36:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-0.0.9.ebuild,v 1.8 2012/06/12 11:46:42 iksaif Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="http://github.com/nex3/ruby-progressbar"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
 
 LICENSE="|| ( Ruby GPL-2 )"
 SLOT="0"
diff --git a/dev-ruby/spork/spork-0.8.4-r1.ebuild b/dev-ruby/spork/spork-0.8.4-r1.ebuild
index 6751b4754d83..d7b30d9882c6 100644
--- a/dev-ruby/spork/spork-0.8.4-r1.ebuild
+++ b/dev-ruby/spork/spork-0.8.4-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-ruby/spork/spork-0.8.4-r1.ebuild,v 1.3 2011/12/29 09:25:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.8.4-r1.ebuild,v 1.4 2012/06/12 11:45:00 iksaif Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="assets"
 inherit ruby-fakegem
 
 DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="http://github.com/timcharper/spork"
+HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/spork/spork-0.8.5.ebuild b/dev-ruby/spork/spork-0.8.5.ebuild
index eefde284ce0c..c33809439417 100644
--- a/dev-ruby/spork/spork-0.8.5.ebuild
+++ b/dev-ruby/spork/spork-0.8.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/dev-ruby/spork/spork-0.8.5.ebuild,v 1.1 2012/01/16 18:25:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.8.5.ebuild,v 1.2 2012/06/12 11:45:00 iksaif Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="assets"
 inherit ruby-fakegem
 
 DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="http://github.com/timcharper/spork"
+HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/spork/spork-0.9.0.ebuild b/dev-ruby/spork/spork-0.9.0.ebuild
index efd0fced1340..f0725870ce75 100644
--- a/dev-ruby/spork/spork-0.9.0.ebuild
+++ b/dev-ruby/spork/spork-0.9.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-ruby/spork/spork-0.9.0.ebuild,v 1.2 2012/03/02 13:38:51 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.0.ebuild,v 1.3 2012/06/12 11:45:00 iksaif Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="assets"
 inherit ruby-fakegem
 
 DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="http://github.com/timcharper/spork"
+HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
diff --git a/dev-ruby/spork/spork-0.9.2.ebuild b/dev-ruby/spork/spork-0.9.2.ebuild
index 427482e7e842..f2effa72b632 100644
--- a/dev-ruby/spork/spork-0.9.2.ebuild
+++ b/dev-ruby/spork/spork-0.9.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/dev-ruby/spork/spork-0.9.2.ebuild,v 1.1 2012/06/09 07:07:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2.ebuild,v 1.2 2012/06/12 11:45:00 iksaif Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="assets"
 inherit ruby-fakegem
 
 DESCRIPTION="Spork is Tim Harper's implementation of test server."
-HOMEPAGE="http://github.com/timcharper/spork"
+HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
diff --git a/dev-tex/bibtex2html/Manifest b/dev-tex/bibtex2html/Manifest
index cefe1fc35a73..d34644f74d96 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -1,2 +1 @@
-DIST bibtex2html-1.96.tar.gz 90178 RMD160 c6b847edb6d9ac09280177aa94ba3d8c1d9fa837 SHA1 ce447520fde0a66bbbda0db247f06afb5e53907c SHA256 f21dccea4d84e84f97017b0bc6a6ba854c62e6cb87e337c74a3dbc097b1a9482
 DIST bibtex2html-1.97.tar.gz 94887 RMD160 08187f4682eeff269d18f245193f34e2a3338d4f SHA1 970cb972eb88ff4cd01f247c0d8a6b821473f243 SHA256 99b5b66a729fd2928ee4d9d7d8397e36b684def4be9ee2746233006501c8e314
diff --git a/dev-tex/bibtex2html/bibtex2html-1.96.ebuild b/dev-tex/bibtex2html/bibtex2html-1.96.ebuild
deleted file mode 100644
index bf344dcd1315..000000000000
--- a/dev-tex/bibtex2html/bibtex2html-1.96.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.96.ebuild,v 1.4 2011/10/05 19:07:15 aballier Exp $
-
-EAPI=2
-
-inherit eutils
-
-IUSE="doc +ocamlopt"
-
-DESCRIPTION="A bibtex to HTML converter"
-SRC_URI="http://www.lri.fr/~filliatr/ftp/bibtex2html/${P}.tar.gz"
-HOMEPAGE="http://www.lri.fr/~filliatr/bibtex2html/"
-
-SLOT="0"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-RESTRICT="test"
-
-# With use doc we need a latex compiler to generate manual.pdf
-# hevea is used for manual.html
-# manual.tex needs fullpage.sty
-DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
-	doc? ( virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-tex/hevea )"
-# We need tex-base for bibtex but also some bibtex styles, so we use latex-base
-RDEPEND="virtual/latex-base"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.88-destdir.patch"
-	# Avoid pre-stripped files
-	sed -i -e "s/strip/true/" Makefile.in
-	# Fix build with ocaml 3.12, bug #331081
-	has_version '>=dev-lang/ocaml-3.12' && sed -i 's/lstr/lcamlstr/' Makefile.in
-	# For make install
-	use ocamlopt || sed -i 's/= opt /= noopt /' Makefile.in
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	if use ocamlopt ; then
-		emake opt || die
-	else
-		emake byte || die
-	fi
-	if use doc; then
-		emake doc || die "failed to create doc"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-	dodoc README CHANGES
-	if use doc; then
-		dodoc manual.pdf
-		dohtml manual.html
-	fi
-}
diff --git a/dev-util/aruba/aruba-0.4.11.ebuild b/dev-util/aruba/aruba-0.4.11.ebuild
index 1f5eed7bee6b..9f4505201d7e 100644
--- a/dev-util/aruba/aruba-0.4.11.ebuild
+++ b/dev-util/aruba/aruba-0.4.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-util/aruba/aruba-0.4.11.ebuild,v 1.2 2012/01/29 10:29:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.4.11.ebuild,v 1.3 2012/06/12 11:47:54 iksaif Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Cucumber steps for driving out command line applications."
-HOMEPAGE="https://github.com/aslakhellesoy/aruba"
+HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-rails/cucumber-rails-0.3.2-r1.ebuild b/dev-util/cucumber-rails/cucumber-rails-0.3.2-r1.ebuild
index 30db7295e7c9..2207666e060e 100644
--- a/dev-util/cucumber-rails/cucumber-rails-0.3.2-r1.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-0.3.2-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-util/cucumber-rails/cucumber-rails-0.3.2-r1.ebuild,v 1.2 2011/01/10 18:29:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/cucumber-rails-0.3.2-r1.ebuild,v 1.3 2012/06/12 11:49:01 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTRADOC="HACKING.rdoc History.txt README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 ~x86 ~x86-macos"
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.0.6.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.0.6.ebuild
index 0f2fcefe8a5f..ed141a8ba9f5 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.0.6.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.0.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-util/cucumber-rails/cucumber-rails-1.0.6.ebuild,v 1.1 2011/10/04 05:31:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/cucumber-rails-1.0.6.ebuild,v 1.2 2012/06/12 11:49:01 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild
index c0437a8613d6..b951c580f468 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-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-util/cucumber-rails/cucumber-rails-1.2.1.ebuild,v 1.2 2012/01/29 10:41:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild,v 1.3 2012/06/12 11:49:01 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18"
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-0.10.2.ebuild b/dev-util/cucumber/cucumber-0.10.2.ebuild
index 8505dadcc402..c6ba07cc368b 100644
--- a/dev-util/cucumber/cucumber-0.10.2.ebuild
+++ b/dev-util/cucumber/cucumber-0.10.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/dev-util/cucumber/cucumber-0.10.2.ebuild,v 1.1 2011/04/12 20:25:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-0.10.2.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-0.10.3.ebuild b/dev-util/cucumber/cucumber-0.10.3.ebuild
index c4b9ba99425c..3e94573edc49 100644
--- a/dev-util/cucumber/cucumber-0.10.3.ebuild
+++ b/dev-util/cucumber/cucumber-0.10.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-util/cucumber/cucumber-0.10.3.ebuild,v 1.1 2011/05/29 07:04:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-0.10.3.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-0.7.3-r1.ebuild b/dev-util/cucumber/cucumber-0.7.3-r1.ebuild
index a24caf20c360..90984f7399cc 100644
--- a/dev-util/cucumber/cucumber-0.7.3-r1.ebuild
+++ b/dev-util/cucumber/cucumber-0.7.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/dev-util/cucumber/cucumber-0.7.3-r1.ebuild,v 1.7 2011/12/31 19:14:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-0.7.3-r1.ebuild,v 1.8 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=3
 USE_RUBY="ruby18 ree18"
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-util/cucumber/cucumber-1.0.0.ebuild b/dev-util/cucumber/cucumber-1.0.0.ebuild
index 57fd87a86abb..6d06886ff1ad 100644
--- a/dev-util/cucumber/cucumber-1.0.0.ebuild
+++ b/dev-util/cucumber/cucumber-1.0.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-util/cucumber/cucumber-1.0.0.ebuild,v 1.1 2011/07/08 18:46:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.0.0.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-1.0.1.ebuild b/dev-util/cucumber/cucumber-1.0.1.ebuild
index 0c941c1dbee9..e6267220abc3 100644
--- a/dev-util/cucumber/cucumber-1.0.1.ebuild
+++ b/dev-util/cucumber/cucumber-1.0.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-util/cucumber/cucumber-1.0.1.ebuild,v 1.1 2011/07/10 16:40:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.0.1.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-1.0.2.ebuild b/dev-util/cucumber/cucumber-1.0.2.ebuild
index 7c765bcf1e92..67b281080ea4 100644
--- a/dev-util/cucumber/cucumber-1.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-1.0.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/dev-util/cucumber/cucumber-1.0.2.ebuild,v 1.1 2011/08/08 06:08:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.0.2.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-1.0.6.ebuild b/dev-util/cucumber/cucumber-1.0.6.ebuild
index d7d8192e9052..f937feb94bd4 100644
--- a/dev-util/cucumber/cucumber-1.0.6.ebuild
+++ b/dev-util/cucumber/cucumber-1.0.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-util/cucumber/cucumber-1.0.6.ebuild,v 1.1 2011/09/30 06:21:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.0.6.ebuild,v 1.2 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber/cucumber-1.1.4.ebuild b/dev-util/cucumber/cucumber-1.1.4.ebuild
index 03ba4cf253f3..0ddd0fc19e2e 100644
--- a/dev-util/cucumber/cucumber-1.1.4.ebuild
+++ b/dev-util/cucumber/cucumber-1.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/dev-util/cucumber/cucumber-1.1.4.ebuild,v 1.3 2012/04/27 07:40:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.1.4.ebuild,v 1.4 2012/06/12 11:51:05 iksaif Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18"
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/pkgconf/pkgconf-0.8.ebuild b/dev-util/pkgconf/pkgconf-0.8.ebuild
index a665e8c56899..1531b7cbf7f6 100644
--- a/dev-util/pkgconf/pkgconf-0.8.ebuild
+++ b/dev-util/pkgconf/pkgconf-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-util/pkgconf/pkgconf-0.8.ebuild,v 1.7 2012/06/12 09:17:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.8.ebuild,v 1.8 2012/06/12 17:45:12 jdhore Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ else
 	inherit eutils
 	#SRC_URI="https://github.com/nenolod/pkgconf/tarball/${P} -> ${P}.tar.gz"
 	SRC_URI="http://tortois.es/~nenolod/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/games-sports/xmoto/files/xmoto-0.5.9-gcc47.patch b/games-sports/xmoto/files/xmoto-0.5.9-gcc47.patch
new file mode 100644
index 000000000000..eb0843ef35ba
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.9-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/helpers/System.cpp.old	2012-06-12 11:01:24.332083600 +0200
++++ src/helpers/System.cpp	2012-06-12 11:01:35.335083715 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+ 
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/games-sports/xmoto/xmoto-0.5.9.ebuild b/games-sports/xmoto/xmoto-0.5.9.ebuild
index 2403eb324f29..9cd22101d7ba 100644
--- a/games-sports/xmoto/xmoto-0.5.9.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.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/games-sports/xmoto/xmoto-0.5.9.ebuild,v 1.4 2012/04/22 14:42:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.9.ebuild,v 1.5 2012/06/12 18:15:12 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -48,7 +48,8 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${P}-libpng.patch \
-		"${FILESDIR}"/${P}-utf8.patch
+		"${FILESDIR}"/${P}-utf8.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
index aab28c6a7b66..f217557c7a23 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.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/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.3 2012/06/02 12:55:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.4 2012/06/12 11:34:12 johu Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/mail-mta/nullmailer/files/nullmailer-1.10-fix-sendmail.patch b/mail-mta/nullmailer/files/nullmailer-1.10-fix-sendmail.patch
new file mode 100644
index 000000000000..98669a64c777
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-1.10-fix-sendmail.patch
@@ -0,0 +1,100 @@
+diff --git a/lib/cli++/main.cc b/lib/cli++/main.cc
+index f0eb014..406e990 100644
+--- a/lib/cli++/main.cc
++++ b/lib/cli++/main.cc
+@@ -36,6 +36,7 @@ static cli_option help_option = { 'h', "help", cli_option::flag,
+ 
+ static cli_option** options;
+ static unsigned optionc;
++static const char* short_options;
+ 
+ static void build_options()
+ {
+@@ -47,6 +48,13 @@ static void build_options()
+   for(unsigned i = 0; i < optionc-1; i++)
+     options[i] = &cli_options[i];
+   options[optionc-1] = &help_option;
++
++  char* so;
++  short_options = so = new char[optionc+1];
++  for (unsigned i = 0; i < optionc; i++)
++    if (options[i]->ch != 0)
++      *so++ = options[i]->ch;
++  *so = 0;
+ }
+ 
+ static inline int max(int a, int b)
+@@ -275,14 +283,6 @@ static int parse_long(int, char* argv[])
+     ++arg;
+   for(unsigned j = 0; j < optionc; j++) {
+     cli_option* o = options[j];
+-    if (cli_only_long && o->ch) {
+-      if (arg[0] == o->ch) {
+-	if (arg[1] == '\0')
+-	  return o->parse_long_noeq(argv[1], true);
+-	else if (arg[1] == '=')
+-	  return o->parse_long_eq(arg+2, true);
+-      }
+-    }
+     if(o->name) {
+       size_t len = strlen(o->name);
+       if(!memcmp(arg, o->name, len)) {
+@@ -297,6 +297,13 @@ static int parse_long(int, char* argv[])
+   return -1;
+ }
+ 
++static int parse_either(int argc, char* argv[])
++{
++  return (strchr(short_options, argv[0][1]) != 0)
++    ? parse_short(argc, argv)
++    : parse_long(argc, argv);
++}
++
+ static int parse_args(int argc, char* argv[])
+ {
+   build_options();
+@@ -312,9 +319,9 @@ static int parse_args(int argc, char* argv[])
+       i++;
+       break;
+     }
+-    int j = (!cli_only_long && arg[1] != '-')
+-      ? parse_short(argc-i, argv+i)
+-      : parse_long(argc-i, argv+i);
++    int j = (arg[1] == '-') ? parse_long(argc-i, argv+i)
++      : cli_only_long ? parse_either(argc-i, argv+i)
++      : parse_short(argc-i, argv+i);
+     if(j < 0)
+       usage(1);
+     else
+diff --git a/src/sendmail.cc b/src/sendmail.cc
+index f245226..2e5615b 100644
+--- a/src/sendmail.cc
++++ b/src/sendmail.cc
+@@ -66,26 +66,13 @@ cli_option cli_options[] = {
+   { 'N', 0,    cli_option::string, 0, &o_dummys, "Ignored", 0 },
+   { 'n', 0,    cli_option::flag, 0, &o_dummyi, "Ignored", 0 },
+   { 'O', 0,    cli_option::string, 0, &o_dummys, "Ignored", 0 },
+-  {  0, "odb", cli_option::flag, 0, &o_dummyi,
+-     "Deliver in background (always true)", 0 },
+-  {  0, "odf", cli_option::flag, 0, &o_dummyi,
+-     "Deliver in foreground (ignored)", 0 },
+-  {  0, "oem", cli_option::flag, 0, &o_dummyi,
+-     "Ignored", 0 },
++  { 'o', 0,    cli_option::string, 0, &o_dummys, "Set sendmail flag, ignored", 0 },
+   {  0, "em",  cli_option::flag, 0, &o_dummyi,
+      "Ignored", 0 },
+-  {  0, "oep", cli_option::flag, 0, &o_dummyi,
+-     "Ignored", 0 },
+   {  0, "ep",  cli_option::flag, 0, &o_dummyi,
+      "Ignored", 0 },
+-  {  0, "oeq", cli_option::flag, 0, &o_dummyi,
+-     "Ignored", 0 },
+   {  0, "eq",  cli_option::flag, 0, &o_dummyi,
+      "Ignored", 0 },
+-  {  0, "oi",  cli_option::flag, 0, &o_dummyi,
+-     "Ignored", 0 },
+-  {  0, "om",  cli_option::flag, 0, &o_dummyi,
+-     "Ignored", 0 },
+   { 'p', 0,    cli_option::string, 0, &o_dummys, "Ignored", 0 },
+   { 'q', 0,    cli_option::string, 0, &o_dummys, "Ignored", 0 },
+   { 'R', 0,    cli_option::string, 0, &o_dummys, "Ignored", 0 },
diff --git a/mail-mta/nullmailer/nullmailer-1.10-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.10-r1.ebuild
new file mode 100644
index 000000000000..a32746b8ce6b
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.10-r1.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/mail-mta/nullmailer/nullmailer-1.10-r1.ebuild,v 1.1 2012/06/12 21:26:19 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic autotools user multilib
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV=1.10
+DEBIAN_PR="1"
+DEBIAN_P="${PN}-${DEBIAN_PV}"
+DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}"
+DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/archive/${MY_P}.tar.gz
+		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="ssl"
+
+DEPEND="sys-apps/groff
+	ssl? ( net-libs/gnutls )"
+RDEPEND="virtual/shadow
+	virtual/logger
+	ssl? ( net-libs/gnutls )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
+
+src_prepare() {
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch "${DISTDIR}"/${DEBIAN_SRC}
+	# why revert?  Ask Robin when he is back!
+	EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \
+	epatch "${WORKDIR}"/debian/patches/02_ipv6.diff
+	# this fixes the debian daemon/syslog to actually compile
+	sed -i.orig \
+		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
+		"${S}"/src/Makefile.am || die "Sed failed"
+	# bug #420301
+	epatch "${FILESDIR}"/"${P}"-fix-sendmail.patch
+	eautoreconf
+}
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
+src_configure() {
+	# Note that we pass a different directory below due to bugs in the makefile!
+	econf \
+		--localstatedir=/var \
+		$(use_enable ssl tls)
+}
+
+src_install () {
+	einstall localstatedir="${D}"/var/nullmailer
+	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-1.04 remotes
+	# daemontools stuff
+	dodir /var/nullmailer/service{,/log}
+	insinto /var/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/nullmailer/service/run
+	insinto /var/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/nullmailer/service/log/run
+	# usablity
+	dodir /usr/$(get_libdir)
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
+	fperms 660 /var/nullmailer/trigger
+	newinitd "${FILESDIR}"/init.d-nullmailer-r1 nullmailer
+}
+
+pkg_postinst() {
+	[ ! -e "${ROOT}"/var/nullmailer/trigger ] && mkfifo "${ROOT}"/var/nullmailer/trigger
+	chown nullmail:nullmail "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger}
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue}
+	chmod 660 "${ROOT}"/var/nullmailer/trigger
+
+	elog "To create an initial setup, please do:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	echo
+	elog "To start nullmailer at boot you may use either the nullmailer init.d"
+	elog "script, or emerge sys-process/supervise-scripts, enable the"
+	elog "svscan init.d script and create the following link:"
+	elog "ln -fs /var/nullmailer/service /service/nullmailer"
+	echo
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index eeb43da809a2..4b01b1dc99ba 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.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/cal3d/cal3d-0.11.0-r1.ebuild,v 1.10 2012/06/09 20:52:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cal3d/cal3d-0.11.0-r1.ebuild,v 1.11 2012/06/13 04:45:51 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils base autotools
@@ -20,13 +20,11 @@ DEPEND="doc? (
 	)"
 RDEPEND=""
 
-pkg_setup() {
+src_prepare() {
 	DOCS=( AUTHORS ChangeLog README TODO )
 	use doc && HTML_DOCS=( docs/html/api docs/html/guide )
 	PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
-}
 
-src_prepare() {
 	base_src_prepare
 	if use doc; then
 		sed -i \
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 4b64f7639f4c..207d62913ed9 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,2 +1,3 @@
 DIST jasper-1.900.1-fixes-20081208.patch.bz2 8757 RMD160 bbd45e5aeb32b2575807824986dc2c39a14a46f0 SHA1 31517a7ebc9ce4d0d12a4b7c26133451979ae945 SHA256 5f696527707513fceff1617895afab9500f327262b1b03b330098d8dab3eb1bf
+DIST jasper-1.900.1-fixes-20120611.patch.bz2 26303 RMD160 aa6f02550b164e4572a2b9cadd86d4857d1732b6 SHA1 43c1ff13dad0baa407bbc9c867a81b33242bdce7 SHA256 8727c94843f141c311be54eed97eca18f96542f52b991df6f7d4f005bad2ec59
 DIST jasper-1.900.1.zip 1415752 RMD160 fb2c188abf5b8c297078ac1f913101734f72db5c SHA1 9c5735f773922e580bf98c7c7dfda9bbed4c5191 SHA256 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
diff --git a/media-libs/jasper/jasper-1.900.1-r5.ebuild b/media-libs/jasper/jasper-1.900.1-r5.ebuild
new file mode 100644
index 000000000000..ca80f4ff97aa
--- /dev/null
+++ b/media-libs/jasper/jasper-1.900.1-r5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.1 2012/06/12 19:02:49 phosphan Exp $
+
+EAPI=3
+
+inherit libtool eutils
+
+DESCRIPTION="software-based implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
+SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip
+	mirror://gentoo/${P}-fixes-20120611.patch.bz2"
+
+LICENSE="JasPer2.0"
+SLOT="0"
+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 )
+	opengl? ( virtual/opengl media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-fixes-20120611.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable opengl) \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS README doc/*
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
index d7f885c35a20..d7eced3184ae 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.17 2012/06/10 06:29:15 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild,v 1.18 2012/06/12 21:42:27 darkside 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( >=media-libs/libpng-1.2:0 )"
diff --git a/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild b/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
index 879e1db71a5d..30c839137741 100644
--- a/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
+++ b/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild
@@ -1,10 +1,10 @@
-# 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-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild,v 1.2 2011/01/17 21:33:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/vdr-powermate-0.0.5.ebuild,v 1.3 2012/06/12 19:38:38 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 DESCRIPTION="Video Disk Recorder - Powermate PlugIn"
 HOMEPAGE="http://home.arcor.de/andreas.regel/vdr_plugins.htm"
diff --git a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0-r1.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..e7aa6bb782d9
--- /dev/null
+++ b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0-r1.ebuild,v 1.1 2012/06/12 19:31:11 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Support the extended EPG which is sent by german paytv Sky on their portal channels"
+HOMEPAGE="http://www.muempf.de/index.html"
+SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.4.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include premiereepg.c
+}
diff --git a/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild b/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..ad4faebcaf4a
--- /dev/null
+++ b/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-proxy/vdr-proxy-0.1.4-r1.ebuild,v 1.1 2012/06/12 19:26:34 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2
+
+IUSE=""
+SLOT="0"
+
+DESCRIPTION="VDR Plugin Proxy - enable grouping of menu entries, online load/unload"
+HOMEPAGE="http://urichter.cjb.net/vdr/?h=proxy"
+SRC_URI="http://www.mathematik.uni-kassel.de/~urichter/vdr/files/${P}.tgz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86"
+
+DEPEND=">=media-video/vdr-1.3.23"
diff --git a/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild b/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild
index 1588f70e9e60..076ccfd98edd 100644
--- a/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild
+++ b/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild
@@ -1,8 +1,10 @@
-# 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/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild,v 1.2 2006/05/31 21:57:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinclassic/vdr-skinclassic-0.0.2.ebuild,v 1.3 2012/06/12 19:08:39 hd_brummy Exp $
 
-inherit vdr-plugin
+EAPI="4"
+
+inherit vdr-plugin-2
 
 IUSE=""
 SLOT="0"
diff --git a/media-plugins/vdr-skinelchi/Manifest b/media-plugins/vdr-skinelchi/Manifest
index dc081a83d482..2d91802d2cbd 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -2,3 +2,4 @@ DIST vdr-skinelchi-0.1.1_pre2-vdr-1.5.5-getfont.diff.bz2 3568 RMD160 877cbdbd0cc
 DIST vdr-skinelchi-0.1.1pre2.tgz 61489 RMD160 fd28310c2b2e03b58c818b72934d66443127e8f5 SHA1 80ce3b2e00e1c03f1ce674924c98290b2385c9d3 SHA256 8a1a79bde62ad26618a8d9cab19b41b1e65443c1ffa3d919f4a899d1557918b2
 DIST vdr-skinelchi-0.2.1.tar.bz2 61194 RMD160 89b7ba0dfcb79632818b03ad817adb17c849d72c SHA1 ccdb458b234d5dc9b4cd3096b1f1d4256e0fa360 SHA256 8b5f3ef1013e56b37981333965cb03d44f5442297912e993963ece8f50234b95
 DIST vdr-skinelchi-0.2.6.tar.bz2 75521 RMD160 01e00f41dab954b574e99a62e5013a4697aff356 SHA1 a4093bc8890ad653456a1e453f8a3ae401d69de8 SHA256 c14d56a428d7f36201c387c034d0698e0edc130f285902226c7afd1ede39e889
+DIST vdr-skinelchi-0.2.7.tar.bz2 77029 RMD160 d0ebc0a5aff403d9c8dc015e3452df3ca5de4302 SHA1 b0f28a61ddc21b29d97a699f7de2e72b14fdf3c1 SHA256 e6db362b814ee8f5c07fed00f766c3270fadf7448d7f57c10d54539cf79633ac
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild
new file mode 100644
index 000000000000..e51e29bdf63c
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild,v 1.1 2012/06/12 19:00:21 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="Video Disk Recorder - Skin Plugin"
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi"
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=">=media-video/vdr-1.6
+		imagemagick? ( media-gfx/imagemagick )"
+
+RDEPEND="x11-themes/vdr-channel-logos"
+
+S=${WORKDIR}/${MY_P#vdr-}
+
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if ! use imagemagick; then
+		einfo "Disabling imagemagick-support."
+		sed -i "${S}"/Makefile \
+			-e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
+	fi
+
+	sed -i "${S}"/DisplayChannel.c \
+		-e "s:/hqlogos::" \
+		-e "s:/logos::"
+}
diff --git a/media-video/mkclean/mkclean-0.8.6-r1.ebuild b/media-video/mkclean/mkclean-0.8.6-r1.ebuild
index e8767d35c12b..09fe3a743e59 100644
--- a/media-video/mkclean/mkclean-0.8.6-r1.ebuild
+++ b/media-video/mkclean/mkclean-0.8.6-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-video/mkclean/mkclean-0.8.6-r1.ebuild,v 1.1 2012/01/27 23:36:08 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkclean/mkclean-0.8.6-r1.ebuild,v 1.2 2012/06/12 21:36:55 sbriesen Exp $
 
 EAPI=4
 
@@ -28,9 +28,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f GNUmakefile
-	emake -C mkclean -f mkWDclean.mak
-	emake -C mkclean/regression -f mkcleanreg.mak
+	emake -f GNUmakefile -j1
+	emake -C mkclean -f mkWDclean.mak -j1
+	emake -C mkclean/regression -f mkcleanreg.mak -j1
 }
 
 src_install() {
diff --git a/media-video/mkclean/mkclean-0.8.6.ebuild b/media-video/mkclean/mkclean-0.8.6.ebuild
deleted file mode 100644
index 248111836173..000000000000
--- a/media-video/mkclean/mkclean-0.8.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkclean/mkclean-0.8.6.ebuild,v 1.1 2011/12/05 22:28:30 sbriesen Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="mkclean is a command line tool to clean and optimize Matroska files"
-HOMEPAGE="http://www.matroska.org/downloads/mkclean.html"
-SRC_URI="http://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	./configure  # non-standard configure
-
-	# fixing generated makefiles
-	sed -i -e 's|^\(LFLAGS.*+=.*\$(LIBS)\)|\1 \$(LDFLAGS)|g' \
-		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak")
-}
-
-src_install() {
-	dobin release/*/${PN}
-	newdoc ChangeLog.txt ChangeLog
-	newdoc ReadMe.txt README
-}
diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index 114ca7361582..3d36f8b81c8e 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1 +1,2 @@
 DIST mkvalidator-0.3.7.tar.bz2 579174 RMD160 5f74f0f09db124fa74657f224f200f825ca721dd SHA1 4dada51d23255dffb4176450b410d6326a72d845 SHA256 236247098052022757243a3c7ae5939b4ca34e07c573e3344346c4ca66c66ba1
+DIST mkvalidator-0.4.0.tar.bz2 579322 RMD160 9e55ecd97f13b5ad7885ec1e301beec3b8e70f92 SHA1 c1e9fc8de67694f7a3dcb9beb25488db513f8f6f SHA256 68457cb1a11b0beffc9395690a38754bfceefb6a210cc4039f689e0e70aea520
diff --git a/media-video/mkvalidator/mkvalidator-0.3.7.ebuild b/media-video/mkvalidator/mkvalidator-0.4.0.ebuild
similarity index 83%
rename from media-video/mkvalidator/mkvalidator-0.3.7.ebuild
rename to media-video/mkvalidator/mkvalidator-0.4.0.ebuild
index 36eb97d0acfc..4f3ec31c51f8 100644
--- a/media-video/mkvalidator/mkvalidator-0.3.7.ebuild
+++ b/media-video/mkvalidator/mkvalidator-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvalidator/mkvalidator-0.3.7.ebuild,v 1.1 2011/12/05 22:30:24 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvalidator/mkvalidator-0.4.0.ebuild,v 1.1 2012/06/12 21:41:27 sbriesen Exp $
 
 EAPI=4
 
@@ -27,8 +27,12 @@ src_configure() {
 		-e 's|^\(STRIP.*=\)|\1 echo|g' $(find -name "*.mak")
 }
 
+src_compile() {
+    emake -j1
+}
+
 src_install() {
-	dobin release/*/${PN}
+	dobin release/*/mkv*
 	newdoc ChangeLog.txt ChangeLog
 	newdoc ReadMe.txt README
 }
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index b3d01b2c0531..d0c63cb45aa1 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-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/media-video/mplayer2/mplayer2-9999.ebuild,v 1.37 2012/06/12 09:05:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.38 2012/06/12 13:11:33 scarabeus Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ IUSE="+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio
 	xanim xinerama +xscreensaver +xv xvid"
 IUSE+=" symlink"
 
-CPU_FEATURES="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
 for x in ${CPU_FEATURES}; do
 	IUSE+=" ${x}"
 done
@@ -417,7 +417,7 @@ src_configure() {
 	use cpudetection && myconf+=" --enable-runtime-cpudetection"
 
 	for i in ${CPU_FEATURES}; do
-		myconf+=" $(use_enable ${i})"
+		myconf+=" $(use_enable ${i/+/})"
 	done
 
 	use debug && myconf+=" --enable-debug=3"
diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild
index dd6b22d87d79..3f878afe0a3a 100644
--- a/media-video/vlc/vlc-2.0.1.ebuild
+++ b/media-video/vlc/vlc-2.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/media-video/vlc/vlc-2.0.1.ebuild,v 1.12 2012/06/09 15:38:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.14 2012/06/12 18:30:09 aballier Exp $
 
 EAPI="4"
 
@@ -122,7 +122,7 @@ RDEPEND="
 			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
 		shout? ( media-libs/libshout )
 		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm )
+		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
 		speex? ( media-libs/speex )
 		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
@@ -326,6 +326,7 @@ src_configure() {
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-optimizations \
 		--without-tuning \
+		--disable-maintainer-mode \
 		--enable-fast-install
 }
 
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 353a8b330c0d..309fa3d0956e 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.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/media-video/vlc/vlc-2.0.9999.ebuild,v 1.12 2012/05/29 16:05:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.13 2012/06/12 18:30:09 aballier Exp $
 
 EAPI="4"
 
@@ -122,7 +122,7 @@ RDEPEND="
 			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
 		shout? ( media-libs/libshout )
 		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm )
+		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
 		speex? ( media-libs/speex )
 		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a2033bd46180..19fd8ea5269a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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/media-video/vlc/vlc-9999.ebuild,v 1.175 2012/06/02 15:55:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.176 2012/06/12 18:30:09 aballier Exp $
 
 EAPI="4"
 
@@ -121,7 +121,7 @@ RDEPEND="
 			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
 		shout? ( media-libs/libshout )
 		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm )
+		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
 		speex? ( media-libs/speex )
 		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
diff --git a/metadata/cache/app-arch/dpkg-1.16.4.2 b/metadata/cache/app-arch/dpkg-1.16.4.2-r1
similarity index 100%
rename from metadata/cache/app-arch/dpkg-1.16.4.2
rename to metadata/cache/app-arch/dpkg-1.16.4.2-r1
diff --git a/metadata/cache/app-doc/elisp-manual-23.4 b/metadata/cache/app-doc/elisp-manual-23.4
index 570ecda46097..e02e13557a56 100644
--- a/metadata/cache/app-doc/elisp-manual-23.4
+++ b/metadata/cache/app-doc/elisp-manual-23.4
@@ -6,7 +6,7 @@ mirror://gentoo/elisp-manual-23.4.tar.xz
 http://www.gnu.org/software/emacs/manual/
 FDL-1.3
 The GNU Emacs Lisp Reference Manual
-amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+amd64 ~ppc ~sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-misc/scrub-2.5.1 b/metadata/cache/app-misc/scrub-2.5.1
new file mode 100644
index 000000000000..afec01c185ed
--- /dev/null
+++ b/metadata/cache/app-misc/scrub-2.5.1
@@ -0,0 +1,22 @@
+
+
+0
+http://diskscrub.googlecode.com/files/scrub-2.5.1.tar.gz
+
+http://code.google.com/p/diskscrub/
+GPL-2
+write patterns on disk/file
+~amd64 ~sparc ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/app-shells/autojump-14 b/metadata/cache/app-shells/autojump-14
deleted file mode 100644
index 372940f52a7d..000000000000
--- a/metadata/cache/app-shells/autojump-14
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/python
-gtk? ( dev-python/pygtk:2 ) bash-completion? ( >=app-shells/bash-4 ) zsh-completion? ( app-shells/zsh app-shells/zsh-completion ) dev-lang/python
-0
-mirror://gentoo/autojump_v14.tar.gz
-
-http://github.com/joelthelion/autojump
-GPL-3
-change directory command that learns
-~amd64 ~x86
-multilib python toolchain-funcs
-bash-completion gtk zsh-completion
-
-
-
-3
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-shells/autojump-20.9 b/metadata/cache/app-shells/autojump-20.9
index 28eadd2d39eb..f02ff27f1778 100644
--- a/metadata/cache/app-shells/autojump-20.9
+++ b/metadata/cache/app-shells/autojump-20.9
@@ -7,7 +7,7 @@ http://github.com/joelthelion/autojump
 GPL-3
 change directory command that learns
 ~amd64 ~x86
-multilib python toolchain-funcs
+multilib python toolchain-funcs vcs-snapshot
 bash-completion gtk python test zsh-completion
 
 
diff --git a/metadata/cache/dev-cpp/gmock-1.6.0 b/metadata/cache/dev-cpp/gmock-1.6.0
index 05a0066cd620..bf3bd50a9034 100644
--- a/metadata/cache/dev-cpp/gmock-1.6.0
+++ b/metadata/cache/dev-cpp/gmock-1.6.0
@@ -1,4 +1,4 @@
-=dev-cpp/gtest-1.6.0*
+app-arch/unzip =dev-cpp/gtest-1.6.0*
 =dev-cpp/gtest-1.6.0*
 0
 http://googlemock.googlecode.com/files/gmock-1.6.0.zip
@@ -6,7 +6,7 @@ http://googlemock.googlecode.com/files/gmock-1.6.0.zip
 http://code.google.com/p/googlemock/
 BSD
 Google's C++ mocking framework
-~amd64 ~arm ~x86
+amd64 ~arm x86
 libtool multilib toolchain-funcs
 static-libs
 
diff --git a/metadata/cache/dev-cpp/gtest-1.6.0 b/metadata/cache/dev-cpp/gtest-1.6.0
index 6c650d76e7d3..a645a2236c87 100644
--- a/metadata/cache/dev-cpp/gtest-1.6.0
+++ b/metadata/cache/dev-cpp/gtest-1.6.0
@@ -6,7 +6,7 @@ http://googletest.googlecode.com/files/gtest-1.6.0.zip
 http://code.google.com/p/googletest/
 BSD
 Google C++ Testing Framework
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 libtool multilib python toolchain-funcs
 examples threads static-libs
 
diff --git a/metadata/cache/dev-db/sqlite-3.7.12.1 b/metadata/cache/dev-db/sqlite-3.7.12.1
index d67d1ed2233f..c3c004366a0a 100644
--- a/metadata/cache/dev-db/sqlite-3.7.12.1
+++ b/metadata/cache/dev-db/sqlite-3.7.12.1
@@ -6,7 +6,7 @@ doc? ( http://sqlite.org/sqlite-doc-3071201.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 ~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
+~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 multiprocessing toolchain-funcs user versionator
 debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify
 
diff --git a/metadata/cache/dev-db/sqlite-3.7.13 b/metadata/cache/dev-db/sqlite-3.7.13
new file mode 100644
index 000000000000..c1eeb0caef2c
--- /dev/null
+++ b/metadata/cache/dev-db/sqlite-3.7.13
@@ -0,0 +1,22 @@
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
+3
+doc? ( http://sqlite.org/sqlite-doc-3071300.zip ) tcl? ( http://sqlite.org/sqlite-src-3071300.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071300.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071300.tar.gz ) )
+
+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 ~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 multiprocessing toolchain-funcs user versionator
+debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify
+
+
+
+4
+
+compile configure install prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-games/ogre-1.8.0 b/metadata/cache/dev-games/ogre-1.8.0
new file mode 100644
index 000000000000..a02b29873d68
--- /dev/null
+++ b/metadata/cache/dev-games/ogre-1.8.0
@@ -0,0 +1,22 @@
+media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib ) x11-proto/xf86vidmodeproto virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib )
+0
+mirror://sourceforge/ogre/ogre_src_v1-8-0.tar.bz2
+test
+http://www.ogre3d.org/
+MIT
+Object-oriented Graphics Rendering Engine
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
++boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb test threads tools +zip
+threads? ( || ( boost poco tbb ) )
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/maven-bin-1.0.2-r2 b/metadata/cache/dev-java/maven-bin-1.0.2-r2
deleted file mode 100644
index fda2a599429a..000000000000
--- a/metadata/cache/dev-java/maven-bin-1.0.2-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-admin/eselect-maven
->=virtual/jdk-1.5 app-admin/eselect-maven
-1.0
-mirror://apache/maven/binaries/maven-1.0.2.tar.gz
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-
-
-
-
-
-4
-
-install postinst postrm
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-1.1-r2 b/metadata/cache/dev-java/maven-bin-1.1-r3
similarity index 60%
rename from metadata/cache/dev-java/maven-bin-1.1-r2
rename to metadata/cache/dev-java/maven-bin-1.1-r3
index 906aa12ae668..5f323e76c618 100644
--- a/metadata/cache/dev-java/maven-bin-1.1-r2
+++ b/metadata/cache/dev-java/maven-bin-1.1-r3
@@ -1,5 +1,5 @@
-app-admin/eselect-maven
->=virtual/jdk-1.5 app-admin/eselect-maven
+|| ( app-admin/eselect-java app-admin/eselect-maven )
+>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven )
 1.1
 mirror://apache/maven/binaries/maven-1.1.tar.gz
 
diff --git a/metadata/cache/dev-java/maven-bin-2.0.10 b/metadata/cache/dev-java/maven-bin-2.0.10
deleted file mode 100644
index 1475ccc8c614..000000000000
--- a/metadata/cache/dev-java/maven-bin-2.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
-2.0
-mirror://apache/maven/binaries/apache-maven-2.0.10-bin.tar.bz2
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-amd64 ppc x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-2.0.11-r1 b/metadata/cache/dev-java/maven-bin-2.0.11-r2
similarity index 63%
rename from metadata/cache/dev-java/maven-bin-2.0.11-r1
rename to metadata/cache/dev-java/maven-bin-2.0.11-r2
index bb721a442403..73df0b2a9736 100644
--- a/metadata/cache/dev-java/maven-bin-2.0.11-r1
+++ b/metadata/cache/dev-java/maven-bin-2.0.11-r2
@@ -1,5 +1,5 @@
-app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.4 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 2.0
 mirror://apache/maven/binaries/apache-maven-2.0.11-bin.tar.bz2
 
diff --git a/metadata/cache/dev-java/maven-bin-2.1.0 b/metadata/cache/dev-java/maven-bin-2.1.0
deleted file mode 100644
index e44aa6e38429..000000000000
--- a/metadata/cache/dev-java/maven-bin-2.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-2.1
-mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-amd64 ppc x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-2.1.0-r1 b/metadata/cache/dev-java/maven-bin-2.1.0-r1
deleted file mode 100644
index 07421c3976d4..000000000000
--- a/metadata/cache/dev-java/maven-bin-2.1.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-2.1
-mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-2.2.1-r1 b/metadata/cache/dev-java/maven-bin-2.2.1-r2
similarity index 52%
rename from metadata/cache/dev-java/maven-bin-2.2.1-r1
rename to metadata/cache/dev-java/maven-bin-2.2.1-r2
index 5fa1813ad627..c2918ab95b8a 100644
--- a/metadata/cache/dev-java/maven-bin-2.2.1-r1
+++ b/metadata/cache/dev-java/maven-bin-2.2.1-r2
@@ -1,5 +1,5 @@
-app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 2.2
 mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2
 
@@ -14,7 +14,7 @@ elibc_FreeBSD
 
 4
 
-compile install postinst postrm preinst prepare setup unpack
+compile install postinst postrm preinst prepare setup
 
 
 
diff --git a/metadata/cache/dev-java/maven-bin-3.0 b/metadata/cache/dev-java/maven-bin-3.0
deleted file mode 100644
index 3a21fc1bce55..000000000000
--- a/metadata/cache/dev-java/maven-bin-3.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-3.0
-mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-3.0.2 b/metadata/cache/dev-java/maven-bin-3.0.2
deleted file mode 100644
index 36e050f147fd..000000000000
--- a/metadata/cache/dev-java/maven-bin-3.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-3.0
-mirror://apache/maven/binaries/apache-maven-3.0.2-bin.tar.gz
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-3.0.3 b/metadata/cache/dev-java/maven-bin-3.0.3
deleted file mode 100644
index 5116b8631ac0..000000000000
--- a/metadata/cache/dev-java/maven-bin-3.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-3.0
-mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-3.0.3-r1 b/metadata/cache/dev-java/maven-bin-3.0.3-r1
deleted file mode 100644
index 81646aa4c0d0..000000000000
--- a/metadata/cache/dev-java/maven-bin-3.0.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-3.0
-mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-
-http://maven.apache.org/
-Apache-2.0
-Project Management and Comprehension Tool for Java
-~amd64 ~ppc ~x86
-eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-elibc_FreeBSD
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/maven-bin-3.0.4 b/metadata/cache/dev-java/maven-bin-3.0.4-r1
similarity index 52%
rename from metadata/cache/dev-java/maven-bin-3.0.4
rename to metadata/cache/dev-java/maven-bin-3.0.4-r1
index 159ad12153ef..b3eaae9d615c 100644
--- a/metadata/cache/dev-java/maven-bin-3.0.4
+++ b/metadata/cache/dev-java/maven-bin-3.0.4-r1
@@ -1,5 +1,5 @@
-app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
->=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 3.0
 mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz
 
@@ -14,7 +14,7 @@ elibc_FreeBSD
 
 4
 
-compile install postinst postrm preinst prepare setup unpack
+compile install postinst postrm preinst prepare setup
 
 
 
diff --git a/metadata/cache/dev-java/proxool-0.8.3-r2 b/metadata/cache/dev-java/proxool-0.8.3-r2
index dbcd9f454f2c..8f33f347ea9d 100644
--- a/metadata/cache/dev-java/proxool-0.8.3-r2
+++ b/metadata/cache/dev-java/proxool-0.8.3-r2
@@ -6,7 +6,7 @@ test
 http://proxool.sourceforge.net/
 LGPL-2
 Proxool is a Java connection pool.
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-lang/go-1.0.1 b/metadata/cache/dev-lang/go-1.0.1
index 0cf3bdd6030e..936dbcc7af99 100644
--- a/metadata/cache/dev-lang/go-1.0.1
+++ b/metadata/cache/dev-lang/go-1.0.1
@@ -1,5 +1,5 @@
 sys-apps/ed pax_kernel? ( sys-apps/paxctl )
-bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( app-editors/vim ) zsh-completion? ( app-shells/zsh-completion ) pax_kernel? ( sys-apps/paxctl )
+bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion ) pax_kernel? ( sys-apps/paxctl )
 0
 http://go.googlecode.com/files/go1.0.1.src.tar.gz
 
diff --git a/metadata/cache/dev-lang/go-9999 b/metadata/cache/dev-lang/go-9999
index bfd213aaf06e..4edd1ad18e5c 100644
--- a/metadata/cache/dev-lang/go-9999
+++ b/metadata/cache/dev-lang/go-9999
@@ -1,5 +1,5 @@
 sys-apps/ed dev-vcs/mercurial
-bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( app-editors/vim ) zsh-completion? ( app-shells/zsh-completion )
+bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
 0
 
 
diff --git a/metadata/cache/dev-libs/userspace-rcu-0.6.7 b/metadata/cache/dev-libs/userspace-rcu-0.7.3
similarity index 74%
rename from metadata/cache/dev-libs/userspace-rcu-0.6.7
rename to metadata/cache/dev-libs/userspace-rcu-0.7.3
index 66a1444d6ddd..9ae21be5f910 100644
--- a/metadata/cache/dev-libs/userspace-rcu-0.6.7
+++ b/metadata/cache/dev-libs/userspace-rcu-0.7.3
@@ -1,7 +1,7 @@
 test? ( sys-process/time )
 
 0
-http://lttng.org/files/urcu/userspace-rcu-0.6.7.tar.bz2
+http://lttng.org/files/urcu/userspace-rcu-0.7.3.tar.bz2
 
 http://lttng.org/urcu
 LGPL-2.1
diff --git a/metadata/cache/dev-ml/camomile-0.8.3 b/metadata/cache/dev-ml/camomile-0.8.3
deleted file mode 100644
index f8a69f17ff7e..000000000000
--- a/metadata/cache/dev-ml/camomile-0.8.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
->=dev-lang/ocaml-3.10.2[ocamlopt?]
-0
-mirror://sourceforge/camomile/camomile-0.8.3.tar.bz2
-
-http://camomile.sourceforge.net/
-LGPL-2
-Camomile is a comprehensive Unicode library for ocaml.
-~amd64 ppc x86
-eutils findlib multilib toolchain-funcs user
-debug +ocamlopt
-
-
-
-2
-
-compile configure install
-
-
-
-
-
diff --git a/metadata/cache/dev-ml/cryptokit-1.4 b/metadata/cache/dev-ml/cryptokit-1.4
deleted file mode 100644
index 4041f28b80ab..000000000000
--- a/metadata/cache/dev-ml/cryptokit-1.4
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ocaml-3.10.2[ocamlopt?] zlib? ( >=sys-libs/zlib-1.1 ) >=dev-ml/findlib-1.0.4-r1
->=dev-lang/ocaml-3.10.2[ocamlopt?] zlib? ( >=sys-libs/zlib-1.1 )
-0
-https://forge.ocamlcore.org/frs/download.php/460/cryptokit-1.4.tar.gz
-
-http://forge.ocamlcore.org/projects/cryptokit/
-LGPL-2
-Cryptographic primitives library for Objective Caml
-amd64 ~ppc x86 ~x86-fbsd
-findlib multilib toolchain-funcs
-debug doc +ocamlopt zlib
-
-
-
-2
-
-compile configure install postinst test
-
-
-
-
-
diff --git a/metadata/cache/dev-ml/oasis-0.3.0_rc5 b/metadata/cache/dev-ml/oasis-0.3.0_rc5
deleted file mode 100644
index 5fc7f66541ce..000000000000
--- a/metadata/cache/dev-ml/oasis-0.3.0_rc5
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-ml/ocaml-data-notation-0.0.3 dev-ml/ocamlify dev-ml/ocamlmod test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-1.1.0 >=dev-ml/ocaml-expect-0.0.2 dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
->=dev-ml/ocaml-data-notation-0.0.3 >=dev-lang/ocaml-3.12[ocamlopt?]
-0
-http://forge.ocamlcore.org/frs/download.php/855/oasis-0.3.0~rc5.tar.gz
-
-http://oasis.forge.ocamlcore.org/index.php
-LGPL-2.1-linking-exception
-OASIS is a tool to integrate a configure, build and install system in OCaml project
-~amd64
-base eutils findlib multilib oasis toolchain-funcs user
-+ocamlopt debug doc test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ml/ounit-1.1.0 b/metadata/cache/dev-ml/ounit-1.1.0
deleted file mode 100644
index 7a561d107adb..000000000000
--- a/metadata/cache/dev-ml/ounit-1.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
->=dev-lang/ocaml-3.10.2[ocamlopt?]
-0
-https://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz
-
-http://ounit.forge.ocamlcore.org/
-MIT
-Unit testing framework for OCaml
-amd64 ppc x86
-findlib multilib toolchain-funcs
-debug doc +ocamlopt
-
-
-
-2
-
-compile configure install
-
-
-
-
-
diff --git a/metadata/cache/dev-ml/ounit-1.1.2 b/metadata/cache/dev-ml/ounit-1.1.2
new file mode 100644
index 000000000000..c9ed95ee4f3d
--- /dev/null
+++ b/metadata/cache/dev-ml/ounit-1.1.2
@@ -0,0 +1,22 @@
+>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
+>=dev-lang/ocaml-3.12[ocamlopt?]
+0
+http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz
+
+http://ounit.forge.ocamlcore.org/
+MIT
+Unit testing framework for OCaml
+~amd64 ~ppc ~x86
+base eutils findlib multilib oasis toolchain-funcs user
++ocamlopt debug doc
+
+
+
+3
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ml/pxp-1.2.3 b/metadata/cache/dev-ml/pxp-1.2.3
new file mode 100644
index 000000000000..c16adf87a239
--- /dev/null
+++ b/metadata/cache/dev-ml/pxp-1.2.3
@@ -0,0 +1,22 @@
+>=dev-ml/pcre-ocaml-4.31 >=dev-ml/ulex-0.5 >=dev-ml/ocamlnet-0.98 >=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+>=dev-ml/pcre-ocaml-4.31 >=dev-ml/ulex-0.5 >=dev-ml/ocamlnet-0.98 >=dev-lang/ocaml-3.10.2[ocamlopt?]
+0
+http://download.camlcity.org/download/pxp-1.2.3.tar.gz
+
+http://projects.camlcity.org/projects/pxp.html
+as-is
+validating XML parser library for O'Caml
+~amd64 ~ppc ~x86
+eutils findlib multilib toolchain-funcs user
+examples +ocamlopt
+
+
+
+2
+
+compile configure install
+
+
+
+
+
diff --git a/metadata/cache/dev-ml/tyxml-2.1 b/metadata/cache/dev-ml/tyxml-2.1
new file mode 100644
index 000000000000..4f25f45cd937
--- /dev/null
+++ b/metadata/cache/dev-ml/tyxml-2.1
@@ -0,0 +1,22 @@
+>=dev-lang/ocaml-3.12[ocamlopt?] dev-ml/ocamlnet ocamlduce? ( dev-ml/ocamlduce ) >=dev-ml/findlib-1.0.4-r1
+>=dev-lang/ocaml-3.12[ocamlopt?] dev-ml/ocamlnet ocamlduce? ( dev-ml/ocamlduce )
+0
+http://www.ocsigen.org/download/tyxml-2.1.tar.gz
+
+http://ocsigen.org/tyxml/
+LGPL-2.1-linking-exception
+A libary to build xml trees typechecked by OCaml
+~amd64
+eutils findlib multilib toolchain-funcs user
+doc ocamlduce +ocamlopt
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-python/enthoughtbase-3.1.0 b/metadata/cache/dev-python/enthoughtbase-3.1.0
index 926af6927278..bd76f632468c 100644
--- a/metadata/cache/dev-python/enthoughtbase-3.1.0
+++ b/metadata/cache/dev-python/enthoughtbase-3.1.0
@@ -3,7 +3,7 @@ dev-python/setuptools =dev-lang/python-2*
 0
 http://www.enthought.com/repo/ETS/EnthoughtBase-3.1.0.tar.gz
 
-http://code.enthought.com/projects/enthought_base/ http://pypi.python.org/pypi/EnthoughtBase
+http://code.enthought.com/projects/enthought_base/
 BSD LGPL-2
 Core packages for the Enthought Tool Suite
 amd64 ppc ~ppc64 x86
diff --git a/metadata/cache/dev-python/envisagecore-3.2.0 b/metadata/cache/dev-python/envisagecore-3.2.0
index 42e1583fa925..c82ae89566e5 100644
--- a/metadata/cache/dev-python/envisagecore-3.2.0
+++ b/metadata/cache/dev-python/envisagecore-3.2.0
@@ -3,7 +3,7 @@
 0
 http://www.enthought.com/repo/ETS/EnvisageCore-3.2.0.tar.gz
 
-http://code.enthought.com/projects/envisage/ http://pypi.python.org/pypi/EnvisageCore
+http://code.enthought.com/projects/envisage/
 BSD
 Enthought Tool Suite: Extensible application framework
 ~amd64 ~x86
diff --git a/metadata/cache/dev-python/envisageplugins-3.2.0 b/metadata/cache/dev-python/envisageplugins-3.2.0
index c084e793a097..c902c16d212d 100644
--- a/metadata/cache/dev-python/envisageplugins-3.2.0
+++ b/metadata/cache/dev-python/envisageplugins-3.2.0
@@ -3,7 +3,7 @@
 0
 http://www.enthought.com/repo/ETS/EnvisagePlugins-3.2.0.tar.gz
 
-http://code.enthought.com/projects/envisage_plugins.php http://pypi.python.org/pypi/EnvisagePlugins
+http://code.enthought.com/projects/envisage_plugins.php
 BSD
 Enthought Tool Suite: Plug-ins for the Envisage framework
 ~amd64 ~x86
diff --git a/metadata/cache/dev-python/nose-cover3-0.1.0 b/metadata/cache/dev-python/nose-cover3-0.1.0
index 5b4ad9fb65f6..965dfbf60ba5 100644
--- a/metadata/cache/dev-python/nose-cover3-0.1.0
+++ b/metadata/cache/dev-python/nose-cover3-0.1.0
@@ -3,7 +3,7 @@ dev-python/nose || ( =dev-lang/python-3* =dev-lang/python-2* )
 0
 mirror://pypi/n/nose-cover3/nose-cover3-0.1.0.tar.gz
 
-https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nosecover3
+https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nose-cover3
 LGPL-2
 Coverage 3.x support for Nose
 ~amd64 ~x86
diff --git a/metadata/cache/dev-python/pyside-1.1.0-r1 b/metadata/cache/dev-python/pyside-1.1.0-r1
deleted file mode 100644
index fb990bff96af..000000000000
--- a/metadata/cache/dev-python/pyside-1.1.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) >=dev-python/generatorrunner-0.6.16 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://www.pyside.org/files/pyside-qt4.7+1.1.0.tar.bz2
-
-http://www.pyside.org/
-LGPL-2.1
-Python bindings for the Qt framework
-amd64 x86
-base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user virtualx
-X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns test
-declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/shiboken-1.1.0-r2 b/metadata/cache/dev-python/shiboken-1.1.0-r2
deleted file mode 100644
index 1de5feff5fad..000000000000
--- a/metadata/cache/dev-python/shiboken-1.1.0-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/apiextractor-0.10.10 >=dev-python/generatorrunner-0.6.16 >=x11-libs/qt-core-4.7.0:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
->=dev-python/apiextractor-0.10.10 >=dev-python/generatorrunner-0.6.16 >=x11-libs/qt-core-4.7.0:4 || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://www.pyside.org/files/shiboken-1.1.0.tar.bz2
-
-http://www.pyside.org/
-LGPL-2.1
-A tool for creating Python bindings for C++ libraries
-amd64 x86
-base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user
-test
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/traitsbackendqt-3.6.0 b/metadata/cache/dev-python/traitsbackendqt-3.6.0
index 0f642a76f364..258811e899ca 100644
--- a/metadata/cache/dev-python/traitsbackendqt-3.6.0
+++ b/metadata/cache/dev-python/traitsbackendqt-3.6.0
@@ -3,7 +3,7 @@ dev-python/PyQt4[X] dev-python/setuptools =dev-lang/python-2*
 0
 http://www.enthought.com/repo/ETS/TraitsBackendQt-3.6.0.tar.gz
 
-http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendQt
+http://code.enthought.com/projects/traits_gui/
 BSD
 PyQt backend for Traits and TraitsGUI (Pyface)
 amd64 ppc ~ppc64 x86
diff --git a/metadata/cache/dev-python/traitsbackendwx-3.6.0 b/metadata/cache/dev-python/traitsbackendwx-3.6.0
index 40b8f086d674..57137f8db9fe 100644
--- a/metadata/cache/dev-python/traitsbackendwx-3.6.0
+++ b/metadata/cache/dev-python/traitsbackendwx-3.6.0
@@ -3,7 +3,7 @@ dev-python/setuptools dev-python/wxpython:2.8 =dev-lang/python-2*
 0
 http://www.enthought.com/repo/ETS/TraitsBackendWX-3.6.0.tar.gz
 
-http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendWX
+http://code.enthought.com/projects/traits_gui/
 BSD
 WxPython backend for Traits and TraitsGUI (Pyface)
 amd64 ppc ~ppc64 x86
diff --git a/metadata/cache/dev-python/traitsgui-3.6.0-r1 b/metadata/cache/dev-python/traitsgui-3.6.0-r1
index 4d82e1f32a7e..9f72a0ad313b 100644
--- a/metadata/cache/dev-python/traitsgui-3.6.0-r1
+++ b/metadata/cache/dev-python/traitsgui-3.6.0-r1
@@ -3,7 +3,7 @@
 0
 http://www.enthought.com/repo/ETS/TraitsGUI-3.6.0.tar.gz
 
-http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsGUI
+http://code.enthought.com/projects/traits_gui/
 BSD
 Traits-capable windowing framework
 amd64 ppc ~ppc64 x86
diff --git a/metadata/cache/dev-ruby/ruby-progressbar-0.0.10 b/metadata/cache/dev-ruby/ruby-progressbar-0.0.10
index f9543d603126..c97e3199f619 100644
--- a/metadata/cache/dev-ruby/ruby-progressbar-0.0.10
+++ b/metadata/cache/dev-ruby/ruby-progressbar-0.0.10
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 0
 mirror://rubygems/ruby-progressbar-0.0.10.gem
 
-http://github.com/nex3/ruby-progressbar
+https://github.com/jfelchner/ruby-progressbar
 || ( Ruby GPL-2 )
 A Text Progress Bar Library for Ruby
 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
diff --git a/metadata/cache/dev-ruby/ruby-progressbar-0.0.9 b/metadata/cache/dev-ruby/ruby-progressbar-0.0.9
index ca8efa9af05f..39efb5752675 100644
--- a/metadata/cache/dev-ruby/ruby-progressbar-0.0.9
+++ b/metadata/cache/dev-ruby/ruby-progressbar-0.0.9
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubyge
 0
 mirror://rubygems/ruby-progressbar-0.0.9.gem
 
-http://github.com/nex3/ruby-progressbar
+https://github.com/jfelchner/ruby-progressbar
 || ( Ruby GPL-2 )
 A Text Progress Bar Library for Ruby
 alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
diff --git a/metadata/cache/dev-ruby/ruby-progressbar-0.0.9-r1 b/metadata/cache/dev-ruby/ruby-progressbar-0.0.9-r1
index 72b8fa0fce3a..ac3a9a63e0c3 100644
--- a/metadata/cache/dev-ruby/ruby-progressbar-0.0.9-r1
+++ b/metadata/cache/dev-ruby/ruby-progressbar-0.0.9-r1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 0
 mirror://rubygems/ruby-progressbar-0.0.9.gem
 
-http://github.com/nex3/ruby-progressbar
+https://github.com/jfelchner/ruby-progressbar
 || ( Ruby GPL-2 )
 A Text Progress Bar Library for Ruby
 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
diff --git a/metadata/cache/dev-ruby/spork-0.8.4-r1 b/metadata/cache/dev-ruby/spork-0.8.4-r1
index c10a0858c790..90639cb82ff9 100644
--- a/metadata/cache/dev-ruby/spork-0.8.4-r1
+++ b/metadata/cache/dev-ruby/spork-0.8.4-r1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-e
 0
 mirror://rubygems/spork-0.8.4.gem
 
-http://github.com/timcharper/spork
+https://github.com/sporkrb/spork
 MIT
 Spork is Tim Harper's implementation of test server.
 ~amd64 ~x86
diff --git a/metadata/cache/dev-ruby/spork-0.8.5 b/metadata/cache/dev-ruby/spork-0.8.5
index 785dedb2563d..525f3d4b65ae 100644
--- a/metadata/cache/dev-ruby/spork-0.8.5
+++ b/metadata/cache/dev-ruby/spork-0.8.5
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-e
 0
 mirror://rubygems/spork-0.8.5.gem
 
-http://github.com/timcharper/spork
+https://github.com/sporkrb/spork
 MIT
 Spork is Tim Harper's implementation of test server.
 ~amd64 ~x86
diff --git a/metadata/cache/dev-ruby/spork-0.9.0 b/metadata/cache/dev-ruby/spork-0.9.0
index aa5cfbffad86..3db9f3981410 100644
--- a/metadata/cache/dev-ruby/spork-0.9.0
+++ b/metadata/cache/dev-ruby/spork-0.9.0
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 0
 mirror://rubygems/spork-0.9.0.gem
 
-http://github.com/timcharper/spork
+https://github.com/sporkrb/spork
 MIT
 Spork is Tim Harper's implementation of test server.
 ~amd64 ~x86 ~x86-fbsd
diff --git a/metadata/cache/dev-ruby/spork-0.9.2 b/metadata/cache/dev-ruby/spork-0.9.2
index 3d6aac714b57..91848179e9e7 100644
--- a/metadata/cache/dev-ruby/spork-0.9.2
+++ b/metadata/cache/dev-ruby/spork-0.9.2
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 0
 mirror://rubygems/spork-0.9.2.gem
 
-http://github.com/timcharper/spork
+https://github.com/sporkrb/spork
 MIT
 Spork is Tim Harper's implementation of test server.
 ~amd64 ~x86 ~x86-fbsd
diff --git a/metadata/cache/dev-tex/bibtex2html-1.96 b/metadata/cache/dev-tex/bibtex2html-1.96
deleted file mode 100644
index 785fc740fc8f..000000000000
--- a/metadata/cache/dev-tex/bibtex2html-1.96
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ocaml-3.10[ocamlopt?] doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-tex/hevea )
-virtual/latex-base
-0
-http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.96.tar.gz
-test
-http://www.lri.fr/~filliatr/bibtex2html/
-GPL-2
-A bibtex to HTML converter
-amd64 ~ppc ~ppc64 x86
-eutils multilib toolchain-funcs user
-doc +ocamlopt
-
-
-
-2
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-util/aruba-0.4.11 b/metadata/cache/dev-util/aruba-0.4.11
index fcb1b6eddc41..993da2b5c517 100644
--- a/metadata/cache/dev-util/aruba-0.4.11
+++ b/metadata/cache/dev-util/aruba-0.4.11
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ruby18] >=dev-ruby/chi
 0
 mirror://rubygems/aruba-0.4.11.gem
 
-https://github.com/aslakhellesoy/aruba
+https://github.com/cucumber/aruba
 MIT
 Cucumber steps for driving out command line applications.
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-0.10.2 b/metadata/cache/dev-util/cucumber-0.10.2
index dc31879cfc66..80f131b58bc1 100644
--- a/metadata/cache/dev-util/cucumber-0.10.2
+++ b/metadata/cache/dev-util/cucumber-0.10.2
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-0.10.2.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-0.10.3 b/metadata/cache/dev-util/cucumber-0.10.3
index e4ab1c91af98..2a32ce13f691 100644
--- a/metadata/cache/dev-util/cucumber-0.10.3
+++ b/metadata/cache/dev-util/cucumber-0.10.3
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-0.10.3.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-0.7.3-r1 b/metadata/cache/dev-util/cucumber-0.7.3-r1
index a10e22f10f75..c748ebbb4dc2 100644
--- a/metadata/cache/dev-util/cucumber-0.7.3-r1
+++ b/metadata/cache/dev-util/cucumber-0.7.3-r1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-0.7.3.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
diff --git a/metadata/cache/dev-util/cucumber-1.0.0 b/metadata/cache/dev-util/cucumber-1.0.0
index bf72af40c260..f1dfd69d1251 100644
--- a/metadata/cache/dev-util/cucumber-1.0.0
+++ b/metadata/cache/dev-util/cucumber-1.0.0
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-1.0.0.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-1.0.1 b/metadata/cache/dev-util/cucumber-1.0.1
index 983664370d11..7141ba9ed96d 100644
--- a/metadata/cache/dev-util/cucumber-1.0.1
+++ b/metadata/cache/dev-util/cucumber-1.0.1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-1.0.1.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-1.0.2 b/metadata/cache/dev-util/cucumber-1.0.2
index 49a8390198fc..d23f91571f66 100644
--- a/metadata/cache/dev-util/cucumber-1.0.2
+++ b/metadata/cache/dev-util/cucumber-1.0.2
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-1.0.2.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-1.0.6 b/metadata/cache/dev-util/cucumber-1.0.6
index 9f0f40af6d9a..4035d569819e 100644
--- a/metadata/cache/dev-util/cucumber-1.0.6
+++ b/metadata/cache/dev-util/cucumber-1.0.6
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-1.0.6.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-1.1.4 b/metadata/cache/dev-util/cucumber-1.1.4
index 91cbc596b3ae..365ce01256e7 100644
--- a/metadata/cache/dev-util/cucumber-1.1.4
+++ b/metadata/cache/dev-util/cucumber-1.1.4
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/
 0
 mirror://rubygems/cucumber-1.1.4.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-rails-0.3.2-r1 b/metadata/cache/dev-util/cucumber-rails-0.3.2-r1
index 5ecf3c2d1f32..1cc499f1416d 100644
--- a/metadata/cache/dev-util/cucumber-rails-0.3.2-r1
+++ b/metadata/cache/dev-util/cucumber-rails-0.3.2-r1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-util/cucumber-0.6.2[ruby_targets_ruby18] ) ruby_tar
 0
 mirror://rubygems/cucumber-rails-0.3.2.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios for Rails
 ~amd64 ~x86 ~x86-macos
diff --git a/metadata/cache/dev-util/cucumber-rails-1.0.6 b/metadata/cache/dev-util/cucumber-rails-1.0.6
index f4997b9a09d3..b3a665a3b27f 100644
--- a/metadata/cache/dev-util/cucumber-rails-1.0.6
+++ b/metadata/cache/dev-util/cucumber-rails-1.0.6
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-util/cucumber-1.0.6[ruby_targets_ruby18] >=dev-ruby
 1
 mirror://rubygems/cucumber-rails-1.0.6.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios for Rails
 ~amd64
diff --git a/metadata/cache/dev-util/cucumber-rails-1.2.1 b/metadata/cache/dev-util/cucumber-rails-1.2.1
index 2064efe32066..d5bc6ebfcca3 100644
--- a/metadata/cache/dev-util/cucumber-rails-1.2.1
+++ b/metadata/cache/dev-util/cucumber-rails-1.2.1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=dev-ruby
 1
 mirror://rubygems/cucumber-rails-1.2.1.gem
 
-http://github.com/aslakhellesoy/cucumber/wikis
+https://github.com/cucumber/cucumber/wikis
 Ruby
 Executable feature scenarios for Rails
 ~amd64
diff --git a/metadata/cache/dev-util/pkgconf-0.8 b/metadata/cache/dev-util/pkgconf-0.8
index 3e206daa03d5..64613d8caf83 100644
--- a/metadata/cache/dev-util/pkgconf-0.8
+++ b/metadata/cache/dev-util/pkgconf-0.8
@@ -6,7 +6,7 @@ http://tortois.es/~nenolod/distfiles/pkgconf-0.8.tar.bz2
 https://github.com/nenolod/pkgconf
 BSD-1
 pkg-config compatible replacement with no dependencies other than ANSI C89
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 eutils multilib toolchain-funcs user
 +pkg-config
 
diff --git a/metadata/cache/java-virtuals/servlet-api-3.0-r1 b/metadata/cache/java-virtuals/servlet-api-3.0-r1
index ff0c4b71dffd..47bc3f622a63 100644
--- a/metadata/cache/java-virtuals/servlet-api-3.0-r1
+++ b/metadata/cache/java-virtuals/servlet-api-3.0-r1
@@ -6,7 +6,7 @@
 http://java.sun.com/products/servlet/
 as-is
 Virtual for servlet api
-amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd
 eutils java-utils-2 java-virtuals-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD
 
diff --git a/metadata/cache/mail-mta/nullmailer-1.10-r1 b/metadata/cache/mail-mta/nullmailer-1.10-r1
new file mode 100644
index 000000000000..cff4378ae15e
--- /dev/null
+++ b/metadata/cache/mail-mta/nullmailer-1.10-r1
@@ -0,0 +1,22 @@
+sys-apps/groff ssl? ( net-libs/gnutls ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
+0
+http://untroubled.org/nullmailer/archive/nullmailer-1.10.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.10-1.debian.tar.gz
+
+http://untroubled.org/nullmailer/
+GPL-2
+Simple relay-only local mail transport agent
+~amd64 ~ppc ~x86
+autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
+ssl
+
+
+
+4
+
+config configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-libs/cal3d-0.11.0-r1 b/metadata/cache/media-libs/cal3d-0.11.0-r1
index 60d52020d663..503aea17d9c7 100644
--- a/metadata/cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/cache/media-libs/cal3d-0.11.0-r1
@@ -14,7 +14,7 @@ autotools base eutils libtool multilib multiprocessing toolchain-funcs user
 
 2
 
-compile configure install prepare setup unpack
+compile configure install prepare unpack
 
 
 
diff --git a/metadata/cache/media-libs/jasper-1.900.1-r5 b/metadata/cache/media-libs/jasper-1.900.1-r5
new file mode 100644
index 000000000000..35f361b84690
--- /dev/null
+++ b/metadata/cache/media-libs/jasper-1.900.1-r5
@@ -0,0 +1,22 @@
+jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl media-libs/freeglut ) app-arch/unzip
+jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl media-libs/freeglut )
+0
+http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gentoo/jasper-1.900.1-fixes-20120611.patch.bz2
+
+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 ~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
+
+
+
+3
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-libs/jbig2dec-0.11-r1 b/metadata/cache/media-libs/jbig2dec-0.11-r1
index b8d34ad498d9..89b2130242a3 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 png static-libs test
 
diff --git a/metadata/cache/media-plugins/vdr-powermate-0.0.5 b/metadata/cache/media-plugins/vdr-powermate-0.0.5
index 7d6df111a48a..362f72f805de 100644
--- a/metadata/cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/cache/media-plugins/vdr-powermate-0.0.5
@@ -7,12 +7,12 @@ http://home.arcor.de/andreas.regel/vdr_plugins.htm
 GPL-2
 Video Disk Recorder - Powermate PlugIn
 amd64 x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
 
 
 
 
-2
+4
 
 compile config configure install postinst postrm prepare setup unpack
 
diff --git a/metadata/cache/media-plugins/vdr-premiereepg-0.2.0-r1 b/metadata/cache/media-plugins/vdr-premiereepg-0.2.0-r1
new file mode 100644
index 000000000000..f4d5b6e366bb
--- /dev/null
+++ b/metadata/cache/media-plugins/vdr-premiereepg-0.2.0-r1
@@ -0,0 +1,22 @@
+>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+0
+http://www.muempf.de/down/vdr-premiereepg-0.2.0.tar.gz
+
+http://www.muempf.de/index.html
+GPL-2
+VDR Plugin: Support the extended EPG which is sent by german paytv Sky on their portal channels
+~amd64 ~x86
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
+
+
+
+
+4
+
+compile config configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/cache/media-plugins/vdr-proxy-0.1.4-r1
new file mode 100644
index 000000000000..4ed4400bf0b1
--- /dev/null
+++ b/metadata/cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -0,0 +1,22 @@
+>=media-video/vdr-1.3.23 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+0
+http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.4.tgz
+
+http://urichter.cjb.net/vdr/?h=proxy
+GPL-2
+VDR Plugin Proxy - enable grouping of menu entries, online load/unload
+~x86
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
+
+
+
+
+4
+
+compile config configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-plugins/vdr-skinclassic-0.0.2 b/metadata/cache/media-plugins/vdr-skinclassic-0.0.2
index fa48d9264855..9cb79b871d7e 100644
--- a/metadata/cache/media-plugins/vdr-skinclassic-0.0.2
+++ b/metadata/cache/media-plugins/vdr-skinclassic-0.0.2
@@ -1,5 +1,5 @@
 >=media-video/vdr-1.3.27 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.3.27 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 0
 mirror://gentoo/vdr-skinclassic-0.0.2.tgz
 
@@ -7,14 +7,14 @@ http://www.vdr-wiki.de/wiki/index.php/Skinclassic-plugin
 GPL-2
 vdr skin: based on classic vdr design
 x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
 
 
 
 
+4
 
-
-compile config install postinst postrm setup unpack
+compile config configure install postinst postrm prepare setup unpack
 
 
 
diff --git a/metadata/cache/media-plugins/vdr-skinelchi-0.2.7 b/metadata/cache/media-plugins/vdr-skinelchi-0.2.7
new file mode 100644
index 000000000000..c4c36d8cac5a
--- /dev/null
+++ b/metadata/cache/media-plugins/vdr-skinelchi-0.2.7
@@ -0,0 +1,22 @@
+>=media-video/vdr-1.6 imagemagick? ( media-gfx/imagemagick ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+0
+http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.2.7.tar.bz2
+
+http://firefly.vdr-developer.org/skinelchi
+GPL-2
+Video Disk Recorder - Skin Plugin
+~amd64 ~x86
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
+imagemagick
+
+
+
+4
+
+compile config configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-video/mkclean-0.8.6 b/metadata/cache/media-video/mkclean-0.8.6
deleted file mode 100644
index 5fb6eaf6e529..000000000000
--- a/metadata/cache/media-video/mkclean-0.8.6
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.6.tar.bz2
-
-http://www.matroska.org/downloads/mkclean.html
-BSD
-mkclean is a command line tool to clean and optimize Matroska files
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-video/mkvalidator-0.3.7 b/metadata/cache/media-video/mkvalidator-0.4.0
similarity index 84%
rename from metadata/cache/media-video/mkvalidator-0.3.7
rename to metadata/cache/media-video/mkvalidator-0.4.0
index b217522b433e..9206253cccac 100644
--- a/metadata/cache/media-video/mkvalidator-0.3.7
+++ b/metadata/cache/media-video/mkvalidator-0.4.0
@@ -1,7 +1,7 @@
 
 
 0
-http://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.3.7.tar.bz2
+http://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.4.0.tar.bz2
 
 http://www.matroska.org/downloads/mkvalidator.html
 BSD
@@ -14,7 +14,7 @@ eutils multilib toolchain-funcs user
 
 4
 
-configure install
+compile configure install
 
 
 
diff --git a/metadata/cache/media-video/mplayer2-9999 b/metadata/cache/media-video/mplayer2-9999
index efdcc8f66273..5ed5eb16c511 100644
--- a/metadata/cache/media-video/mplayer2-9999
+++ b/metadata/cache/media-video/mplayer2-9999
@@ -8,7 +8,7 @@ GPL-3
 Media Player for Linux
 
 base eutils flag-o-matic git-2 multilib toolchain-funcs user
-+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
++a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
 ass? ( truetype ) bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) dxr3? ( X ) ggi? ( X ) opengl? ( X ) radio? ( || ( dvb v4l ) ) truetype? ( iconv ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 
 
diff --git a/metadata/cache/media-video/vlc-2.0.1 b/metadata/cache/media-video/vlc-2.0.1
index d3ca2694400c..2ceec264fbbd 100644
--- a/metadata/cache/media-video/vlc-2.0.1
+++ b/metadata/cache/media-video/vlc-2.0.1
@@ -1,5 +1,5 @@
-|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz mirror://gentoo/vlc-patches-109.tar.bz2
 
diff --git a/metadata/cache/media-video/vlc-2.0.9999 b/metadata/cache/media-video/vlc-2.0.9999
index cb8f1b50ccb9..0b76827bd595 100644
--- a/metadata/cache/media-video/vlc-2.0.9999
+++ b/metadata/cache/media-video/vlc-2.0.9999
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 mirror://gentoo/vlc-patches-101.tar.bz2
 
diff --git a/metadata/cache/media-video/vlc-9999 b/metadata/cache/media-video/vlc-9999
index 31ca17463103..dd7e3a00c6fc 100644
--- a/metadata/cache/media-video/vlc-9999
+++ b/metadata/cache/media-video/vlc-9999
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 mirror://gentoo/vlc-patches-108.tar.bz2
 
diff --git a/metadata/cache/net-analyzer/nagios-nrpe-2.13-r2 b/metadata/cache/net-analyzer/nagios-nrpe-2.13-r2
index fc4077493d9e..c3fccbd8eeab 100644
--- a/metadata/cache/net-analyzer/nagios-nrpe-2.13-r2
+++ b/metadata/cache/net-analyzer/nagios-nrpe-2.13-r2
@@ -6,7 +6,7 @@ mirror
 http://www.nagios.org/
 GPL-2
 Nagios Remote Plugin Executor
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 command-args ssl tcpd xinetd
 
diff --git a/metadata/cache/net-dns/knot-1.0.0 b/metadata/cache/net-dns/knot-1.0.5
similarity index 75%
rename from metadata/cache/net-dns/knot-1.0.0
rename to metadata/cache/net-dns/knot-1.0.5
index 1449d9eea532..8dc8d93afeca 100644
--- a/metadata/cache/net-dns/knot-1.0.0
+++ b/metadata/cache/net-dns/knot-1.0.5
@@ -1,13 +1,13 @@
 dev-libs/openssl dev-libs/userspace-rcu virtual/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl dev-libs/userspace-rcu
 0
-http://public.nic.cz/files/knot-dns/knot-1.0.0.tar.gz
+http://public.nic.cz/files/knot-dns/knot-1.0.5.tar.gz
 
 http://www.knot-dns.cz/
 GPL-3
 High-performance authoritative-only DNS server
 ~amd64 ~x86
-autotools libtool multilib multiprocessing toolchain-funcs
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
 debug
 
 
diff --git a/metadata/cache/net-firewall/firehol-1.273-r3 b/metadata/cache/net-firewall/firehol-1.273-r3
new file mode 100644
index 000000000000..dad39bd8cb17
--- /dev/null
+++ b/metadata/cache/net-firewall/firehol-1.273-r3
@@ -0,0 +1,22 @@
+sys-apps/iproute2
+net-firewall/iptables sys-apps/iproute2[-minimal] virtual/modutils || ( net-misc/wget net-misc/curl )
+0
+mirror://sourceforge/firehol/firehol-1.273.tar.bz2
+
+http://firehol.sourceforge.net/
+GPL-2
+iptables firewall generator
+~amd64 ~ppc ~sparc ~x86
+eutils linux-info multilib toolchain-funcs user versionator
+
+
+
+
+4
+
+install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/pglinux-2.1.3_p20120519 b/metadata/cache/net-firewall/pglinux-2.1.3_p20120519
deleted file mode 100644
index 475bd602bb09..000000000000
--- a/metadata/cache/net-firewall/pglinux-2.1.3_p20120519
+++ /dev/null
@@ -1,22 +0,0 @@
-net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) virtual/pkgconfig sys-devel/libtool:2
-net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
-0
-http://dev.gentoo.org/~hasufell/distfiles/pglinux-2.1.3_p20120519.tar.xz
-
-https://sourceforge.net/projects/peerguardian/
-GPL-3
-Privacy oriented firewall application
-~amd64 ~x86
-eutils linux-info multilib toolchain-funcs user versionator
-cron dbus logrotate networkmanager qt4 zlib
-qt4? ( dbus )
-
-
-4
-
-configure postinst setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/pglinux-2.2.0 b/metadata/cache/net-firewall/pglinux-2.2.0
new file mode 100644
index 000000000000..23a763ffd034
--- /dev/null
+++ b/metadata/cache/net-firewall/pglinux-2.2.0
@@ -0,0 +1,22 @@
+net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4
+net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
+0
+mirror://sourceforge/peerguardian/pgl-2.2.0.tar.gz
+
+https://sourceforge.net/projects/peerguardian/
+GPL-3
+Privacy oriented firewall application
+~amd64 ~x86
+eutils gnome2-utils linux-info multilib toolchain-funcs user versionator
+cron dbus logrotate networkmanager qt4 zlib
+qt4? ( dbus )
+
+
+4
+
+configure postinst postrm preinst setup
+
+
+
+
+
diff --git a/metadata/cache/net-misc/vtun-2.6-r1 b/metadata/cache/net-misc/vtun-2.6-r1
deleted file mode 100644
index 6d5a6e061e60..000000000000
--- a/metadata/cache/net-misc/vtun-2.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/zlib-1.1.3 >=dev-libs/lzo-2 sys-devel/bison ssl? ( >=dev-libs/openssl-0.9.6c )
->=sys-libs/zlib-1.1.3 ssl? ( >=dev-libs/openssl-0.9.6c )
-0
-mirror://sourceforge/vtun/vtun-2.6.tar.gz
-
-http://vtun.sourceforge.net/
-GPL-2
-Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression
-alpha ~amd64 ~ppc sparc x86
-eutils multilib toolchain-funcs user
-ssl
-
-
-
-
-
-compile install postinst unpack
-
-
-
-
-
diff --git a/metadata/cache/net-misc/vtun-3.0.2 b/metadata/cache/net-misc/vtun-3.0.2-r2
similarity index 77%
rename from metadata/cache/net-misc/vtun-3.0.2
rename to metadata/cache/net-misc/vtun-3.0.2-r2
index 43d9df92b6d9..986a15b1a929 100644
--- a/metadata/cache/net-misc/vtun-3.0.2
+++ b/metadata/cache/net-misc/vtun-3.0.2-r2
@@ -6,15 +6,15 @@ mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
 http://vtun.sourceforge.net/
 GPL-2
 Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression.
-~alpha amd64 ppc ~sparc x86
-
+~alpha ~amd64 ~ppc ~sparc ~x86
+eutils linux-info multilib toolchain-funcs user versionator
 lzo socks5 ssl zlib
 
 
 
-2
+4
 
-configure install postinst
+configure install prepare setup
 
 
 
diff --git a/metadata/cache/net-wireless/gnuradio-3.6.1-r1 b/metadata/cache/net-wireless/gnuradio-3.6.1-r1
new file mode 100644
index 000000000000..590ee9973fdc
--- /dev/null
+++ b/metadata/cache/net-wireless/gnuradio-3.6.1-r1
@@ -0,0 +1,22 @@
+>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/cheetah dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 x11-libs/qt-gui ) sdl? ( media-libs/libsdl ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) dev-lang/swig virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) =dev-lang/python-2*
+>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/cheetah dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 x11-libs/qt-gui ) sdl? ( media-libs/libsdl ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) =dev-lang/python-2*
+0
+http://gnuradio.org/redmine/attachments/download/389/gnuradio-3.6.1.tar.gz
+
+http://gnuradio.org/
+GPL-3
+Toolkit that provides signal processing blocks to implement software radios
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic multilib python toolchain-funcs user
+alsa doc examples fcd grc jack oss portaudio qt4 sdl utils wavelet wxwidgets
+
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-wireless/iwl2030-ucode-18.168.6.1 b/metadata/cache/net-wireless/iwl2030-ucode-18.168.6.1
new file mode 100644
index 000000000000..13ad136646b8
--- /dev/null
+++ b/metadata/cache/net-wireless/iwl2030-ucode-18.168.6.1
@@ -0,0 +1,22 @@
+|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )
+
+0
+http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-2030-ucode-18.168.6.1.tgz
+
+http://intellinuxwireless.org/?p=iwlwifi
+ipw3945
+Intel (R) Wireless WiFi Advanced N 2030 ucode
+~amd64 ~x86
+
+
+
+
+
+
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/net-wireless/kismet-9999 b/metadata/cache/net-wireless/kismet-9999
new file mode 100644
index 000000000000..72b81a3c43c6
--- /dev/null
+++ b/metadata/cache/net-wireless/kismet-9999
@@ -0,0 +1,22 @@
+net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap >=dev-libs/libnl-1.1 ) net-libs/libpcap pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) ruby? ( dev-lang/ruby ) plugin-btscan? ( || ( >=net-wireless/bluez-4.98-r2 =net-wireless/bluez-4.96 ) ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) virtual/pkgconfig dev-vcs/subversion net-misc/rsync
+net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap >=dev-libs/libnl-1.1 ) net-libs/libpcap pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) ruby? ( dev-lang/ruby ) plugin-btscan? ( || ( >=net-wireless/bluez-4.98-r2 =net-wireless/bluez-4.96 ) ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )
+0
+
+
+http://www.kismetwireless.net/
+GPL-2
+IEEE 802.11 wireless LAN sniffer
+
+eutils multilib subversion toolchain-funcs user
++client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid
+
+
+
+4
+
+compile configure install preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-wireless/spectools-2011.08.1-r1 b/metadata/cache/net-wireless/spectools-2011.08.1-r1
index bd1213127ed1..b10e953ef7da 100644
--- a/metadata/cache/net-wireless/spectools-2011.08.1-r1
+++ b/metadata/cache/net-wireless/spectools-2011.08.1-r1
@@ -1,13 +1,13 @@
 
-virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( =x11-libs/gtk+-2* )
+virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
 0
 http://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
 
 http://www.kismetwireless.net/spectools/
 GPL-2
-IEEE 802.11 wireless LAN sniffer for MetaGeek Wi-Spy spectrum analyzer hardware
+Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
 amd64 ~arm ~ppc ~x86
-eutils multilib toolchain-funcs user
+
 ncurses gtk
 
 
diff --git a/metadata/cache/net-wireless/spectools-9999 b/metadata/cache/net-wireless/spectools-9999
new file mode 100644
index 000000000000..7bc735a29254
--- /dev/null
+++ b/metadata/cache/net-wireless/spectools-9999
@@ -0,0 +1,22 @@
+dev-vcs/subversion net-misc/rsync
+virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
+0
+
+
+http://www.kismetwireless.net/spectools/
+GPL-2
+Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
+
+eutils multilib subversion toolchain-funcs user
+debug ncurses gtk
+
+
+
+4
+
+compile install preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/aria-2.3.2-r3 b/metadata/cache/sci-chemistry/aria-2.3.2-r3
index 971d40d824a7..ac3fe18c90fe 100644
--- a/metadata/cache/sci-chemistry/aria-2.3.2-r3
+++ b/metadata/cache/sci-chemistry/aria-2.3.2-r3
@@ -6,7 +6,7 @@ fetch
 http://aria.pasteur.fr/
 cns
 Automated NOE assignment and NMR structure calculation
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 base eutils multilib python toolchain-funcs user versionator
 examples
 
diff --git a/metadata/cache/sci-chemistry/cns-1.2.1-r7 b/metadata/cache/sci-chemistry/cns-1.2.1-r7
index 0f355ae51293..436612140b21 100644
--- a/metadata/cache/sci-chemistry/cns-1.2.1-r7
+++ b/metadata/cache/sci-chemistry/cns-1.2.1-r7
@@ -6,7 +6,7 @@ fetch test
 http://cns.csb.yale.edu/
 cns
 Crystallography and NMR System
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 eutils flag-o-matic fortran-2 multilib toolchain-funcs user versionator
 aria openmp
 
diff --git a/metadata/cache/sci-chemistry/procheck-3.5.4-r1 b/metadata/cache/sci-chemistry/procheck-3.5.4-r1
index a179cf8ea802..44130b36eb4e 100644
--- a/metadata/cache/sci-chemistry/procheck-3.5.4-r1
+++ b/metadata/cache/sci-chemistry/procheck-3.5.4-r1
@@ -6,7 +6,7 @@ fetch
 http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html
 procheck
 Checks the stereochemical quality of a protein structure
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 eutils fortran-2 multilib toolchain-funcs user versionator
 doc
 
diff --git a/metadata/cache/sci-libs/clashscore-db-3.17 b/metadata/cache/sci-libs/clashscore-db-3.17
index db72fed02432..4ab674baeceb 100644
--- a/metadata/cache/sci-libs/clashscore-db-3.17
+++ b/metadata/cache/sci-libs/clashscore-db-3.17
@@ -6,7 +6,7 @@ mirror://gentoo/molprobity-3.17.tgz
 http://kinemage.biochem.duke.edu/
 richardson
 Clashscore-db for clashlist
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sys-apps/ethtool-3.4 b/metadata/cache/sys-apps/ethtool-3.4
new file mode 100644
index 000000000000..41b0211c4186
--- /dev/null
+++ b/metadata/cache/sys-apps/ethtool-3.4
@@ -0,0 +1,22 @@
+
+
+0
+mirror://kernel/software/network/ethtool/ethtool-3.4.tar.bz2
+
+http://www.kernel.org/pub/software/network/ethtool/
+GPL-2
+Utility for examining and tuning ethernet-based network interfaces
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/hwids-20120507 b/metadata/cache/sys-apps/hwids-20120611
similarity index 53%
rename from metadata/cache/sys-apps/hwids-20120507
rename to metadata/cache/sys-apps/hwids-20120611
index e732d3986ba6..659b9195c637 100644
--- a/metadata/cache/sys-apps/hwids-20120507
+++ b/metadata/cache/sys-apps/hwids-20120611
@@ -1,12 +1,12 @@
 
 !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 0
-http://dev.gentoo.org/~flameeyes/hwids/hwids-20120507.tar.xz
+https://github.com/Flameeyes/hwids/tarball/hwids-20120611 -> hwids-20120611.tar.gz
 
-http://git.overlays.gentoo.org/gitweb/?p=proj/hwids.git;a=summary
+https://github.com/Flameeyes/hwids
 || ( GPL-2 BSD )
 Hardware (PCI, USB) IDs databases
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sys-auth/ykpers-1.3.4 b/metadata/cache/sys-auth/ykpers-1.3.4
index 9aef358a22f0..9f8e22118f7a 100644
--- a/metadata/cache/sys-auth/ykpers-1.3.4
+++ b/metadata/cache/sys-auth/ykpers-1.3.4
@@ -3,7 +3,7 @@
 0
 http://yubikey-personalization.googlecode.com/files/ykpers-1.3.4.tar.gz
 
-http://code.google.com/p/yubikey-personalizaiton/
+http://code.google.com/p/yubikey-personalization
 BSD-2
 Library and tool for personalization of Yubico's YubiKey
 ~amd64
diff --git a/metadata/cache/sys-devel/binutils-apple-3.1.1 b/metadata/cache/sys-devel/binutils-apple-3.1.1
deleted file mode 100644
index e90f4074eb52..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.gentoo.org/~grobian/distfiles/ld64-85.2.2.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-698.tar.gz
-test mirror
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.1.1
-~ppc-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-test
-
-
-
-3
-
-compile install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-3.2 b/metadata/cache/sys-devel/binutils-apple-3.2
deleted file mode 100644
index 922869fa1dd3..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.2
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.gentoo.org/~grobian/distfiles/ld64-85.2.1.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-750.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-LP64-patches-1.tar.bz2
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-test
-
-
-
-3
-
-compile install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-3.2-r1 b/metadata/cache/sys-devel/binutils-apple-3.2-r1
deleted file mode 100644
index c94d0ff5e410..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.gentoo.org/~grobian/distfiles/ld64-95.2.12.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-750.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-2.tar.xz
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-test
-
-
-
-3
-
-compile install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-3.2.2 b/metadata/cache/sys-devel/binutils-apple-3.2.2
deleted file mode 100644
index d4e61db03b70..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.opensource.apple.com/tarballs/ld64/ld64-97.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-773.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-3.tar.xz
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-test
-
-
-
-3
-
-compile install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-3.2.3-r1 b/metadata/cache/sys-devel/binutils-apple-3.2.3-r1
deleted file mode 100644
index 75b02ab66b37..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.2.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.opensource.apple.com/tarballs/ld64/ld64-97.14.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-782.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-test
-
-
-
-3
-
-compile install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-3.2.3-r2 b/metadata/cache/sys-devel/binutils-apple-3.2.3-r2
deleted file mode 100644
index 3f75630865b0..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-3.2.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 )
-0
-http://www.opensource.apple.com/tarballs/ld64/ld64-97.14.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-782.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-lto test
-
-
-
-3
-
-compile configure install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/binutils-apple-4.1 b/metadata/cache/sys-devel/binutils-apple-4.1
deleted file mode 100644
index 81852ce99350..000000000000
--- a/metadata/cache/sys-devel/binutils-apple-4.1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 )
-4
-http://www.opensource.apple.com/tarballs/ld64/ld64-123.2.1.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-806.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.5.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2
-test
-http://www.opensource.apple.com/darwinsource/
-APSL-2
-Darwin assembler as(1) and static linker ld(1), Xcode Tools 4.1
-~ppc-macos ~x64-macos ~x86-macos
-eutils flag-o-matic multilib toolchain-funcs user
-lto test
-
-
-
-3
-
-compile configure install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/clang-3.1-r4 b/metadata/cache/sys-devel/clang-3.1-r4
index ec5f60dfd5ed..c7a3d6acb21e 100644
--- a/metadata/cache/sys-devel/clang-3.1-r4
+++ b/metadata/cache/sys-devel/clang-3.1-r4
@@ -6,7 +6,7 @@ http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz http://llvm.org/releases/3.1/co
 http://clang.llvm.org/
 UoI-NCSA
 C language family frontend for LLVM
-~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 eutils multilib python toolchain-funcs user
 debug kernel_FreeBSD multitarget +static-analyzer test
 
diff --git a/metadata/cache/sys-devel/llvm-3.1 b/metadata/cache/sys-devel/llvm-3.1
index bf108a116305..2332d42fc885 100644
--- a/metadata/cache/sys-devel/llvm-3.1
+++ b/metadata/cache/sys-devel/llvm-3.1
@@ -6,7 +6,7 @@ http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz
 http://llvm.org/
 UoI-NCSA
 Low Level Virtual Machine
-~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 eutils flag-o-matic multilib python toolchain-funcs user
 debug gold +libffi multitarget ocaml test udis86 vim-syntax
 
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.4.2 b/metadata/cache/sys-kernel/gentoo-sources-3.4.2
new file mode 100644
index 000000000000..2d4cb3cd3dc0
--- /dev/null
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.4.2
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.4.2
+mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 3.4 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+3
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110
new file mode 100644
index 000000000000..bca06326d30d
--- /dev/null
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r110
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+2.6.32-r110
+mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-112.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 2.6)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.20 b/metadata/cache/sys-kernel/hardened-sources-3.2.20
new file mode 100644
index 000000000000..805857ed8df8
--- /dev/null
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.20
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.2.20
+mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 3.2)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.4.2 b/metadata/cache/sys-kernel/hardened-sources-3.4.2
new file mode 100644
index 000000000000..c335070ef8a0
--- /dev/null
+++ b/metadata/cache/sys-kernel/hardened-sources-3.4.2
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.4.2
+mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 3.4)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/linux-firmware-20110731 b/metadata/cache/sys-kernel/linux-firmware-20110731
deleted file mode 100644
index 7bbb13b3262d..000000000000
--- a/metadata/cache/sys-kernel/linux-firmware-20110731
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-0
-mirror://gentoo/linux-firmware-20110731.tar.bz2
-
-http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware
-GPL-1 GPL-2 GPL-3 BSD freedist
-Linux firmware files
-amd64 arm x86
-portability savedconfig
-savedconfig savedconfig
-
-
-
-3
-
-install postinst preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/linux-firmware-20110818 b/metadata/cache/sys-kernel/linux-firmware-20110818
deleted file mode 100644
index e21b1bd77581..000000000000
--- a/metadata/cache/sys-kernel/linux-firmware-20110818
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-0
-mirror://gentoo/linux-firmware-20110818.tar.bz2
-
-http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware
-GPL-1 GPL-2 GPL-3 BSD freedist
-Linux firmware files
-~amd64 ~arm ~x86
-portability savedconfig
-savedconfig savedconfig
-
-
-
-3
-
-install postinst preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/linux-firmware-20120125 b/metadata/cache/sys-kernel/linux-firmware-20120125
deleted file mode 100644
index 808c92192514..000000000000
--- a/metadata/cache/sys-kernel/linux-firmware-20120125
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-0
-mirror://gentoo/linux-firmware-20120125.tar.gz
-
-http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-GPL-1 GPL-2 GPL-3 BSD freedist
-Linux firmware files
-amd64 arm ~ia64 x86
-portability savedconfig
-savedconfig savedconfig
-
-
-
-4
-
-install postinst preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/linux-firmware-20120219 b/metadata/cache/sys-kernel/linux-firmware-20120219
deleted file mode 100644
index 7f564392144d..000000000000
--- a/metadata/cache/sys-kernel/linux-firmware-20120219
+++ /dev/null
@@ -1,22 +0,0 @@
-
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-0
-mirror://gentoo/linux-firmware-20120219.tar.gz
-
-http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-GPL-1 GPL-2 GPL-3 BSD freedist
-Linux firmware files
-~amd64 ~arm ~ia64 ~x86
-portability savedconfig
-savedconfig savedconfig
-
-
-
-4
-
-install postinst preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/linux-firmware-20120502 b/metadata/cache/sys-kernel/linux-firmware-20120502
index 598b1160907f..2d6e6313cdc1 100644
--- a/metadata/cache/sys-kernel/linux-firmware-20120502
+++ b/metadata/cache/sys-kernel/linux-firmware-20120502
@@ -1,5 +1,5 @@
 
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
+!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl2030-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
 0
 mirror://gentoo/linux-firmware-20120502.tar.xz
 
diff --git a/metadata/cache/sys-kernel/linux-firmware-99999999 b/metadata/cache/sys-kernel/linux-firmware-99999999
index b0ed42130c0e..388331fdf27c 100644
--- a/metadata/cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/cache/sys-kernel/linux-firmware-99999999
@@ -1,5 +1,5 @@
 dev-vcs/git
-!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
+!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl2030-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
 0
 
 
diff --git a/metadata/cache/virtual/pkgconfig-0 b/metadata/cache/virtual/pkgconfig-0
index e31222503e6c..27d02d7f928a 100644
--- a/metadata/cache/virtual/pkgconfig-0
+++ b/metadata/cache/virtual/pkgconfig-0
@@ -1,5 +1,5 @@
-|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
-|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
+|| ( >=dev-util/pkgconfig-0.26 dev-util/pkgconf[pkg-config] dev-util/pkg-config-lite dev-util/pkgconfig-openbsd[pkg-config] )
+|| ( >=dev-util/pkgconfig-0.26 dev-util/pkgconf[pkg-config] dev-util/pkg-config-lite dev-util/pkgconfig-openbsd[pkg-config] )
 0
 
 
diff --git a/metadata/cache/www-client/chromium-21.0.1155.2 b/metadata/cache/www-client/chromium-21.0.1171.0
similarity index 61%
rename from metadata/cache/www-client/chromium-21.0.1155.2
rename to metadata/cache/www-client/chromium-21.0.1171.0
index f9ff397b141c..c5dd28163c11 100644
--- a/metadata/cache/www-client/chromium-21.0.1155.2
+++ b/metadata/cache/www-client/chromium-21.0.1171.0
@@ -1,7 +1,7 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1155.2.tar.bz2
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1171.0.tar.bz2
 
 http://chromium.org/
 BSD
diff --git a/metadata/cache/www-client/chromium-9999-r1 b/metadata/cache/www-client/chromium-9999-r1
index 148d5527ad93..369808a24b93 100644
--- a/metadata/cache/www-client/chromium-9999-r1
+++ b/metadata/cache/www-client/chromium-9999-r1
@@ -1,5 +1,5 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 live
 
 
diff --git a/metadata/cache/www-client/opera-12.00.1448 b/metadata/cache/www-client/opera-12.00.1448
deleted file mode 100644
index 43ab2fe93a52..000000000000
--- a/metadata/cache/www-client/opera-12.00.1448
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-12.00.1456 b/metadata/cache/www-client/opera-12.00.1456
new file mode 100644
index 000000000000..c9bc35b1a5f2
--- /dev/null
+++ b/metadata/cache/www-client/opera-12.00.1456
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+0
+amd64? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.i386.freebsd.tar.xz )
+
+http://www.opera.com/
+OPERA-11 LGPL-2 LGPL-3
+A fast and secure web browser and Internet suite
+~amd64 ~x86 ~x86-fbsd
+eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
+elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/opera-next-12.00.1440 b/metadata/cache/www-client/opera-next-12.00.1440
deleted file mode 100644
index fdee2afd8b01..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1440
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1441 b/metadata/cache/www-client/opera-next-12.00.1441
deleted file mode 100644
index 0076d162d85d..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1441
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1445 b/metadata/cache/www-client/opera-next-12.00.1445
deleted file mode 100644
index 92f02fc78575..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1445
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1448 b/metadata/cache/www-client/opera-next-12.00.1448
deleted file mode 100644
index e152ba1976e8..000000000000
--- a/metadata/cache/www-client/opera-next-12.00.1448
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-0
-amd64? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.i386.freebsd.tar.xz )
-
-http://www.opera.com/
-OPERA-11 LGPL-2 LGPL-3
-A fast and secure web browser and Internet suite
-~amd64 ~x86 ~x86-fbsd
-eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
-elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-
-
-
-4
-
-install postinst postrm preinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/opera-next-12.00.1456 b/metadata/cache/www-client/opera-next-12.00.1456
new file mode 100644
index 000000000000..9d67e1649bbb
--- /dev/null
+++ b/metadata/cache/www-client/opera-next-12.00.1456
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+0
+amd64? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.i386.freebsd.tar.xz )
+
+http://www.opera.com/
+OPERA-11 LGPL-2 LGPL-3
+A fast and secure web browser and Internet suite
+~amd64 ~x86 ~x86-fbsd
+eutils fdo-mime gnome2-utils multilib pax-utils toolchain-funcs user versionator
+elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/qupzilla-1.2.0 b/metadata/cache/www-client/qupzilla-1.2.0
index 58d029adb011..7e450dc2f340 100644
--- a/metadata/cache/www-client/qupzilla-1.2.0
+++ b/metadata/cache/www-client/qupzilla-1.2.0
@@ -1,7 +1,7 @@
 >=x11-libs/qt-core-4.7:4 >=x11-libs/qt-dbus-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4 >=x11-libs/qt-webkit-4.7:4
 >=x11-libs/qt-core-4.7:4 >=x11-libs/qt-dbus-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4 >=x11-libs/qt-webkit-4.7:4
 0
-https://github.com/nowrep/QupZilla/tarball/v1.2.0 -> qupzilla-1.2.0.tar.gz
+https://github.com/QupZilla/qupzilla/tarball/v1.2.0 -> qupzilla-1.2.0.tar.gz
 
 http://www.qupzilla.com/
 GPL-3
diff --git a/metadata/cache/www-client/w3m-0.5.3-r2 b/metadata/cache/www-client/w3m-0.5.3-r2
index 0bf6be2bf097..41d6ad9b41bd 100644
--- a/metadata/cache/www-client/w3m-0.5.3-r2
+++ b/metadata/cache/www-client/w3m-0.5.3-r2
@@ -1,5 +1,5 @@
->=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
->=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
+>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( vanilla? ( x11-libs/gtk+:2 ) !vanilla? ( x11-libs/gdk-pixbuf ) ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
+>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( vanilla? ( x11-libs/gtk+:2 ) !vanilla? ( x11-libs/gdk-pixbuf ) ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
 0
 mirror://sourceforge/w3m/w3m-0.5.3.tar.gz
 
diff --git a/metadata/cache/www-servers/nginx-1.1.19 b/metadata/cache/www-servers/nginx-1.1.19
deleted file mode 100644
index 396d80223281..000000000000
--- a/metadata/cache/www-servers/nginx-1.1.19
+++ /dev/null
@@ -1,22 +0,0 @@
-pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl )
-pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-0
-http://nginx.org/download/nginx-1.1.19.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-
-http://nginx.org
-as-is BSD BSD-2 GPL-2 MIT
-Robust, small and high performance http and reverse proxy server
-~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base eutils flag-o-matic multilib multiprocessing perl-module ssl-cert toolchain-funcs user
-aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
-pcre-jit? ( pcre )
-vim-syntax? ( app-vim/nginx-syntax )
-
-4
-
-compile configure install postinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-servers/nginx-1.2.0 b/metadata/cache/www-servers/nginx-1.2.0
deleted file mode 100644
index 050a48bc2389..000000000000
--- a/metadata/cache/www-servers/nginx-1.2.0
+++ /dev/null
@@ -1,22 +0,0 @@
-pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl )
-pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-0
-http://nginx.org/download/nginx-1.2.0.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-
-http://nginx.org
-as-is BSD BSD-2 GPL-2 MIT
-Robust, small and high performance http and reverse proxy server
-~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-base eutils flag-o-matic multilib multiprocessing perl-module ssl-cert toolchain-funcs user
-aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
-pcre-jit? ( pcre )
-vim-syntax? ( app-vim/nginx-syntax )
-
-4
-
-compile configure install postinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-servers/nginx-1.2.1 b/metadata/cache/www-servers/nginx-1.2.1
index 0ea44e96b395..1137ffd10227 100644
--- a/metadata/cache/www-servers/nginx-1.2.1
+++ b/metadata/cache/www-servers/nginx-1.2.1
@@ -6,7 +6,7 @@ http://nginx.org/download/nginx-1.2.1.tar.gz nginx_modules_http_upload_progress?
 http://nginx.org
 as-is BSD BSD-2 GPL-2 MIT
 Robust, small and high performance http and reverse proxy server
-~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base eutils flag-o-matic multilib multiprocessing perl-module ssl-cert toolchain-funcs user
 aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
 pcre-jit? ( pcre )
diff --git a/metadata/cache/x11-base/xorg-server-1.9.5-r1 b/metadata/cache/x11-base/xorg-server-1.9.5-r1
new file mode 100644
index 000000000000..58c58a0a070c
--- /dev/null
+++ b/metadata/cache/x11-base/xorg-server-1.9.5-r1
@@ -0,0 +1,22 @@
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=sys-fs/udev-150 ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.0.99.3 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) doc? ( >=app-doc/doxygen-1.6.1 app-text/xmlto ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) >=x11-apps/xinit-1.3 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=sys-fs/udev-150 )
+0
+http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.9.5.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+X.Org X servers
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator xorg-2
+dmx kdrive xnest xorg xvfb doc ipv6 minimal nptl tslib +udev static-libs
+
+xorg? ( >=x11-base/xorg-drivers-1.9 )
+
+3
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-plugins/asclock-2.0.12-r1 b/metadata/cache/x11-plugins/asclock-2.0.12-r1
index 17a7afd1f51b..c76f032e6027 100644
--- a/metadata/cache/x11-plugins/asclock-2.0.12-r1
+++ b/metadata/cache/x11-plugins/asclock-2.0.12-r1
@@ -6,7 +6,7 @@ http://www.tigr.net/afterstep/download/asclock/asclock-2.0.12.tar.gz
 http://www.tigr.net/afterstep/list.pl
 GPL-2
 Clock applet for AfterStep
-~amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5b7839fb047d..54f507a3edd1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jun 2012 10:07:49 +0000
+Wed, 13 Jun 2012 05:37:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5b7839fb047d..54f507a3edd1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jun 2012 10:07:49 +0000
+Wed, 13 Jun 2012 05:37:44 +0000
diff --git a/metadata/md5-cache/app-arch/dpkg-1.16.4.2 b/metadata/md5-cache/app-arch/dpkg-1.16.4.2-r1
similarity index 97%
rename from metadata/md5-cache/app-arch/dpkg-1.16.4.2
rename to metadata/md5-cache/app-arch/dpkg-1.16.4.2-r1
index 56ff11a775ee..830812a0972e 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.16.4.2
+++ b/metadata/md5-cache/app-arch/dpkg-1.16.4.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=dselect? ( nls )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.16.4.2.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ce714bd53014f0deafb4eab361693e4c
+_md5_=063d524421f281d8705a2fa834243156
diff --git a/metadata/md5-cache/app-doc/elisp-manual-23.4 b/metadata/md5-cache/app-doc/elisp-manual-23.4
index 1f065afe407d..6ca5ee6463ea 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-23.4
+++ b/metadata/md5-cache/app-doc/elisp-manual-23.4
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=The GNU Emacs Lisp Reference Manual
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/emacs/manual/
-KEYWORDS=amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd
 LICENSE=FDL-1.3
 SLOT=23
 SRC_URI=mirror://gentoo/elisp-manual-23.4.tar.xz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0e5e98fe0e1a0b53817e5763df330a25
+_md5_=2402c9bd8c3363aeea8bd6299eddfaf1
diff --git a/metadata/md5-cache/app-misc/scrub-2.5.1 b/metadata/md5-cache/app-misc/scrub-2.5.1
new file mode 100644
index 000000000000..8f7a48420550
--- /dev/null
+++ b/metadata/md5-cache/app-misc/scrub-2.5.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=write patterns on disk/file
+EAPI=4
+HOMEPAGE=http://code.google.com/p/diskscrub/
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://diskscrub.googlecode.com/files/scrub-2.5.1.tar.gz
+_md5_=309b2e4b8bec829ee2e859cfe59da0ea
diff --git a/metadata/md5-cache/app-shells/autojump-14 b/metadata/md5-cache/app-shells/autojump-14
deleted file mode 100644
index 6c3255970323..000000000000
--- a/metadata/md5-cache/app-shells/autojump-14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/python
-DESCRIPTION=change directory command that learns
-EAPI=3
-HOMEPAGE=http://github.com/joelthelion/autojump
-IUSE=bash-completion gtk zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=gtk? ( dev-python/pygtk:2 ) bash-completion? ( >=app-shells/bash-4 ) zsh-completion? ( app-shells/zsh app-shells/zsh-completion ) dev-lang/python
-SLOT=0
-SRC_URI=mirror://gentoo/autojump_v14.tar.gz
-_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=d2bacdd9e8beeb21a045601d216a2662
diff --git a/metadata/md5-cache/app-shells/autojump-20.9 b/metadata/md5-cache/app-shells/autojump-20.9
index 56ef4e938650..181a59ae4a69 100644
--- a/metadata/md5-cache/app-shells/autojump-20.9
+++ b/metadata/md5-cache/app-shells/autojump-20.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=gtk? ( dev-python/pygtk:2 ) bash-completion? ( >=app-shells/bash-4 ) zsh-completion? ( app-shells/zsh app-shells/zsh-completion ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=https://github.com/joelthelion/autojump/tarball/release-v20-9 -> autojump-20.9.tar.gz
-_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=20ed0e254d07c785fb38da4a87aee94b
+_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	vcs-snapshot	07df4a337a309c0aa605525027917677
+_md5_=e773ab388530cb3729d5d4939275caf8
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.4.0 b/metadata/md5-cache/dev-cpp/gmock-1.4.0
index 76cbf190d822..ce1117e26bf4 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.4.0
+++ b/metadata/md5-cache/dev-cpp/gmock-1.4.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/gtest-1.4.0
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.4.0.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=72ce99d2cc2a6d68a46182bd31cc9f0c
+_md5_=cfd3be0cbf37dfaa5ca2d79c3806c347
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.5.0 b/metadata/md5-cache/dev-cpp/gmock-1.5.0
index a04a77c6937b..cbd034d9c14c 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.5.0
+++ b/metadata/md5-cache/dev-cpp/gmock-1.5.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/gtest-1.5.0
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.5.0.tar.bz2
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=ba4ee509bebc643cfcfe20a3e1bcaf0d
+_md5_=77979916ee7576d039995ae36028dd14
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.6.0 b/metadata/md5-cache/dev-cpp/gmock-1.6.0
index 04319cc9bc69..ec326def2124 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.6.0
+++ b/metadata/md5-cache/dev-cpp/gmock-1.6.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND==dev-cpp/gtest-1.6.0*
+DEPEND=app-arch/unzip =dev-cpp/gtest-1.6.0*
 DESCRIPTION=Google's C++ mocking framework
 EAPI=4
 HOMEPAGE=http://code.google.com/p/googlemock/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND==dev-cpp/gtest-1.6.0*
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.6.0.zip
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=eeef544ca3b8ed871f8794d0921b175b
+_md5_=a92392065dd7b925fb65d95e08cab52f
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.6.0 b/metadata/md5-cache/dev-cpp/gtest-1.6.0
index c55d17487a71..7337950565d6 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.6.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=4
 HOMEPAGE=http://code.google.com/p/googletest/
 IUSE=examples threads static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=BSD
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://googletest.googlecode.com/files/gtest-1.6.0.zip
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=c16007680ed10406545d73c2ecbe0e43
+_md5_=d00dffdd732fe36014d221b20fc55418
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.12.1 b/metadata/md5-cache/dev-db/sqlite-3.7.12.1
index 47199b24fe66..76f4665265d1 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.7.12.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.12.1
@@ -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 ~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
+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-3071201.zip ) tcl? ( http://sqlite.org/sqlite-src-3071201.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071201.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071201.tar.gz ) )
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=65b9477a5d9a58a391877c1c46c3f6ce
+_md5_=51be8ace4d704be99677dd9a98422865
diff --git a/metadata/md5-cache/dev-db/sqlite-3.7.13 b/metadata/md5-cache/dev-db/sqlite-3.7.13
new file mode 100644
index 000000000000..155bccf849e0
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.7.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+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 ~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-3071300.zip ) tcl? ( http://sqlite.org/sqlite-src-3071300.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071300.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071300.tar.gz ) )
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6fb3660228bf1c5007eb710480fa265b
diff --git a/metadata/md5-cache/dev-games/ogre-1.8.0 b/metadata/md5-cache/dev-games/ogre-1.8.0
new file mode 100644
index 000000000000..cba175798ddc
--- /dev/null
+++ b/metadata/md5-cache/dev-games/ogre-1.8.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib ) x11-proto/xf86vidmodeproto virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Object-oriented Graphics Rendering Engine
+EAPI=4
+HOMEPAGE=http://www.ogre3d.org/
+IUSE=+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb test threads tools +zip
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib )
+REQUIRED_USE=threads? ( || ( boost poco tbb ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/ogre/ogre_src_v1-8-0.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=697c42d9884f737616d817f9bce13bfb
diff --git a/metadata/md5-cache/dev-java/maven-bin-1.0.2-r2 b/metadata/md5-cache/dev-java/maven-bin-1.0.2-r2
deleted file mode 100644
index 749f336d2815..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-1.0.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-admin/eselect-maven
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven
-SLOT=1.0
-SRC_URI=mirror://apache/maven/binaries/maven-1.0.2.tar.gz
-_md5_=2da5a6d1008a0c94649dcf52ab34b3b3
diff --git a/metadata/md5-cache/dev-java/maven-bin-1.1-r2 b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
similarity index 58%
rename from metadata/md5-cache/dev-java/maven-bin-1.1-r2
rename to metadata/md5-cache/dev-java/maven-bin-1.1-r3
index 8a9c810d41a7..a44392a15a8b 100644
--- a/metadata/md5-cache/dev-java/maven-bin-1.1-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-1.1-r3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=app-admin/eselect-maven
+DEPEND=|| ( app-admin/eselect-java app-admin/eselect-maven )
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven
+RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven )
 SLOT=1.1
 SRC_URI=mirror://apache/maven/binaries/maven-1.1.tar.gz
-_md5_=85b1c12185d0c028ce176937a7e21ffa
+_md5_=4d263b4f13ee1b188805eb1792ae9fc8
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.10 b/metadata/md5-cache/dev-java/maven-bin-2.0.10
deleted file mode 100644
index 91fe350f9999..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
-SLOT=2.0
-SRC_URI=mirror://apache/maven/binaries/apache-maven-2.0.10-bin.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5813d9f50cdc25ffb18ce30b19752a3f
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
similarity index 72%
rename from metadata/md5-cache/dev-java/maven-bin-2.0.11-r1
rename to metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
index 94743ea7fc39..52ad657f0fa4 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+DEPEND=|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+RDEPEND=>=virtual/jdk-1.4 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=2.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.0.11-bin.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e213798c2129f47aab6cebd63f5fa2da
+_md5_=21d0a1f2d5feef8a994959b4d5497955
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.1.0 b/metadata/md5-cache/dev-java/maven-bin-2.1.0
deleted file mode 100644
index 990a197d3e9c..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=2.1
-SRC_URI=mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6916b7e06121d4fa176e38f224096ee5
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1 b/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1
deleted file mode 100644
index 0fe6f5a126e9..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-2.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=2.1
-SRC_URI=mirror://apache/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ce518eec32f169155966ad805bb6a1c7
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
similarity index 71%
rename from metadata/md5-cache/dev-java/maven-bin-2.2.1-r1
rename to metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
index 2075bb9397ff..60d8135cba45 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=2.2
 SRC_URI=mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b41aa0394826aad5097edd520ef9dcee
+_md5_=ae3b6b9214aa259c51f28596350012be
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0 b/metadata/md5-cache/dev-java/maven-bin-3.0
deleted file mode 100644
index caa7b3136bac..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=3.0
-SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fda3c6d157b78e6af189362b13f2e07b
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.2 b/metadata/md5-cache/dev-java/maven-bin-3.0.2
deleted file mode 100644
index bc1a65690536..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=3.0
-SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.2-bin.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=86b978de5f4af01a9c031538ac75f3ad
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.3 b/metadata/md5-cache/dev-java/maven-bin-3.0.3
deleted file mode 100644
index c147079f4c6f..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=3.0
-SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=79ac1e4e5631bc3b6fb12fe217875d0e
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1
deleted file mode 100644
index 114f372ba5ec..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=4
-HOMEPAGE=http://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
-SLOT=3.0
-SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=20a7777c2f08ea36f2ff69fc61afb0b3
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4 b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
similarity index 71%
rename from metadata/md5-cache/dev-java/maven-bin-3.0.4
rename to metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
index f3b1375473a3..f7c787c43bb9 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=4
 HOMEPAGE=http://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-admin/eselect-maven >=dev-java/java-config-2.1.9-r1
+RDEPEND=>=virtual/jdk-1.5 || ( app-admin/eselect-java app-admin/eselect-maven ) >=dev-java/java-config-2.1.9-r1
 SLOT=3.0
 SRC_URI=mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=54529644c091a6e7a27985e11be21300
+_md5_=24b22d83e031d9c226215ea953018f49
diff --git a/metadata/md5-cache/dev-java/proxool-0.8.3-r2 b/metadata/md5-cache/dev-java/proxool-0.8.3-r2
index aedcc427fcca..6f55ff59f410 100644
--- a/metadata/md5-cache/dev-java/proxool-0.8.3-r2
+++ b/metadata/md5-cache/dev-java/proxool-0.8.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Proxool is a Java connection pool.
 EAPI=4
 HOMEPAGE=http://proxool.sourceforge.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2
 RDEPEND=dev-java/avalon-framework:4.2 dev-java/avalon-logkit:2.0 dev-java/log4j:0 dev-java/mx4j-core:3.0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/proxool/proxool-0.8.3-source.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	f12d7295133e77160a42c2f1ec69a43d	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=89ecf39448d3301a0ce706ca19407b7b
+_md5_=166fbe70132b700bdf093524f86d7b6f
diff --git a/metadata/md5-cache/dev-lang/go-1.0.1 b/metadata/md5-cache/dev-lang/go-1.0.1
index f48c1a7534b8..c704321959c6 100644
--- a/metadata/md5-cache/dev-lang/go-1.0.1
+++ b/metadata/md5-cache/dev-lang/go-1.0.1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.golang.org
 IUSE=bash-completion emacs vim-syntax zsh-completion pax_kernel
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=BSD
-RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( app-editors/vim ) zsh-completion? ( app-shells/zsh-completion ) pax_kernel? ( sys-apps/paxctl )
+RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion ) pax_kernel? ( sys-apps/paxctl )
 SLOT=0
 SRC_URI=http://go.googlecode.com/files/go1.0.1.src.tar.gz
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4ffa46d9d6006872f8abde1ebaf395c3
+_md5_=c87f849ea71eacec4ea7fe813c31e1fc
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index 4309ecb5007f..405fe40ed787 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -5,7 +5,7 @@ EAPI=4
 HOMEPAGE=http://www.golang.org
 IUSE=bash-completion emacs vim-syntax zsh-completion
 LICENSE=BSD
-RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( app-editors/vim ) zsh-completion? ( app-shells/zsh-completion )
+RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
 SLOT=0
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	e9ac199862f908195424dc48ca2de8f6	mercurial	add64e64d758a9618d46a08a95f77483	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0ce7efec3b153740b0bd8980bf7a1384
+_md5_=104681b6fecc1c04d34d0ef2cffea61b
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.6.7 b/metadata/md5-cache/dev-libs/userspace-rcu-0.7.3
similarity index 68%
rename from metadata/md5-cache/dev-libs/userspace-rcu-0.6.7
rename to metadata/md5-cache/dev-libs/userspace-rcu-0.7.3
index d372059b2bac..a72e059ae31a 100644
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.6.7
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.7.3
@@ -7,5 +7,5 @@ IUSE=static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
-SRC_URI=http://lttng.org/files/urcu/userspace-rcu-0.6.7.tar.bz2
-_md5_=b94d3737801f97c0ad73893c46118ef2
+SRC_URI=http://lttng.org/files/urcu/userspace-rcu-0.7.3.tar.bz2
+_md5_=61d2a6f42ddb4409578435f54e4572ad
diff --git a/metadata/md5-cache/dev-ml/camomile-0.8.3 b/metadata/md5-cache/dev-ml/camomile-0.8.3
deleted file mode 100644
index 5951218a7251..000000000000
--- a/metadata/md5-cache/dev-ml/camomile-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Camomile is a comprehensive Unicode library for ocaml.
-EAPI=2
-HOMEPAGE=http://camomile.sourceforge.net/
-IUSE=debug +ocamlopt
-KEYWORDS=~amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?]
-SLOT=0
-SRC_URI=mirror://sourceforge/camomile/camomile-0.8.3.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d3abfe38f4dce9c2c45d9e7d0fabdbc8
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.4 b/metadata/md5-cache/dev-ml/cryptokit-1.4
deleted file mode 100644
index 95e2ded8e096..000000000000
--- a/metadata/md5-cache/dev-ml/cryptokit-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] zlib? ( >=sys-libs/zlib-1.1 ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Cryptographic primitives library for Objective Caml
-EAPI=2
-HOMEPAGE=http://forge.ocamlcore.org/projects/cryptokit/
-IUSE=debug doc +ocamlopt zlib
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] zlib? ( >=sys-libs/zlib-1.1 )
-SLOT=0
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/460/cryptokit-1.4.tar.gz
-_eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=89acda55c292f702ed811d3235796718
diff --git a/metadata/md5-cache/dev-ml/oasis-0.3.0_rc5 b/metadata/md5-cache/dev-ml/oasis-0.3.0_rc5
deleted file mode 100644
index 5fc55829de8d..000000000000
--- a/metadata/md5-cache/dev-ml/oasis-0.3.0_rc5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ocaml-data-notation-0.0.3 dev-ml/ocamlify dev-ml/ocamlmod test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-1.1.0 >=dev-ml/ocaml-expect-0.0.2 dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
-DESCRIPTION=OASIS is a tool to integrate a configure, build and install system in OCaml project
-EAPI=3
-HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-linking-exception
-RDEPEND=>=dev-ml/ocaml-data-notation-0.0.3 >=dev-lang/ocaml-3.12[ocamlopt?]
-SLOT=0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/855/oasis-0.3.0~rc5.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	oasis	b06dffa6b9fecb81ede1ade7fead8438	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0f5835be03f686692d945d37b02f1201
diff --git a/metadata/md5-cache/dev-ml/ounit-1.1.0 b/metadata/md5-cache/dev-ml/ounit-1.1.0
deleted file mode 100644
index 797b7c294dd3..000000000000
--- a/metadata/md5-cache/dev-ml/ounit-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=2
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=debug doc +ocamlopt
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?]
-SLOT=0
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz
-_eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=dfc5a65d5f347165f2c8544efe9b2b8e
diff --git a/metadata/md5-cache/dev-ml/ounit-1.1.2 b/metadata/md5-cache/dev-ml/ounit-1.1.2
new file mode 100644
index 000000000000..d9b1afa2fef3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ounit-1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
+DESCRIPTION=Unit testing framework for OCaml
+EAPI=3
+HOMEPAGE=http://ounit.forge.ocamlcore.org/
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-3.12[ocamlopt?]
+SLOT=0
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	oasis	b06dffa6b9fecb81ede1ade7fead8438	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=4f0f4d3b3afe3137ddb85dccbdae9fc3
diff --git a/metadata/md5-cache/dev-ml/pxp-1.2.3 b/metadata/md5-cache/dev-ml/pxp-1.2.3
new file mode 100644
index 000000000000..b5074fda4fe4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pxp-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-ml/pcre-ocaml-4.31 >=dev-ml/ulex-0.5 >=dev-ml/ocamlnet-0.98 >=dev-lang/ocaml-3.10.2[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=validating XML parser library for O'Caml
+EAPI=2
+HOMEPAGE=http://projects.camlcity.org/projects/pxp.html
+IUSE=examples +ocamlopt
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=as-is
+RDEPEND=>=dev-ml/pcre-ocaml-4.31 >=dev-ml/ulex-0.5 >=dev-ml/ocamlnet-0.98 >=dev-lang/ocaml-3.10.2[ocamlopt?]
+SLOT=0
+SRC_URI=http://download.camlcity.org/download/pxp-1.2.3.tar.gz
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=102c9731931671d590e94dded0d39b5d
diff --git a/metadata/md5-cache/dev-ml/tyxml-2.1 b/metadata/md5-cache/dev-ml/tyxml-2.1
new file mode 100644
index 000000000000..d78edd194a35
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/tyxml-2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/ocaml-3.12[ocamlopt?] dev-ml/ocamlnet ocamlduce? ( dev-ml/ocamlduce ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=A libary to build xml trees typechecked by OCaml
+EAPI=4
+HOMEPAGE=http://ocsigen.org/tyxml/
+IUSE=doc ocamlduce +ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12[ocamlopt?] dev-ml/ocamlnet ocamlduce? ( dev-ml/ocamlduce )
+SLOT=0
+SRC_URI=http://www.ocsigen.org/download/tyxml-2.1.tar.gz
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=e02805e46f70dea922f3d453442ca0b6
diff --git a/metadata/md5-cache/dev-python/enthoughtbase-3.1.0 b/metadata/md5-cache/dev-python/enthoughtbase-3.1.0
index 6438ccfa14e1..82d3572b6d28 100644
--- a/metadata/md5-cache/dev-python/enthoughtbase-3.1.0
+++ b/metadata/md5-cache/dev-python/enthoughtbase-3.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare test
 DEPEND=dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/etsdevtools dev-python/nose dev-python/traits media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Core packages for the Enthought Tool Suite
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/enthought_base/ http://pypi.python.org/pypi/EnthoughtBase
+HOMEPAGE=http://code.enthought.com/projects/enthought_base/
 IUSE=doc examples test test
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD LGPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/EnthoughtBase-3.1.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=91a05ecadaab7270816f8098809c4b56
+_md5_=90c35d5b052c8fad1482b2e2fd4b308d
diff --git a/metadata/md5-cache/dev-python/envisagecore-3.2.0 b/metadata/md5-cache/dev-python/envisagecore-3.2.0
index a699514e34be..cdd59569a12a 100644
--- a/metadata/md5-cache/dev-python/envisagecore-3.2.0
+++ b/metadata/md5-cache/dev-python/envisagecore-3.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare test
 DEPEND=>=dev-python/apptools-3.4.1 >=dev-python/enthoughtbase-3.1.0 dev-python/setuptools >=dev-python/traits-3.6.0 doc? ( dev-python/sphinx ) test? ( dev-python/coverage dev-python/nose media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Enthought Tool Suite: Extensible application framework
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/envisage/ http://pypi.python.org/pypi/EnvisageCore
+HOMEPAGE=http://code.enthought.com/projects/envisage/
 IUSE=doc examples test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/apptools-3.4.1 >=dev-python/enthoughtbase-3.1.0 dev-python/
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/EnvisageCore-3.2.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=de02bb2cf483899df7a94cc0269e1ab0
+_md5_=ea17ce088a3b9f723c3824bfbd04ea58
diff --git a/metadata/md5-cache/dev-python/envisageplugins-3.2.0 b/metadata/md5-cache/dev-python/envisageplugins-3.2.0
index d78c66914995..0b7b88060bc7 100644
--- a/metadata/md5-cache/dev-python/envisageplugins-3.2.0
+++ b/metadata/md5-cache/dev-python/envisageplugins-3.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare test
 DEPEND=>=dev-python/envisagecore-3.2.0 dev-python/setuptools >=dev-python/traitsgui-3.6.0 test? ( dev-python/coverage dev-python/nose media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Enthought Tool Suite: Plug-ins for the Envisage framework
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/envisage_plugins.php http://pypi.python.org/pypi/EnvisagePlugins
+HOMEPAGE=http://code.enthought.com/projects/envisage_plugins.php
 IUSE=examples test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/envisagecore-3.2.0 dev-python/setuptools >=dev-python/trait
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/EnvisagePlugins-3.2.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=b29fd2a1e86dc6a15b53d53aed982a95
+_md5_=db202002058d98b797bf58f3b80e6252
diff --git a/metadata/md5-cache/dev-python/nose-cover3-0.1.0 b/metadata/md5-cache/dev-python/nose-cover3-0.1.0
index 8306367c0a71..8e4678a841fd 100644
--- a/metadata/md5-cache/dev-python/nose-cover3-0.1.0
+++ b/metadata/md5-cache/dev-python/nose-cover3-0.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare setup test
 DEPEND=dev-python/nose dev-python/setuptools || ( =dev-lang/python-3* =dev-lang/python-2* ) test? ( dev-python/nose )
 DESCRIPTION=Coverage 3.x support for Nose
 EAPI=4
-HOMEPAGE=https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nosecover3
+HOMEPAGE=https://github.com/ask/nosecover3 http://pypi.python.org/pypi/nose-cover3
 IUSE=test test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-python/nose || ( =dev-lang/python-3* =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-cover3/nose-cover3-0.1.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=3b72b811e4aaca4e1cf24cd720612042
+_md5_=87d0f6d6637c8fd84829fc64318d3d3c
diff --git a/metadata/md5-cache/dev-python/pyside-1.1.0-r1 b/metadata/md5-cache/dev-python/pyside-1.1.0-r1
deleted file mode 100644
index 63cd88ef8843..000000000000
--- a/metadata/md5-cache/dev-python/pyside-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) >=dev-python/generatorrunner-0.6.16 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X )
-SLOT=0
-SRC_URI=http://www.pyside.org/files/pyside-qt4.7+1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=c6c411923f3c9ad97415c3e9eb13b399
diff --git a/metadata/md5-cache/dev-python/shiboken-1.1.0-r2 b/metadata/md5-cache/dev-python/shiboken-1.1.0-r2
deleted file mode 100644
index c185a57f3d39..000000000000
--- a/metadata/md5-cache/dev-python/shiboken-1.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-python/apiextractor-0.10.10 >=dev-python/generatorrunner-0.6.16 >=x11-libs/qt-core-4.7.0:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A tool for creating Python bindings for C++ libraries
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/apiextractor-0.10.10 >=dev-python/generatorrunner-0.6.16 >=x11-libs/qt-core-4.7.0:4 || ( =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://www.pyside.org/files/shiboken-1.1.0.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ba5f38f6f41b23df0ae372c28ef083c4
diff --git a/metadata/md5-cache/dev-python/traitsbackendqt-3.6.0 b/metadata/md5-cache/dev-python/traitsbackendqt-3.6.0
index 6c0421ae5a91..61ca70556834 100644
--- a/metadata/md5-cache/dev-python/traitsbackendqt-3.6.0
+++ b/metadata/md5-cache/dev-python/traitsbackendqt-3.6.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=dev-python/PyQt4[X] dev-python/setuptools =dev-lang/python-2*
 DESCRIPTION=PyQt backend for Traits and TraitsGUI (Pyface)
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendQt
+HOMEPAGE=http://code.enthought.com/projects/traits_gui/
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/PyQt4[X] dev-python/setuptools =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/TraitsBackendQt-3.6.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=2ce639b1d6c7b065b1de131cd6856080
+_md5_=7e84e652755f36fac6e3feec09a4af24
diff --git a/metadata/md5-cache/dev-python/traitsbackendwx-3.6.0 b/metadata/md5-cache/dev-python/traitsbackendwx-3.6.0
index b7da572005ea..2f7d37b2dc42 100644
--- a/metadata/md5-cache/dev-python/traitsbackendwx-3.6.0
+++ b/metadata/md5-cache/dev-python/traitsbackendwx-3.6.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=dev-python/setuptools dev-python/wxpython:2.8 =dev-lang/python-2*
 DESCRIPTION=WxPython backend for Traits and TraitsGUI (Pyface)
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsBackendWX
+HOMEPAGE=http://code.enthought.com/projects/traits_gui/
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools dev-python/wxpython:2.8 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/TraitsBackendWX-3.6.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=90c39d68bd704e5e92b0da2a0afdc7ab
+_md5_=bbe3e6b33d0cfc100620bafc533be55f
diff --git a/metadata/md5-cache/dev-python/traitsgui-3.6.0-r1 b/metadata/md5-cache/dev-python/traitsgui-3.6.0-r1
index 271a2b6dfd9a..3f7a6e287eb9 100644
--- a/metadata/md5-cache/dev-python/traitsgui-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/traitsgui-3.6.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=>=dev-python/enthoughtbase-3.1.0 dev-python/setuptools >=dev-python/traits-3.6.0 qt4? ( >=dev-python/traitsbackendqt-3.6.0 ) wxwidgets? ( >=dev-python/traitsbackendwx-3.6.0 ) !wxwidgets? ( !qt4? ( >=dev-python/traitsbackendwx-3.6.0 ) ) =dev-lang/python-2*
 DESCRIPTION=Traits-capable windowing framework
 EAPI=3
-HOMEPAGE=http://code.enthought.com/projects/traits_gui/ http://pypi.python.org/pypi/TraitsGUI
+HOMEPAGE=http://code.enthought.com/projects/traits_gui/
 IUSE=doc examples qt4 wxwidgets
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/enthoughtbase-3.1.0 dev-python/setuptools >=dev-python/trai
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/TraitsGUI-3.6.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5da61013b7e29292c16fce6aad8ee407
+_md5_=a09102e6fdbaa7b5118d547705969b57
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.10 b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.10
index 1207f7e0d76d..d0a3a02ad460 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.10
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.10
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_rbx? ( test? ( dev-ruby/rake[ruby_targets_rbx] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_rbx? ( virtual/rubygems[ruby_targets_rbx] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_rbx? ( virtual/rubygems[ruby_targets_rbx] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=3
-HOMEPAGE=http://github.com/nex3/ruby-progressbar
+HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby ruby_targets_rbx test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( Ruby GPL-2 )
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-la
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-0.0.10.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3227419e58157b0a892ebc766681549f
+_md5_=c60350539555f76b3dfb2410fcb14358
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9 b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9
index 0f863e1cd332..7ec46e28e9d8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=2
-HOMEPAGE=http://github.com/nex3/ruby-progressbar
+HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Ruby GPL-2 )
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtua
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-0.0.9.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4e1862fcd4cec6df6dd40a26421b2f20
+_md5_=b6527607e36d3e3b3bd319f971e16077
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9-r1
index baeb4dad1ec8..047219206f14 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-0.0.9-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=2
-HOMEPAGE=http://github.com/nex3/ruby-progressbar
+HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( Ruby GPL-2 )
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-la
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-0.0.9.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b067473f1e94da59049fa04bc69722f6
+_md5_=b1d70c42b6e6426cbee049c2bc3ed27b
diff --git a/metadata/md5-cache/dev-ruby/spork-0.8.4-r1 b/metadata/md5-cache/dev-ruby/spork-0.8.4-r1
index 9e05ddfe1dc0..19b1b92b036e 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.8.4-r1
+++ b/metadata/md5-cache/dev-ruby/spork-0.8.4-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( dev-util/cucumber[ruby_targets_ruby18] >=dev-ruby/rspec-1.2.9:0[ruby_targets_ruby18] >=dev-ruby/rspec-rails-1.2.9[ruby_targets_ruby18] dev-util/cucumber-rails[ruby_targets_ruby18] >=dev-ruby/rails-2.3[ruby_targets_ruby18] >=dev-ruby/ruby-debug-0.10.3[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-util/cucumber[ruby_targets_ree18] >=dev-ruby/rspec-1.2.9:0[ruby_targets_ree18] >=dev-ruby/rspec-rails-1.2.9[ruby_targets_ree18] dev-util/cucumber-rails[ruby_targets_ree18] >=dev-ruby/rails-2.3[ruby_targets_ree18] >=dev-ruby/ruby-debug-0.10.3[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Spork is Tim Harper's implementation of test server.
 EAPI=2
-HOMEPAGE=http://github.com/timcharper/spork
+HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lan
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.8.4.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9bec3c64a96f03fcbc7dc87568dc6eb3
+_md5_=3d64ba24484267d087c7727f671c942c
diff --git a/metadata/md5-cache/dev-ruby/spork-0.8.5 b/metadata/md5-cache/dev-ruby/spork-0.8.5
index 5219c78afe1b..6c61dceead47 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.8.5
+++ b/metadata/md5-cache/dev-ruby/spork-0.8.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( dev-util/cucumber[ruby_targets_ruby18] >=dev-ruby/rspec-1.2.9:0[ruby_targets_ruby18] >=dev-ruby/rspec-rails-1.2.9[ruby_targets_ruby18] dev-util/cucumber-rails[ruby_targets_ruby18] >=dev-ruby/rails-2.3[ruby_targets_ruby18] >=dev-ruby/ruby-debug-0.10.3[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-util/cucumber[ruby_targets_ree18] >=dev-ruby/rspec-1.2.9:0[ruby_targets_ree18] >=dev-ruby/rspec-rails-1.2.9[ruby_targets_ree18] dev-util/cucumber-rails[ruby_targets_ree18] >=dev-ruby/rails-2.3[ruby_targets_ree18] >=dev-ruby/ruby-debug-0.10.3[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Spork is Tim Harper's implementation of test server.
 EAPI=2
-HOMEPAGE=http://github.com/timcharper/spork
+HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lan
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.8.5.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dd37309853d083b1f10de9886d64aaf3
+_md5_=e4d0c6a802c884915ef014bf02914c65
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.0 b/metadata/md5-cache/dev-ruby/spork-0.9.0
index af3cf693d5ee..21ea82fbbf7a 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.0
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Spork is Tim Harper's implementation of test server.
 EAPI=2
-HOMEPAGE=http://github.com/timcharper/spork
+HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-la
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.0.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=110c553f4fe073c742de783e0db1c2c1
+_md5_=01e583dd7af65c81976710daed88a23d
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2 b/metadata/md5-cache/dev-ruby/spork-0.9.2
index ade322fd375d..01d92612659f 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Spork is Tim Harper's implementation of test server.
 EAPI=2
-HOMEPAGE=http://github.com/timcharper/spork
+HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-la
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=65749c8a0ecf927abfd6bcd00b99d72e
+_md5_=69ba55f04c028ce6e1aa7123f38e3689
diff --git a/metadata/md5-cache/dev-tex/bibtex2html-1.96 b/metadata/md5-cache/dev-tex/bibtex2html-1.96
deleted file mode 100644
index a332d0424cf7..000000000000
--- a/metadata/md5-cache/dev-tex/bibtex2html-1.96
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.10[ocamlopt?] doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-tex/hevea )
-DESCRIPTION=A bibtex to HTML converter
-EAPI=2
-HOMEPAGE=http://www.lri.fr/~filliatr/bibtex2html/
-IUSE=doc +ocamlopt
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.96.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=151d61790366efe9631735cab84b6b16
diff --git a/metadata/md5-cache/dev-util/aruba-0.4.11 b/metadata/md5-cache/dev-util/aruba-0.4.11
index 6f634d0f205f..803bfc9c6924 100644
--- a/metadata/md5-cache/dev-util/aruba-0.4.11
+++ b/metadata/md5-cache/dev-util/aruba-0.4.11
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby18? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ruby18] >=dev-ruby/childprocess-0.2.3[ruby_targets_ruby18] >=dev-ruby/rspec-2.6[ruby_targets_ruby18] >=dev-util/cucumber-1.1.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ruby19] >=dev-ruby/childprocess-0.2.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6[ruby_targets_ruby19] >=dev-util/cucumber-1.1.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ree18] >=dev-ruby/childprocess-0.2.3[ruby_targets_ree18] >=dev-ruby/rspec-2.6[ruby_targets_ree18] >=dev-util/cucumber-1.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Cucumber steps for driving out command line applications.
 EAPI=4
-HOMEPAGE=https://github.com/aslakhellesoy/aruba
+HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.4.11.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=91cd2cbfaf45bf4f53ef72ad307ed4f2
+_md5_=90a07364ec553b8d96b8093049c968e4
diff --git a/metadata/md5-cache/dev-util/cucumber-0.10.2 b/metadata/md5-cache/dev-util/cucumber-0.10.2
index 59c8483690d8..144985bdf923 100644
--- a/metadata/md5-cache/dev-util/cucumber-0.10.2
+++ b/metadata/md5-cache/dev-util/cucumber-0.10.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.5.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.3.4[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.5.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.3.4[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.3.5[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.3.5[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-0.10.2.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e8823a9f47f1a5a399e6e8119f6b2d89
+_md5_=34dfbe055e21b514804b6a158b6959a5
diff --git a/metadata/md5-cache/dev-util/cucumber-0.10.3 b/metadata/md5-cache/dev-util/cucumber-0.10.3
index e794860428f6..eb29282b6100 100644
--- a/metadata/md5-cache/dev-util/cucumber-0.10.3
+++ b/metadata/md5-cache/dev-util/cucumber-0.10.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.3.6[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.3.6[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.3.8[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.3.8[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-0.10.3.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=53d5c60c6a2abdaf6f299ecbb9c81d78
+_md5_=8b75c034ff0c5cea2e56af57643a81f3
diff --git a/metadata/md5-cache/dev-util/cucumber-0.7.3-r1 b/metadata/md5-cache/dev-util/cucumber-0.7.3-r1
index f331255b5a73..4adb78dbd189 100644
--- a/metadata/md5-cache/dev-util/cucumber-0.7.3-r1
+++ b/metadata/md5-cache/dev-util/cucumber-0.7.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-1.3.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-1.3.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.1[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-1.0.27[ruby_targets_ruby18] <dev-ruby/gherkin-2.0.0[ruby_targets_ruby18] >=dev-ruby/json-1.2.4[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-1.0.27[ruby_targets_ree18] <dev-ruby/gherkin-2.0.0[ruby_targets_ree18] >=dev-ruby/json-1.2.4[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.4[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=3
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-0.7.3.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=693c8c3fef3e81c40144cbe87c295741
+_md5_=c78c417eba7cfb58a0e3d6f8f17e9c53
diff --git a/metadata/md5-cache/dev-util/cucumber-1.0.0 b/metadata/md5-cache/dev-util/cucumber-1.0.0
index 8c31fca2c4f9..7223a8e6bfbf 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-1.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.4.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.4.2[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.4.1[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.4.1[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.0.0.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6c03a9a030ecd98a5be5bbf653202963
+_md5_=a15a89b931d2dcad351f9f12a2198696
diff --git a/metadata/md5-cache/dev-util/cucumber-1.0.1 b/metadata/md5-cache/dev-util/cucumber-1.0.1
index 68254f32c536..eeb1d5c7a017 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-1.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.4.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.4.2[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.4.1[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.4.1[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.0.1.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=af0a902c7f4306649fe0275c6a3f8bad
+_md5_=9acbe2de3383a2148a52486ffa9270b0
diff --git a/metadata/md5-cache/dev-util/cucumber-1.0.2 b/metadata/md5-cache/dev-util/cucumber-1.0.2
index d4f4dbac1259..6923cf14b32c 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.0.2
+++ b/metadata/md5-cache/dev-util/cucumber-1.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.4.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.4.2[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.4.5[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.4.5[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.0.2.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef9d70d38018ac33539455548296d7f2
+_md5_=3aea7fba8c7a73368fca34619448c14f
diff --git a/metadata/md5-cache/dev-util/cucumber-1.0.6 b/metadata/md5-cache/dev-util/cucumber-1.0.6
index bb2bd58b2632..a958c50bb5c9 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.0.6
+++ b/metadata/md5-cache/dev-util/cucumber-1.0.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.4.6[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.4.6[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.4.18[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.4.18[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.0.6.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0f573311ef65d1129bd1c455419eeeb4
+_md5_=5330b543a53176e4a17f85d4b2ea4da1
diff --git a/metadata/md5-cache/dev-util/cucumber-1.1.4 b/metadata/md5-cache/dev-util/cucumber-1.1.4
index 33474777f6ff..b2ce983bf291 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.1.4
+++ b/metadata/md5-cache/dev-util/cucumber-1.1.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby18] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby18] >=dev-util/aruba-0.4.6[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby19] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ruby19] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ruby19] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby19] >=dev-util/aruba-0.4.6[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6.0[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/prawn-layout-0.8.4[ruby_targets_ree18] >=dev-ruby/spork-0.8.4-r1[ruby_targets_ree18] >=dev-ruby/syntax-1.0.0[ruby_targets_ree18] >=dev-util/aruba-0.4.6[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ruby19] >=dev-ruby/json-1.4.6[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=d
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.1.4.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=15905e5bceebf0501db348db52dfcde8
+_md5_=235f57c08e1f81b27ad076b7cb4d715e
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-0.3.2-r1 b/metadata/md5-cache/dev-util/cucumber-rails-0.3.2-r1
index 3ee232805dce..fc8fd991c9b2 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-0.3.2-r1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-0.3.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/rspec[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-util/cucumber-0.6.2[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-util/cucumber-0.6.2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-util/cucumber-0.6.2[ruby_targets_ruby18] )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-rails-0.3.2.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2e7cb81306b186483c9b7e5d26365a07
+_md5_=34690186742ef0d438a184db258f37ca
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.0.6 b/metadata/md5-cache/dev-util/cucumber-rails-1.0.6
index e16e6ff21aa9..4141c716c528 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.0.6
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.0.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-util/cucumber-1.0.6[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/capybara-1.1.1[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-util/cucumber-1.0.6[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/capybara-1.1.1[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-util/cucumber-1.0.6[ruby_targets_ruby18] >=
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.0.6.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e57de3674069c9196fc3a5b7358c035b
+_md5_=6716ae26fd69a11852d7db602d39dbe5
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.2.1 b/metadata/md5-cache/dev-util/cucumber-rails-1.2.1
index 52daff29f2ab..609a65dc7713 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby18] >=dev-ruby/ammeter-0.2.1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ruby19] >=dev-ruby/ammeter-0.2.1[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.6:2[ruby_targets_ree18] >=dev-ruby/ammeter-0.2.1[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby19] >=dev-ruby/capybara-1.1.2[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-util/cucumber-1.1.3[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/capybara-1.1.2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
 DESCRIPTION=Executable feature scenarios for Rails
 EAPI=2
-HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+HOMEPAGE=https://github.com/cucumber/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 KEYWORDS=~amd64
 LICENSE=Ruby
@@ -10,4 +10,4 @@ RDEPEND=ruby_targets_ruby18? ( >=dev-util/cucumber-1.1.3[ruby_targets_ruby18] >=
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.2.1.gem
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9248cb3ba7ed8531533f1ffe2c2b1b93
+_md5_=cd9d3616dec1ff9dc3b99c4241d9f209
diff --git a/metadata/md5-cache/dev-util/pkgconf-0.8 b/metadata/md5-cache/dev-util/pkgconf-0.8
index 0400c5729c29..1755a74f4482 100644
--- a/metadata/md5-cache/dev-util/pkgconf-0.8
+++ b/metadata/md5-cache/dev-util/pkgconf-0.8
@@ -3,10 +3,10 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=4
 HOMEPAGE=https://github.com/nenolod/pkgconf
 IUSE=+pkg-config
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
 SRC_URI=http://tortois.es/~nenolod/distfiles/pkgconf-0.8.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=89c5995df54c9c5e5fccdc128e778947
+_md5_=97dae663c984a09b7dec0f8024e752c4
diff --git a/metadata/md5-cache/games-sports/xmoto-0.5.9 b/metadata/md5-cache/games-sports/xmoto-0.5.9
index f891cfc9a4b0..65cf2e0b9913 100644
--- a/metadata/md5-cache/games-sports/xmoto-0.5.9
+++ b/metadata/md5-cache/games-sports/xmoto-0.5.9
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libxdg-basedir dev-db/sqlite:3 dev-games/ode dev-lang/lua[depre
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/0.7.0/inksmoto-0.7.0.tar.gz )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fb33028e95351af28c39a103ef2ee742
+_md5_=1aecd9d06be04e72d521f5f941062fd1
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1 b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
index 4cef80c12520..74d38f5c94ad 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
 EAPI=4
 HOMEPAGE=http://java.sun.com/products/servlet/
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=as-is
 RDEPEND=|| ( dev-java/tomcat-servlet-api:3.0 dev-java/resin-servlet-api:3.0 ) >=dev-java/java-config-2.1.6
 SLOT=3.0
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	java-virtuals-2	99b1a71af8f8c9fcbab6fe6bc4684a76	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=57b9f7c59a2580c9931784d6d7e880e9
+_md5_=7a14ec45598562c964da50b19552d013
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.10-r1 b/metadata/md5-cache/mail-mta/nullmailer-1.10-r1
new file mode 100644
index 000000000000..57872485e1c1
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=sys-apps/groff ssl? ( net-libs/gnutls ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Simple relay-only local mail transport agent
+EAPI=4
+HOMEPAGE=http://untroubled.org/nullmailer/
+IUSE=ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/shadow virtual/logger ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp
+SLOT=0
+SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.10.tar.gz mirror://debian/pool/main/n/nullmailer/nullmailer_1.10-1.debian.tar.gz
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=884d34f36ce6823c5cd62626932202cf
diff --git a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1 b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
index f25e55ebbf1d..aa252480fdcf 100644
--- a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Cal3D is a skeletal based character animation library
 EAPI=2
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5a762acdbbc86e5d63f6166f3fef5a2a
+_md5_=f983b253b77f70214ae06ad9a4642cd5
diff --git a/metadata/md5-cache/media-libs/jasper-1.900.1-r5 b/metadata/md5-cache/media-libs/jasper-1.900.1-r5
new file mode 100644
index 000000000000..96dd6bedc912
--- /dev/null
+++ b/metadata/md5-cache/media-libs/jasper-1.900.1-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl media-libs/freeglut ) app-arch/unzip
+DESCRIPTION=software-based implementation of the codec specified in the JPEG-2000 Part-1 standard
+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 ~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-20120611.patch.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=dd8c38982465bccdfe080adcad9caa35
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.11-r1 b/metadata/md5-cache/media-libs/jbig2dec-0.11-r1
index 8894713cf585..e7073ae837c9 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint
 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	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=53640cebfeb29acb74f7524541d1b990
+_md5_=5093314e1a8e416ff0027cf42c679151
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index c4b33cdd1485..040838aca4b1 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-1.5.8 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=Video Disk Recorder - Powermate PlugIn
-EAPI=2
+EAPI=4
 HOMEPAGE=http://home.arcor.de/andreas.regel/vdr_plugins.htm
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.8 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://home.arcor.de/andreas.regel/files/powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=bec07a5fae49b26574480c05e161b5ba
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_md5_=3faff5ed569c0d48e095c1bf50eca8c0
diff --git a/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1 b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1
new file mode 100644
index 000000000000..4ebbb343cd25
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-premiereepg-0.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: Support the extended EPG which is sent by german paytv Sky on their portal channels
+EAPI=4
+HOMEPAGE=http://www.muempf.de/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/vdr-1.4.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://www.muempf.de/down/vdr-premiereepg-0.2.0.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_md5_=90adf9551cccf3a32d512fb3b6f8d173
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
new file mode 100644
index 000000000000..f80e6e598bd6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.3.23 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin Proxy - enable grouping of menu entries, online load/unload
+EAPI=4
+HOMEPAGE=http://urichter.cjb.net/vdr/?h=proxy
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://www.mathematik.uni-kassel.de/~urichter/vdr/files/vdr-proxy-0.1.4.tgz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_md5_=5575095891a3721078f148b4b805dbcb
diff --git a/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2 b/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
index 99a73a918200..275f66004eb6 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-skinclassic-0.0.2
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-1.3.27 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=vdr skin: based on classic vdr design
+EAPI=4
 HOMEPAGE=http://www.vdr-wiki.de/wiki/index.php/Skinclassic-plugin
 KEYWORDS=x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.27 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skinclassic-0.0.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=71d9397c953adea5b63037f81e48765c
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_md5_=9b9e81c9fd33f9b2dcbbea5a1abde82e
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7
new file mode 100644
index 000000000000..9e722a6295cb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.6 imagemagick? ( media-gfx/imagemagick ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=Video Disk Recorder - Skin Plugin
+EAPI=4
+HOMEPAGE=http://firefly.vdr-developer.org/skinelchi
+IUSE=imagemagick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.2.7.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	21884d819d0ffc20cb1a63b0894f69ff
+_md5_=6f82f6db735bd13a926042893023775d
diff --git a/metadata/md5-cache/media-video/mkclean-0.8.6 b/metadata/md5-cache/media-video/mkclean-0.8.6
deleted file mode 100644
index 2ce318f30489..000000000000
--- a/metadata/md5-cache/media-video/mkclean-0.8.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=mkclean is a command line tool to clean and optimize Matroska files
-EAPI=4
-HOMEPAGE=http://www.matroska.org/downloads/mkclean.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.6.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d0470e2b205c24fcb4ef2a72343a4de3
diff --git a/metadata/md5-cache/media-video/mkclean-0.8.6-r1 b/metadata/md5-cache/media-video/mkclean-0.8.6-r1
index 544a292b0f45..d11478ab602c 100644
--- a/metadata/md5-cache/media-video/mkclean-0.8.6-r1
+++ b/metadata/md5-cache/media-video/mkclean-0.8.6-r1
@@ -7,4 +7,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.6.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=adccc1c976068b08bb7cfa69dab14190
+_md5_=f6b64e84d78e2f919c4b2b95a84b5d9b
diff --git a/metadata/md5-cache/media-video/mkvalidator-0.3.7 b/metadata/md5-cache/media-video/mkvalidator-0.4.0
similarity index 79%
rename from metadata/md5-cache/media-video/mkvalidator-0.3.7
rename to metadata/md5-cache/media-video/mkvalidator-0.4.0
index 22f83f81b0ba..7b10a47659a5 100644
--- a/metadata/md5-cache/media-video/mkvalidator-0.3.7
+++ b/metadata/md5-cache/media-video/mkvalidator-0.4.0
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=compile configure install
 DESCRIPTION=mkvalidator is a command line tool to verify Matroska files for spec conformance
 EAPI=4
 HOMEPAGE=http://www.matroska.org/downloads/mkvalidator.html
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.3.7.tar.bz2
+SRC_URI=http://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.4.0.tar.bz2
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=10b9c7d88a26eb6850c5d9dde25d8c89
+_md5_=44f33a9bdc15b9e0da21232931354675
diff --git a/metadata/md5-cache/media-video/mplayer2-9999 b/metadata/md5-cache/media-video/mplayer2-9999
index 483ac1d05e92..5644c1155322 100644
--- a/metadata/md5-cache/media-video/mplayer2-9999
+++ b/metadata/md5-cache/media-video/mplayer2-9999
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-li
 DESCRIPTION=Media Player for Linux
 EAPI=4
 HOMEPAGE=http://www.mplayer2.org/
-IUSE=+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
+IUSE=+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid symlink 3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3 video_cards_s3virge video_cards_mga video_cards_tdfx
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ggi? ( media-libs/libggi media-libs/libggiwmh ) opengl? ( virtual/opengl ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) ass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] ) bidi? ( dev-libs/fribidi ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) xvid? ( media-libs/xvid ) >=virtual/ffmpeg-0.10.2 symlink? ( !media-video/mplayer )
 REQUIRED_USE=ass? ( truetype ) bindist? ( !win32codecs ) cddb? ( cdio network ) dvdnav? ( dvd ) dxr3? ( X ) ggi? ( X ) opengl? ( X ) radio? ( || ( dvb v4l ) ) truetype? ( iconv ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2a48b4cd6c81763ddbd7a8a5edeba266
+_md5_=6ac3f51b911623f72bb2df975ba40d0d
diff --git a/metadata/md5-cache/media-video/vlc-2.0.1 b/metadata/md5-cache/media-video/vlc-2.0.1
index b3a4384b5c76..822adb875cf9 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.1
+++ b/metadata/md5-cache/media-video/vlc-2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
 IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+RDEPEND=|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz mirror://gentoo/vlc-patches-109.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=aa6ab1171b3438a9a25ac52092a1a99c
+_md5_=4c4734972c48ab7ac7659c3fa5abf35a
diff --git a/metadata/md5-cache/media-video/vlc-2.0.9999 b/metadata/md5-cache/media-video/vlc-2.0.9999
index 9931593fce94..fe46884ae069 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.9999
+++ b/metadata/md5-cache/media-video/vlc-2.0.9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
 IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-101.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c13934c7d55a1f665a3cfce05941bf50
+_md5_=4a43f96519b125273adc4ebd8c8b8cc7
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 1c47ec4b5275..2be6c2ffcc1c 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
 IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xv zvbi
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-108.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6b106706cdb9e099e48d96b032d2f03b
+_md5_=b631d505387f89b2dd5a6630b1b3f084
diff --git a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2 b/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2
index d309aea07e3f..b5729d9c8695 100644
--- a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios Remote Plugin Executor
 EAPI=4
 HOMEPAGE=http://www.nagios.org/
 IUSE=command-args ssl tcpd xinetd
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/nagios-plugins-1.3.0 ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nrpe-2.13.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=4bfd792aba7ce745476751ccb76dddef
+_md5_=06f408d491f95a302cbf08a697518df5
diff --git a/metadata/md5-cache/net-dns/knot-1.0.0 b/metadata/md5-cache/net-dns/knot-1.0.5
similarity index 52%
rename from metadata/md5-cache/net-dns/knot-1.0.0
rename to metadata/md5-cache/net-dns/knot-1.0.5
index 8c341b9c8207..2fea759e9ba8 100644
--- a/metadata/md5-cache/net-dns/knot-1.0.0
+++ b/metadata/md5-cache/net-dns/knot-1.0.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl dev-libs/userspace-rcu
 SLOT=0
-SRC_URI=http://public.nic.cz/files/knot-dns/knot-1.0.0.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b
-_md5_=a25d3db15668fdb258d84c8a5fba9225
+SRC_URI=http://public.nic.cz/files/knot-dns/knot-1.0.5.tar.gz
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=18e4549dee21819c83031f909a24d407
diff --git a/metadata/md5-cache/net-firewall/firehol-1.273-r3 b/metadata/md5-cache/net-firewall/firehol-1.273-r3
new file mode 100644
index 000000000000..58e9051fc778
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firehol-1.273-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=sys-apps/iproute2
+DESCRIPTION=iptables firewall generator
+EAPI=4
+HOMEPAGE=http://firehol.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal] virtual/modutils || ( net-misc/wget net-misc/curl )
+SLOT=0
+SRC_URI=mirror://sourceforge/firehol/firehol-1.273.tar.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1004c94dd377ab0c176a7eac3272f8ed
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.1.3_p20120519 b/metadata/md5-cache/net-firewall/pglinux-2.1.3_p20120519
deleted file mode 100644
index fd9f7877de98..000000000000
--- a/metadata/md5-cache/net-firewall/pglinux-2.1.3_p20120519
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst setup
-DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) virtual/pkgconfig sys-devel/libtool:2
-DESCRIPTION=Privacy oriented firewall application
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/peerguardian/
-IUSE=cron dbus logrotate networkmanager qt4 zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
-REQUIRED_USE=qt4? ( dbus )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/pglinux-2.1.3_p20120519.tar.xz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a66c1c226b2aea119cf6ff4a376ec211
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.2.0 b/metadata/md5-cache/net-firewall/pglinux-2.2.0
new file mode 100644
index 000000000000..fe00360ab570
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/pglinux-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst setup
+DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4
+DESCRIPTION=Privacy oriented firewall application
+EAPI=4
+HOMEPAGE=https://sourceforge.net/projects/peerguardian/
+IUSE=cron dbus logrotate networkmanager qt4 zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
+REQUIRED_USE=qt4? ( dbus )
+SLOT=0
+SRC_URI=mirror://sourceforge/peerguardian/pgl-2.2.0.tar.gz
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d04506c00afe237d80dc74453f30c6be
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0 b/metadata/md5-cache/net-libs/libgsasl-1.8.0
index ba6660cc747e..bf086e7c5117 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.0
@@ -10,4 +10,4 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtu
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0217d6ab5f6fbbff9f260fe0f9b756df
+_md5_=dac4adeed884bc087fca5b275ee71558
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.0 b/metadata/md5-cache/net-misc/gsasl-1.8.0
index fae2b96aed2e..478a0635adaf 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.8.0
+++ b/metadata/md5-cache/net-misc/gsasl-1.8.0
@@ -10,4 +10,4 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtu
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.8.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5cb3de620c0bbfb571bfeb879293d1a5
+_md5_=7b68dcae9ca746a9aad7c504f3a47227
diff --git a/metadata/md5-cache/net-misc/vtun-2.6-r1 b/metadata/md5-cache/net-misc/vtun-2.6-r1
deleted file mode 100644
index 676b7871b4e7..000000000000
--- a/metadata/md5-cache/net-misc/vtun-2.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=sys-libs/zlib-1.1.3 >=dev-libs/lzo-2 sys-devel/bison ssl? ( >=dev-libs/openssl-0.9.6c )
-DESCRIPTION=Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression
-HOMEPAGE=http://vtun.sourceforge.net/
-IUSE=ssl
-KEYWORDS=alpha ~amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/zlib-1.1.3 ssl? ( >=dev-libs/openssl-0.9.6c )
-SLOT=0
-SRC_URI=mirror://sourceforge/vtun/vtun-2.6.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ce2398f09f7eced9d6633478a7d9f20d
diff --git a/metadata/md5-cache/net-misc/vtun-3.0.2 b/metadata/md5-cache/net-misc/vtun-3.0.2-r2
similarity index 54%
rename from metadata/md5-cache/net-misc/vtun-3.0.2
rename to metadata/md5-cache/net-misc/vtun-3.0.2-r2
index 537139dcae76..fac13a6f5544 100644
--- a/metadata/md5-cache/net-misc/vtun-3.0.2
+++ b/metadata/md5-cache/net-misc/vtun-3.0.2-r2
@@ -1,12 +1,13 @@
-DEFINED_PHASES=configure install postinst
+DEFINED_PHASES=configure install prepare setup
 DEPEND=ssl? ( dev-libs/openssl ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante ) sys-devel/bison
 DESCRIPTION=Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression.
-EAPI=2
+EAPI=4
 HOMEPAGE=http://vtun.sourceforge.net/
 IUSE=lzo socks5 ssl zlib
-KEYWORDS=~alpha amd64 ppc ~sparc x86
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
-_md5_=7dbe04d4bf1d53a7008cf11550f41d17
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e4e15ec7a20ac36f5c7ecb8d08895f2c
diff --git a/metadata/md5-cache/net-nds/smbldap-tools-0.9.8 b/metadata/md5-cache/net-nds/smbldap-tools-0.9.8
index df9082e96aae..99526446dd2d 100644
--- a/metadata/md5-cache/net-nds/smbldap-tools-0.9.8
+++ b/metadata/md5-cache/net-nds/smbldap-tools-0.9.8
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/perl-ldap dev-perl/Crypt-SmbHash dev-perl/Digest-SHA1 dev-perl/
 SLOT=0
 SRC_URI=http://download.gna.org/smbldap-tools/sources/0.9.8/smbldap-tools-0.9.8.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bca9e3e1050b274132655f46fa098c62
+_md5_=0c741dbea1376c7d10345d03eab107f7
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1
new file mode 100644
index 000000000000..60c746734e97
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/cheetah dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 x11-libs/qt-gui ) sdl? ( media-libs/libsdl ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) dev-lang/swig virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) =dev-lang/python-2*
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=4
+HOMEPAGE=http://gnuradio.org/
+IUSE=alsa doc examples fcd grc jack oss portaudio qt4 sdl utils wavelet wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/cheetah dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 x11-libs/qt-gui ) sdl? ( media-libs/libsdl ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://gnuradio.org/redmine/attachments/download/389/gnuradio-3.6.1.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=c50bf9517fc90691e6c10cf32b316b29
diff --git a/metadata/md5-cache/net-wireless/iwl2030-ucode-18.168.6.1 b/metadata/md5-cache/net-wireless/iwl2030-ucode-18.168.6.1
new file mode 100644
index 000000000000..a33c0b347dd3
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwl2030-ucode-18.168.6.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )
+DESCRIPTION=Intel (R) Wireless WiFi Advanced N 2030 ucode
+HOMEPAGE=http://intellinuxwireless.org/?p=iwlwifi
+KEYWORDS=~amd64 ~x86
+LICENSE=ipw3945
+SLOT=0
+SRC_URI=http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-2030-ucode-18.168.6.1.tgz
+_md5_=361e60471af2faa8eba5125d507e894a
diff --git a/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3 b/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3
index 4702897c25c7..1746685c2c41 100644
--- a/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3
+++ b/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3
@@ -10,4 +10,4 @@ RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap >=dev-libs/l
 SLOT=0
 SRC_URI=http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=13a1ad446165ed7e9177fa3a24df0e8d
+_md5_=7d383ca01f81b6a7d03f0bb5a1af1954
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
new file mode 100644
index 000000000000..4b6ae3e5c42a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install preinst prepare unpack
+DEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap >=dev-libs/libnl-1.1 ) net-libs/libpcap pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) ruby? ( dev-lang/ruby ) plugin-btscan? ( || ( >=net-wireless/bluez-4.98-r2 =net-wireless/bluez-4.96 ) ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) virtual/pkgconfig dev-vcs/subversion net-misc/rsync
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=4
+HOMEPAGE=http://www.kismetwireless.net/
+IUSE=+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid
+LICENSE=GPL-2
+RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap >=dev-libs/libnl-1.1 ) net-libs/libpcap pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) ruby? ( dev-lang/ruby ) plugin-btscan? ( || ( >=net-wireless/bluez-4.98-r2 =net-wireless/bluez-4.96 ) ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )
+SLOT=0
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=215ebccc37cb43638b563b1d3b7ad710
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1 b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1
index 7c6b759f37b3..75f3913bb74b 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1
@@ -1,12 +1,11 @@
 DEFINED_PHASES=compile install
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer for MetaGeek Wi-Spy spectrum analyzer hardware
+DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
 EAPI=4
 HOMEPAGE=http://www.kismetwireless.net/spectools/
 IUSE=ncurses gtk
 KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( =x11-libs/gtk+-2* )
+RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c5f83b387afbe4131885d1614886bef6
+_md5_=3a84d866bf56763bfabd3630b8fdcb50
diff --git a/metadata/md5-cache/net-wireless/spectools-9999 b/metadata/md5-cache/net-wireless/spectools-9999
new file mode 100644
index 000000000000..cb033bbf7cac
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/spectools-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install preinst prepare unpack
+DEPEND=dev-vcs/subversion net-misc/rsync
+DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
+EAPI=4
+HOMEPAGE=http://www.kismetwireless.net/spectools/
+IUSE=debug ncurses gtk
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
+SLOT=0
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=672a76b1ae32ca1e29fa5d00935e90fd
diff --git a/metadata/md5-cache/sci-chemistry/aria-2.3.2-r3 b/metadata/md5-cache/sci-chemistry/aria-2.3.2-r3
index 63d280012830..6f2e2befe9ef 100644
--- a/metadata/md5-cache/sci-chemistry/aria-2.3.2-r3
+++ b/metadata/md5-cache/sci-chemistry/aria-2.3.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Automated NOE assignment and NMR structure calculation
 EAPI=3
 HOMEPAGE=http://aria.pasteur.fr/
 IUSE=examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=cns
 RDEPEND=sci-chemistry/clashlist sci-chemistry/procheck sci-libs/clashscore-db dev-python/numpy dev-python/matplotlib[tk] >=sci-chemistry/cns-1.2.1-r7[aria,openmp] >=dev-lang/tk-8.3 >=sci-chemistry/ccpn-2.0.5 >=dev-tcltk/tix-8.1.4 =dev-lang/python-2* =dev-lang/python-2*[tk]
 RESTRICT=fetch
 SLOT=0
 SRC_URI=http://aria.pasteur.fr/archives/aria2.3.2.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c2b41b9eae1c17cb62c529a54c0eb3bf
+_md5_=0e9a03fcf302e9c2c6cee96c869f2c93
diff --git a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7 b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
index 1e7ed17804c1..4988125bfad4 100644
--- a/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
+++ b/metadata/md5-cache/sci-chemistry/cns-1.2.1-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Crystallography and NMR System
 EAPI=3
 HOMEPAGE=http://cns.csb.yale.edu/
 IUSE=aria openmp
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=cns
 RDEPEND=virtual/fortran app-shells/tcsh
 RESTRICT=fetch test
 SLOT=0
 SRC_URI=cns_solve_1.21_all-mp.tar.gz aria? ( aria2.3.2.tar.gz )
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d46c3200f447da2a37ba8e91f05f48bd
+_md5_=22ee47a5d1b7e1a886c3b2941acc9c6b
diff --git a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1 b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1
index e7a74c1f2fab..d6a155196cb0 100644
--- a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1
+++ b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Checks the stereochemical quality of a protein structure
 EAPI=3
 HOMEPAGE=http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html
 IUSE=doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=procheck
 RDEPEND=virtual/fortran app-shells/tcsh
 RESTRICT=fetch
 SLOT=0
 SRC_URI=procheck-3.5.4.tar.gz procheck-3.5.4-README doc? ( procheck-3.5.4-manual.tar.gz )
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6d2d008a99523527c131f48e905ac390
+_md5_=cb5c907fcd07ec196c62c50314e41cf7
diff --git a/metadata/md5-cache/sci-libs/clashscore-db-3.17 b/metadata/md5-cache/sci-libs/clashscore-db-3.17
index 063cfe38286c..0d8371cb9137 100644
--- a/metadata/md5-cache/sci-libs/clashscore-db-3.17
+++ b/metadata/md5-cache/sci-libs/clashscore-db-3.17
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Clashscore-db for clashlist
 EAPI=4
 HOMEPAGE=http://kinemage.biochem.duke.edu/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=richardson
 SLOT=0
 SRC_URI=mirror://gentoo/molprobity-3.17.tgz
-_md5_=4f75709be7b73e7454b2f5f98ed4c7d4
+_md5_=0d5d00b70e60df2d2e2555117b462a81
diff --git a/metadata/md5-cache/sys-apps/ethtool-3.4 b/metadata/md5-cache/sys-apps/ethtool-3.4
new file mode 100644
index 000000000000..f8a79f21e1e5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethtool-3.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
+EAPI=4
+HOMEPAGE=http://www.kernel.org/pub/software/network/ethtool/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/software/network/ethtool/ethtool-3.4.tar.bz2
+_md5_=31e50595e1a8ba5dbbdbb680a0edad2d
diff --git a/metadata/md5-cache/sys-apps/hwids-20120507 b/metadata/md5-cache/sys-apps/hwids-20120611
similarity index 50%
rename from metadata/md5-cache/sys-apps/hwids-20120507
rename to metadata/md5-cache/sys-apps/hwids-20120611
index 83c155d38a76..a05ae5795a1e 100644
--- a/metadata/md5-cache/sys-apps/hwids-20120507
+++ b/metadata/md5-cache/sys-apps/hwids-20120611
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Hardware (PCI, USB) IDs databases
 EAPI=4
-HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/hwids.git;a=summary
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+HOMEPAGE=https://github.com/Flameeyes/hwids
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~flameeyes/hwids/hwids-20120507.tar.xz
-_md5_=3e80067f4122f372b02a7670332a78db
+SRC_URI=https://github.com/Flameeyes/hwids/tarball/hwids-20120611 -> hwids-20120611.tar.gz
+_md5_=18fd331d567772a6cf0bc3951e8b25bb
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.3.4 b/metadata/md5-cache/sys-auth/ykpers-1.3.4
index 2867040f4d3c..18daef75e68c 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.3.4
+++ b/metadata/md5-cache/sys-auth/ykpers-1.3.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
 DEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library and tool for personalization of Yubico's YubiKey
 EAPI=2
-HOMEPAGE=http://code.google.com/p/yubikey-personalizaiton/
+HOMEPAGE=http://code.google.com/p/yubikey-personalization
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1
 SLOT=0
 SRC_URI=http://yubikey-personalization.googlecode.com/files/ykpers-1.3.4.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e6a04587be5d73ee5505b944a0cd48ef
+_md5_=c19ce8fe560278f2f40a29d465e9f69a
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.1.1 b/metadata/md5-cache/sys-devel/binutils-apple-3.1.1
deleted file mode 100644
index 7645204a5978..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.1.1
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=test
-KEYWORDS=~ppc-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test mirror
-SLOT=0
-SRC_URI=http://www.gentoo.org/~grobian/distfiles/ld64-85.2.2.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-698.tar.gz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=83045d51e0c291b5f9d7967620bab01f
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2 b/metadata/md5-cache/sys-devel/binutils-apple-3.2
deleted file mode 100644
index 8fb999303268..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gentoo.org/~grobian/distfiles/ld64-85.2.1.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-750.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-LP64-patches-1.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2fe99fec5d2ddf5bc99b36495ba4905f
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2-r1 b/metadata/md5-cache/sys-devel/binutils-apple-3.2-r1
deleted file mode 100644
index 8d62021abc55..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gentoo.org/~grobian/distfiles/ld64-95.2.12.tar.gz http://www.gentoo.org/~grobian/distfiles/cctools-750.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-2.tar.xz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1ef88f826410b6a65195723c3ffd0869
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2.2 b/metadata/md5-cache/sys-devel/binutils-apple-3.2.2
deleted file mode 100644
index b44829157826..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-97.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-773.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-3.tar.xz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=74e1e368b6f95d2d40d798bb8620f1ef
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r1 b/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r1
deleted file mode 100644
index c4392e9ab8ae..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-97.14.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-782.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=24ff1b719d878e5900ac10a99d86b918
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r2 b/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r2
deleted file mode 100644
index 2da4f112c83b..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-3.2.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=lto test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-97.14.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-782.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=aa160c900917ea474f01425ca4fecfa3
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.1 b/metadata/md5-cache/sys-devel/binutils-apple-4.1
deleted file mode 100644
index a5f7e0725ccd..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) >=sys-devel/gcc-apple-4.2.1
-DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 4.1
-EAPI=3
-HOMEPAGE=http://www.opensource.apple.com/darwinsource/
-IUSE=lto test
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 )
-RESTRICT=test
-SLOT=4
-SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-123.2.1.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-806.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.5.tar.gz http://www.gentoo.org/~grobian/distfiles/binutils-apple-3.2-unwind-patches-5.tar.xz http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c05e1fe8a09440690734012bc5bfc0b5
diff --git a/metadata/md5-cache/sys-devel/clang-3.1-r4 b/metadata/md5-cache/sys-devel/clang-3.1-r4
index c166ea9b88bb..a59e3d6ee0f1 100644
--- a/metadata/md5-cache/sys-devel/clang-3.1-r4
+++ b/metadata/md5-cache/sys-devel/clang-3.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=4
 HOMEPAGE=http://clang.llvm.org/
 IUSE=debug kernel_FreeBSD multitarget +static-analyzer test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.1[multitarget=]
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz http://llvm.org/releases/3.1/compiler-rt-3.1.src.tar.gz http://llvm.org/releases/3.1/clang-3.1.src.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=277b908b8819c95dd9d7cd22c71798ee
+_md5_=5f5e6980a32300890c7fc4ac1ee12b5d
diff --git a/metadata/md5-cache/sys-devel/llvm-3.1 b/metadata/md5-cache/sys-devel/llvm-3.1
index e7995e338a79..60f539ed158b 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=4
 HOMEPAGE=http://llvm.org/
 IUSE=debug gold +libffi multitarget ocaml test udis86 vim-syntax
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2462ac8843aa77bf67d44add4d6bbf79
+_md5_=0d12f303d8a94c0c5f3425dc2edd5e06
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2
new file mode 100644
index 000000000000..31c467a18d93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.4 kernel tree
+EAPI=3
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RESTRICT=binchecks strip
+SLOT=3.4.2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=05ad6ec2b8dbe1c22d23929eecaea0f9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110
new file mode 100644
index 000000000000..ccbf7fccf4c9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r110
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Hardened kernel sources (kernel series 2.6)
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RESTRICT=binchecks strip
+SLOT=2.6.32-r110
+SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-112.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=30be45e3c0c6c62e292d5e9c30d372e9
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20
new file mode 100644
index 000000000000..abfad95cacf0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Hardened kernel sources (kernel series 3.2)
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RESTRICT=binchecks strip
+SLOT=3.2.20
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.20-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e0a44e0222557dfd926821a23e6e821c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2
new file mode 100644
index 000000000000..72641a9d9852
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Hardened kernel sources (kernel series 3.4)
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+RESTRICT=binchecks strip
+SLOT=3.4.2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.4.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.4-2.base.tar.bz2 mirror://gentoo/genpatches-3.4-2.extras.tar.bz2
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	kernel-2	4fbd75462523383ba153fa86d46603f4	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3f6162f0b64646d927453189980a49b0
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20110731 b/metadata/md5-cache/sys-kernel/linux-firmware-20110731
deleted file mode 100644
index e279efb73b3a..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20110731
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare
-DESCRIPTION=Linux firmware files
-EAPI=3
-HOMEPAGE=http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware
-IUSE=savedconfig savedconfig
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20110731.tar.bz2
-_eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=8c95b7ddf1f7878934c1ea9fb1bb6593
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20110818 b/metadata/md5-cache/sys-kernel/linux-firmware-20110818
deleted file mode 100644
index 8e6a9995ef01..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20110818
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare
-DESCRIPTION=Linux firmware files
-EAPI=3
-HOMEPAGE=http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware
-IUSE=savedconfig savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20110818.tar.bz2
-_eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=e10baed9c2e7af2985891cbb877050cd
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20120125 b/metadata/md5-cache/sys-kernel/linux-firmware-20120125
deleted file mode 100644
index 13a5ba66d8b0..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20120125
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=4
-HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=savedconfig savedconfig
-KEYWORDS=amd64 arm ~ia64 x86
-LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20120125.tar.gz
-_eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=9b2d51ca3f3c9d1e52742fca495fbc98
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20120219 b/metadata/md5-cache/sys-kernel/linux-firmware-20120219
deleted file mode 100644
index d0d122e0d945..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20120219
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=4
-HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IUSE=savedconfig savedconfig
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
-LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20120219.tar.gz
-_eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=40d3a81aa0f855b6d7b77cf3d08b4c3b
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20120502 b/metadata/md5-cache/sys-kernel/linux-firmware-20120502
index bf526c27d9f7..46fba35db672 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20120502
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20120502
@@ -5,8 +5,8 @@ HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
 KEYWORDS=amd64 arm ~ia64 x86
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
+RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl2030-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
 SLOT=0
 SRC_URI=mirror://gentoo/linux-firmware-20120502.tar.xz
 _eclasses_=portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=07a8fcaa11ae66979975ea205981e4ba
+_md5_=fa2d3eb8770535939a5e9bb5ff536616
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index e4ef2191b319..25ab5d77c6c0 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -5,7 +5,7 @@ EAPI=4
 HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
-RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
+RDEPEND=!savedconfig? ( !media-sound/alsa-firmware[alsa_cards_korg1212] !media-sound/alsa-firmware[alsa_cards_maestro3] !media-sound/alsa-firmware[alsa_cards_sb16] !media-sound/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !media-tv/ivtv-firmware !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/iwl1000-ucode !net-wireless/iwl2030-ucode !net-wireless/iwl3945-ucode !net-wireless/iwl4965-ucode !net-wireless/iwl5000-ucode !net-wireless/iwl5150-ucode !net-wireless/iwl6000-ucode !net-wireless/iwl6005-ucode !net-wireless/iwl6030-ucode !net-wireless/iwl6050-ucode !net-wireless/libertas-firmware !net-wireless/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !x11-drivers/radeon-ucode )
 SLOT=0
 _eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815
-_md5_=c4f1003e31405506ff890e0fd85a9ccb
+_md5_=c46a601dacab0d5abc7f67668065926a
diff --git a/metadata/md5-cache/virtual/pkgconfig-0 b/metadata/md5-cache/virtual/pkgconfig-0
index 069984835200..a7f8d0216d02 100644
--- a/metadata/md5-cache/virtual/pkgconfig-0
+++ b/metadata/md5-cache/virtual/pkgconfig-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
-DEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
+DEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkgconf[pkg-config] dev-util/pkg-config-lite dev-util/pkgconfig-openbsd[pkg-config] )
 DESCRIPTION=Virtual for the pkg-config implementation
 EAPI=2
 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
+RDEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkgconf[pkg-config] dev-util/pkg-config-lite dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
-_md5_=d20e3629d7930c92b2e937bd68bf0248
+_md5_=504dbbc2faaa02078a77ea9772b60904
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1155.2 b/metadata/md5-cache/www-client/chromium-21.0.1171.0
similarity index 69%
rename from metadata/md5-cache/www-client/chromium-21.0.1155.2
rename to metadata/md5-cache/www-client/chromium-21.0.1171.0
index 1de0d2669e0b..bb1a30f5e5d4 100644
--- a/metadata/md5-cache/www-client/chromium-21.0.1155.2
+++ b/metadata/md5-cache/www-client/chromium-21.0.1171.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1155.2.tar.bz2
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1171.0.tar.bz2
 _eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4ef372575bce7d8c87542ee12ec94155
+_md5_=470e4ba7ab49f41bab57cb72547ab2ce
diff --git a/metadata/md5-cache/www-client/chromium-9999-r1 b/metadata/md5-cache/www-client/chromium-9999-r1
index 884c914f940f..f497612bf105 100644
--- a/metadata/md5-cache/www-client/chromium-9999-r1
+++ b/metadata/md5-cache/www-client/chromium-9999-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=live
 _eclasses_=chromium	38bf05640d6ba5bcb0dbf332f070008b	eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	4152846e243ec207de8a1b02a36f1461	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=5cf3010d271b6e9054682f62eb7792e0
+_md5_=e0ca69fc0783cdb0e8583e90928f00cb
diff --git a/metadata/md5-cache/www-client/opera-12.00.1448 b/metadata/md5-cache/www-client/opera-12.00.1448
deleted file mode 100644
index 82f1af77acfc..000000000000
--- a/metadata/md5-cache/www-client/opera-12.00.1448
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=4
-HOMEPAGE=http://www.opera.com/
-IUSE=elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=OPERA-11 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc1_12.00-1448/opera-12.00-1448.i386.freebsd.tar.xz )
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=feb94445e172be8d247020ee14e91dc4
diff --git a/metadata/md5-cache/www-client/opera-12.00.1456 b/metadata/md5-cache/www-client/opera-12.00.1456
new file mode 100644
index 000000000000..758048d5cb77
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-12.00.1456
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://www.opera.com/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-11 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc4main_12.00-1456/opera-12.00-1456.i386.freebsd.tar.xz )
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=29f92c730a871dae6b17dd7a54098563
diff --git a/metadata/md5-cache/www-client/opera-next-12.00.1440 b/metadata/md5-cache/www-client/opera-next-12.00.1440
deleted file mode 100644
index ab2cf894ddcb..000000000000
--- a/metadata/md5-cache/www-client/opera-next-12.00.1440
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=4
-HOMEPAGE=http://www.opera.com/
-IUSE=elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=OPERA-11 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/bonkers_12.00-1440/opera-next-12.00-1440.i386.freebsd.tar.xz )
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=00d92d296d55d49799aa7f915d734ad5
diff --git a/metadata/md5-cache/www-client/opera-next-12.00.1441 b/metadata/md5-cache/www-client/opera-next-12.00.1441
deleted file mode 100644
index e2d7383688da..000000000000
--- a/metadata/md5-cache/www-client/opera-next-12.00.1441
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=4
-HOMEPAGE=http://www.opera.com/
-IUSE=elibc_FreeBSD gtk gtk3 kde +gstreamer linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=OPERA-11 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/14368_12.00-1441/opera-next-12.00-1441.i386.freebsd.tar.xz )
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=420d9ddd2d67dedb22c98bcf3fa645dc
diff --git a/metadata/md5-cache/www-client/opera-next-12.00.1445 b/metadata/md5-cache/www-client/opera-next-12.00.1445
deleted file mode 100644
index 57a77c33bb2e..000000000000
--- a/metadata/md5-cache/www-client/opera-next-12.00.1445
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=4
-HOMEPAGE=http://www.opera.com/
-IUSE=elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=OPERA-11 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/babyformula_12.00-1445/opera-next-12.00-1445.i386.freebsd.tar.xz )
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1923b4a57b6a0e10e74f2f7a86556557
diff --git a/metadata/md5-cache/www-client/opera-next-12.00.1448 b/metadata/md5-cache/www-client/opera-next-12.00.1448
deleted file mode 100644
index a186e40a50e1..000000000000
--- a/metadata/md5-cache/www-client/opera-next-12.00.1448
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=4
-HOMEPAGE=http://www.opera.com/
-IUSE=elibc_FreeBSD gtk gtk3 kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=OPERA-11 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) gtk3? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
-SLOT=0
-SRC_URI=amd64? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/cortana_12.00-1448/opera-next-12.00-1448.i386.freebsd.tar.xz )
-_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ec5f966e083c2582d62cbd9a9ed76d0
diff --git a/metadata/md5-cache/www-client/opera-next-12.00.1456 b/metadata/md5-cache/www-client/opera-next-12.00.1456
new file mode 100644
index 000000000000..56d552c252ce
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-next-12.00.1456
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://www.opera.com/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-11 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core x11-libs/qt-gui ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/rc4_12.00-1456/opera-next-12.00-1456.i386.freebsd.tar.xz )
+_eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=cb4531415b42b96a2149289485e1f12a
diff --git a/metadata/md5-cache/www-client/qupzilla-1.2.0 b/metadata/md5-cache/www-client/qupzilla-1.2.0
index 74f04736a243..37103ab0a3f1 100644
--- a/metadata/md5-cache/www-client/qupzilla-1.2.0
+++ b/metadata/md5-cache/www-client/qupzilla-1.2.0
@@ -8,6 +8,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/qt-core-4.7:4 >=x11-libs/qt-dbus-4.7:4 >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-script-4.7:4 >=x11-libs/qt-sql-4.7:4 >=x11-libs/qt-webkit-4.7:4
 SLOT=0
-SRC_URI=https://github.com/nowrep/QupZilla/tarball/v1.2.0 -> qupzilla-1.2.0.tar.gz
+SRC_URI=https://github.com/QupZilla/qupzilla/tarball/v1.2.0 -> qupzilla-1.2.0.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	07df4a337a309c0aa605525027917677
-_md5_=2f360c415c52df4f6e21e2c6cd819878
+_md5_=104c1053763bea14c5a5f4e00fcda084
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3-r2 b/metadata/md5-cache/www-client/w3m-0.5.3-r2
index 80ecb8c3c461..6bff74d3435a 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3-r2
+++ b/metadata/md5-cache/www-client/w3m-0.5.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
+DEPEND=>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( vanilla? ( x11-libs/gtk+:2 ) !vanilla? ( x11-libs/gdk-pixbuf ) ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
 DESCRIPTION=Text based WWW browser, supports tables and frames
 EAPI=3
 HOMEPAGE=http://w3m.sourceforge.net/
 IUSE=X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=w3m
-RDEPEND=>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
+RDEPEND=>=sys-libs/ncurses-5.2-r3 >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( vanilla? ( x11-libs/gtk+:2 ) !vanilla? ( x11-libs/gdk-pixbuf ) ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) migemo? ( >=app-text/migemo-0.40 ) ssl? ( >=dev-libs/openssl-0.9.6b )
 SLOT=0
 SRC_URI=mirror://sourceforge/w3m/w3m-0.5.3.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c9f227ce8a2d928ae25cd1d778d78f72
+_md5_=e71510e69aa0fc5bb3bf82af333d78f8
diff --git a/metadata/md5-cache/www-servers/nginx-1.1.19 b/metadata/md5-cache/www-servers/nginx-1.1.19
deleted file mode 100644
index d080dea1ea8b..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.1.19
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=4
-HOMEPAGE=http://nginx.org
-IUSE=aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=as-is BSD BSD-2 GPL-2 MIT
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-REQUIRED_USE=pcre-jit? ( pcre )
-SLOT=0
-SRC_URI=http://nginx.org/download/nginx-1.1.19.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=501164144fefe36b5b696c95eea1a68b
diff --git a/metadata/md5-cache/www-servers/nginx-1.2.0 b/metadata/md5-cache/www-servers/nginx-1.2.0
deleted file mode 100644
index 7d804370014e..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) ssl? ( dev-libs/openssl )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=4
-HOMEPAGE=http://nginx.org
-IUSE=aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=as-is BSD BSD-2 GPL-2 MIT
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
-REQUIRED_USE=pcre-jit? ( pcre )
-SLOT=0
-SRC_URI=http://nginx.org/download/nginx-1.2.0.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=031c110b4a301ac6f5aa785886eb9f48
diff --git a/metadata/md5-cache/www-servers/nginx-1.2.1 b/metadata/md5-cache/www-servers/nginx-1.2.1
index 233de5f965fe..6911ba6821fd 100644
--- a/metadata/md5-cache/www-servers/nginx-1.2.1
+++ b/metadata/md5-cache/www-servers/nginx-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=4
 HOMEPAGE=http://nginx.org
 IUSE=aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_zone +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_passenger nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_upload nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex ssl
-KEYWORDS=~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=as-is BSD BSD-2 GPL-2 MIT
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -12,4 +12,4 @@ REQUIRED_USE=pcre-jit? ( pcre )
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.2.1.tar.gz nginx_modules_http_upload_progress? ( http://github.com/masterzen/nginx-upload-progress-module/tarball/v0.9.0 -> ngx_upload_progress-0.9.0.tar.gz ) nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v0.17rc1 -> ngx_http_headers_more-0.17rc1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-1.5.tar.gz ) nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/nginx_upload_module-2.2.0.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.8.tar.gz ) nginx_modules_http_fancyindex? ( http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v0.3.1 -> ngx-fancyindex-0.3.1.tar.gz )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=24aff0100641a2d1143ae2e347bc4673
+_md5_=4ef4a5188c1aa921fc62da6baf748f88
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1 b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1
new file mode 100644
index 000000000000..7738766d88bd
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.9.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=sys-fs/udev-150 ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-4.1 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.11 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.0.99.3 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.17 dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) doc? ( >=app-doc/doxygen-1.6.1 app-text/xmlto ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 ) >=x11-apps/xinit-1.3 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X.Org X servers
+EAPI=3
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=dmx kdrive xnest xorg xvfb doc ipv6 minimal nptl tslib +udev static-libs
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.9 )
+RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.15.20 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.5 >=x11-libs/libXfixes-4.0.3 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.3 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) udev? ( >=sys-fs/udev-150 )
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.9.5.tar.bz2
+_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
+_md5_=10def49ababc6c04a004de677b9c9109
diff --git a/metadata/md5-cache/x11-libs/agg-2.5-r2 b/metadata/md5-cache/x11-libs/agg-2.5-r2
index bceec1ea0107..63a3855a927a 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5-r2
+++ b/metadata/md5-cache/x11-libs/agg-2.5-r2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[X?] X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-l
 SLOT=0
 SRC_URI=http://antigrain.com/agg-2.5.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	e9ac199862f908195424dc48ca2de8f6	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ecf7501c1eae00cb3b94932516ed571f
+_md5_=d0e0041cf33bbefe8e11d6955ad715a8
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
index edc56572a600..5e379bdcff70 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2db8c4ba2131c0ab9f702840cb35a8ca
+_md5_=b87fb4fdde83aaa9994a592a6e391608
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.14.0 b/metadata/md5-cache/x11-misc/util-macros-1.14.0
index 6957edf66589..b36295f469da 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.14.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.14.0
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.14.0.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=24ae72c8324860f53f1f89f3e088a28b
+_md5_=812cb983bd6a0be8e79926a4ce330b2b
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.15.0 b/metadata/md5-cache/x11-misc/util-macros-1.15.0
index 76fa26c69e3a..cdc6397228ee 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.15.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.15.0
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.15.0.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6c583a56ccb15661247813d1e5116773
+_md5_=a69b788de7a395659b6a4b059ab6316f
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.0 b/metadata/md5-cache/x11-misc/util-macros-1.16.0
index ade020396177..8912f69e4e19 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.0
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.0.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=40aa989b29142a1d74cf65de4cfd8239
+_md5_=dd18fe5879fb45d91bc78950eeb23d12
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.1 b/metadata/md5-cache/x11-misc/util-macros-1.16.1
index 6a302f0edf77..8049390a9981 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.1
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.1
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.1.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4e350f0363be8163deb226f9892678b2
+_md5_=b9df4673a0b0409f6d96eb88b78063fd
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.16.2 b/metadata/md5-cache/x11-misc/util-macros-1.16.2
index 57eb34dc7f99..5d741d765eeb 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.16.2
+++ b/metadata/md5-cache/x11-misc/util-macros-1.16.2
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.16.2.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f6a58721a400842e74d524e900002f57
+_md5_=8103c8396f51542c29a53014414aa51e
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.17 b/metadata/md5-cache/x11-misc/util-macros-1.17
index c1122f98ab74..f0f02f429c45 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.17
+++ b/metadata/md5-cache/x11-misc/util-macros-1.17
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	e9ac199862f908195424dc48ca2de8f6	flag-o-matic	d4d85170c0ee7a80c9a7cd009ae13133	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1e2d960f2e022f6522959f3750500df8
+_md5_=5ab9e3797cd9194117fba1660ba715dd
diff --git a/metadata/md5-cache/x11-plugins/asclock-2.0.12-r1 b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r1
index bf1eca4b6f6a..0bc4cad5a24a 100644
--- a/metadata/md5-cache/x11-plugins/asclock-2.0.12-r1
+++ b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXpm
 DESCRIPTION=Clock applet for AfterStep
 EAPI=3
 HOMEPAGE=http://www.tigr.net/afterstep/list.pl
-KEYWORDS=~amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXpm x11-proto/xextproto x11-proto/xproto
 SLOT=0
 SRC_URI=http://www.tigr.net/afterstep/download/asclock/asclock-2.0.12.tar.gz
 _eclasses_=eutils	e9ac199862f908195424dc48ca2de8f6	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	940fa431b6227157c9a420dadef4970b	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a6a6003cbcb2e8a794576d7adaef8065
+_md5_=b9d3bf455f5ceafbf47adc4e3bef70d6
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f30204a60b20..747a988cf744 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jun 2012 10:07:51 +0000
+Wed, 13 Jun 2012 05:37:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 18968d7c2eca..22ee6dee17ec 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun 12 10:07:49 UTC 2012
+Wed Jun 13 05:37:44 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2367e6652c18..60119c7d4e2b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jun 2012 10:30:01 +0000
+Wed, 13 Jun 2012 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1f062a662e56..18c01e86f19b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1339495501 Tue Jun 12 10:05:01 2012 UTC
+1339565701 Wed Jun 13 05:35:01 2012 UTC
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild
index 7d0ef2a70fa1..b728a31473f8 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-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/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild,v 1.1 2012/06/11 20:16:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild,v 1.2 2012/06/12 13:31:20 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="command-args ssl tcpd xinetd"
 
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index ec5e0b1abf69..59fdbe94446a 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1 +1 @@
-DIST knot-1.0.0.tar.gz 1050994 RMD160 ebbcd502f3aeef93e64cf69c220fb8b8e2d9b7ef SHA1 50aeea2d40a60cf7f4e03494d523607bca7c8678 SHA256 ab947ff09655f44bd4106da65764810ff760b646b83e9b0939ee994f943372a6
+DIST knot-1.0.5.tar.gz 1064340 RMD160 d22d0fd1a5abb9e1105885d4edb7e5265a362d69 SHA1 631343880acfc4b4aa5e0141469e5c8ef88cca96 SHA256 9476aa0444f4c8e9ec96bb284aa7b03a746a8ddfef5dbd287fcb6efedcfcc1dd
diff --git a/net-dns/knot/files/knot-braindead-lto.patch b/net-dns/knot/files/knot-braindead-lto.patch
new file mode 100644
index 000000000000..0089279b80bf
--- /dev/null
+++ b/net-dns/knot/files/knot-braindead-lto.patch
@@ -0,0 +1,11 @@
+diff -urN knot-1.0.5.old/configure.ac knot-1.0.5/configure.ac
+--- knot-1.0.5.old/configure.ac	2012-06-12 15:50:47.954879966 +0200
++++ knot-1.0.5/configure.ac	2012-06-12 16:50:33.207942404 +0200
+@@ -123,7 +123,6 @@
+     ])
+ 
+ # Check for link time optimizations support and predictive commoning
+-AX_CHECK_COMPILER_FLAGS("-flto", [CFLAGS="$CFLAGS -flto"], [])
+ AX_CHECK_COMPILER_FLAGS("-fpredictive-commoning", [CFLAGS="$CFLAGS -fpredictive-commoning"], [])
+ 
+ # Checks for libraries.
diff --git a/net-dns/knot/files/knot-move-pidfile-to-var.patch b/net-dns/knot/files/knot-move-pidfile-to-var.patch
new file mode 100644
index 000000000000..0e5e11424bb0
--- /dev/null
+++ b/net-dns/knot/files/knot-move-pidfile-to-var.patch
@@ -0,0 +1,22 @@
+--- a/src/knot/common.h
++++ b/src/knot/common.h
+@@ -42,7 +42,7 @@ typedef unsigned int uint; /*!< \brief U
+ 
+ #define PROJECT_EXEC SBINDIR "/" "knotd" /*!< \brief  Project executable. */
+ #define ZONEPARSER_EXEC LIBEXECDIR "/" "knot-zcompile" /*!< \brief  Zoneparser executable. */
+-#define PID_FILE "knot.pid" /*!< \brief Server PID file name. */
++#define PID_FILE "/var/run/knotd.pid" /*!< \brief Server PID file name. */
+ 
+ /*
+  * Server.
+--- a/src/knot/conf/conf.c
++++ b/src/knot/conf/conf.c
+@@ -198,7 +198,7 @@ static int conf_process(conf_t *conf)
+ 
+ 	// Create PID file
+ 	if (conf->pidfile == NULL) {
+-		conf->pidfile = strcdup(conf->storage, "/" PID_FILE);
++		conf->pidfile = strdup(PID_FILE);
+ 		if (conf->pidfile == NULL) {
+ 			return KNOTD_ENOMEM;
+ 		}
diff --git a/net-dns/knot/knot-1.0.0.ebuild b/net-dns/knot/knot-1.0.5.ebuild
similarity index 77%
rename from net-dns/knot/knot-1.0.0.ebuild
rename to net-dns/knot/knot-1.0.5.ebuild
index 8e36a3ec8a03..95e3ed67b9c7 100644
--- a/net-dns/knot/knot-1.0.0.ebuild
+++ b/net-dns/knot/knot-1.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.0.0.ebuild,v 1.2 2012/05/03 03:59:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.0.5.ebuild,v 1.1 2012/06/12 14:54:00 scarabeus Exp $
 
 EAPI=4
 
-inherit autotools
+inherit eutils autotools
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="http://www.knot-dns.cz/"
@@ -27,6 +27,9 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-move-pidfile-to-var.patch \
+		"${FILESDIR}"/${PN}-braindead-lto.patch
 	sed -i \
 		-e 's:-Werror::g' \
 		configure.ac || die
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 91f4e72fb544..befadac9db4c 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>scarabeus@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/firehol/files/firehol.initrd.1 b/net-firewall/firehol/files/firehol.initrd.1
new file mode 100644
index 000000000000..ab697f281c51
--- /dev/null
+++ b/net-firewall/firehol/files/firehol.initrd.1
@@ -0,0 +1,67 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd.1,v 1.1 2012/06/12 10:04:12 xmw Exp $
+
+extra_commands="save panic try"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	after bootmisc
+	before net
+	provide firewall
+}
+
+checkrules() {
+	if [ ! -f ${FIREHOL_CONF} ]; then
+		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man firehol.conf for more info."
+		return 1
+	fi
+}
+
+start() {
+	checkrules || return 1
+	ebegin "Starting FireHOL"
+		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping FireHOL"
+		/usr/sbin/firehol stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting Firewall"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+try() {
+	ebegin "Trying FireHOL configuration"
+	/usr/sbin/firehol ${FIREHOL_CONF} try
+	eend $?
+}
+
+status() {
+	ebegin "Showing FireHOL status"
+	/usr/sbin/firehol status
+	eend $?
+}
+
+panic() {
+	ebegin "FireHOL PANIC"
+	/usr/sbin/firehol panic
+	eend $?
+}
+
+save() {
+	ebegin "Saving FireHOL configuration"
+	/usr/sbin/firehol save
+	eend $?
+}
diff --git a/net-firewall/firehol/firehol-1.273-r3.ebuild b/net-firewall/firehol/firehol-1.273-r3.ebuild
new file mode 100644
index 000000000000..4312a60948cd
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.273-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.273-r3.ebuild,v 1.1 2012/06/12 10:04:11 xmw Exp $
+
+EAPI=4
+inherit eutils linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-apps/iproute2"
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2[-minimal]
+	virtual/modutils
+	|| (
+		net-misc/wget
+		net-misc/curl
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2008-4953.patch
+	epatch "${FILESDIR}"/${P}-log-output.patch #332507
+}
+
+pkg_setup() {
+	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \
+		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \
+		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \
+		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER"
+
+	get_version
+	if [ ${KV_PATCH} -ge 25 ]; then
+		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
+	else
+		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
+	fi
+	linux-info_pkg_setup
+}
+
+src_install() {
+	newsbin firehol.sh firehol
+
+	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
+	insinto /etc/firehol/examples
+	doins examples/* || die
+
+	newconfd "${FILESDIR}"/firehol.conf.d firehol
+	newinitd "${FILESDIR}"/firehol.initrd.1 firehol
+
+	dodoc ChangeLog README TODO WhatIsNew
+	dohtml doc/*.html doc/*.css
+
+	docinto scripts
+	dodoc get-iana.sh adblock.sh
+
+	doman man/*.1 man/*.5
+
+	# Install this RESERVED_IPS as discussed in bug #332135
+	insinto /etc/firehol
+	doins "${FILESDIR}"/RESERVED_IPS
+}
+
+pkg_postinst() {
+	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
+	elog "See /etc/firehol/examples for configuration examples."
+	#
+	# Install a default configuration if none is available yet
+	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
+		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
+		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
+	fi
+}
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index c2a5442b9c95..324b16c4c878 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1 +1 @@
-DIST pglinux-2.1.3_p20120519.tar.xz 407828 RMD160 42524167e58245e615049434cefcd9bf58a7e640 SHA1 baf29ba52fd148531798125007bd151207e57670 SHA256 9d868682fcc482e6dc728806082de7668ab6dab24deab0322766b56f7f42a99e
+DIST pgl-2.2.0.tar.gz 584773 RMD160 648b57d461184d10e5300dc05bf18b744c1b6933 SHA1 fd595813dc3f2fd3b3bbf65b4bc6c45dfefc2815 SHA256 e31d4274def8ec2acec0acb80b111f83f415440c20f24d4e26851f0e65326f3a
diff --git a/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild b/net-firewall/pglinux/pglinux-2.2.0.ebuild
similarity index 77%
rename from net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild
rename to net-firewall/pglinux/pglinux-2.2.0.ebuild
index a6dfca91b138..e6a7cd56313d 100644
--- a/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild
+++ b/net-firewall/pglinux/pglinux-2.2.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.1.3_p20120519.ebuild,v 1.2 2012/05/21 15:10:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.0.ebuild,v 1.1 2012/06/12 22:22:24 hasufell Exp $
 
 EAPI=4
 
-inherit linux-info
+inherit gnome2-utils linux-info
+
+MY_P="pgl-${PV}"
 
 DESCRIPTION="Privacy oriented firewall application"
 HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -23,7 +25,9 @@ COMMON_DEPEND="
 	qt4? ( sys-auth/polkit-qt
 		x11-libs/qt-core:4
 		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
+		x11-libs/qt-gui:4
+		|| ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss )
+	)"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	sys-devel/libtool:2"
@@ -51,27 +55,36 @@ CONFIG_CHECK="~NETFILTER_NETLINK
 	~IP_NF_IPTABLES
 	~IP_NF_TARGET_REJECT"
 
+S=${WORKDIR}/${MY_P}
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
-		$(use_enable cron) \
-		$(use_enable dbus) \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_enable logrotate) \
+		$(use_enable cron) \
 		$(use_enable networkmanager) \
 		$(use_enable zlib) \
+		$(use_enable dbus) \
+		--disable-lowmem \
+		--with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
 		$(use_with qt4)
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	elog "optional dependencies:"
 	elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
 	elog "  app-arch/unzip (needed for blocklists packed as .zip)"
 	elog "  virtual/mta (needed to send informational (blocklist updates) and"
 	elog "    warning mails (if pglcmd.wd detects a problem.))"
-	if use qt4 ; then
-		elog "You need one of the following graphical su/sudo:"
-		elog "  x11-misc/ktsuss"
-		elog "  x11-libs/gksu"
-		elog "  kde-base/kdesu"
-	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/net-im/leechcraft-azoth/metadata.xml b/net-im/leechcraft-azoth/metadata.xml
index b5dc02712358..775304775155 100644
--- a/net-im/leechcraft-azoth/metadata.xml
+++ b/net-im/leechcraft-azoth/metadata.xml
@@ -27,6 +27,6 @@
 	<flag name="standardstyles">Build support for standard Azoth styles engine</flag>
 	<flag name="xoox">Build Xoox, gloox-based plugin for XMPP support</flag>
 	<flag name="xtazy">Build Xtazy for publishing currently playing tune</flag>
-	<flag name="zheet">uild Zheet, libmsn-based plugin for Windows Live Messenger support</flag>
+	<flag name="zheet">Build Zheet, libmsn-based plugin for Windows Live Messenger support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/libgsasl/libgsasl-1.8.0.ebuild b/net-libs/libgsasl/libgsasl-1.8.0.ebuild
index 2bfee8e942a8..5ea570643e12 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-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/net-libs/libgsasl/libgsasl-1.8.0.ebuild,v 1.1 2012/05/29 09:56:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.8.0.ebuild,v 1.3 2012/06/12 21:07:47 eras Exp $
 
 EAPI="4"
 
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-gss-extra.patch"
+	sed -i -e 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/net-misc/gsasl/gsasl-1.8.0.ebuild b/net-misc/gsasl/gsasl-1.8.0.ebuild
index 166bca9fcf06..5ec7f4264075 100644
--- a/net-misc/gsasl/gsasl-1.8.0.ebuild
+++ b/net-misc/gsasl/gsasl-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/net-misc/gsasl/gsasl-1.8.0.ebuild,v 1.1 2012/05/29 10:19:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.8.0.ebuild,v 1.3 2012/06/12 21:12:26 eras Exp $
 
 EAPI="4"
 
@@ -25,6 +25,9 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-gss-extra.patch"
+	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
+           -e 's/ -Werror//' configure.ac || die
+	sed -i -e 's/ -Werror//' lib/configure.ac || die
 	eautoreconf
 }
 
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 7ea892a97be3..3d6c09a10068 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,2 +1 @@
-DIST vtun-2.6.tar.gz 95637 RMD160 9f666189740b78a88f6b0e2807add3267551198b SHA1 ba6474a551856a7bb55b4cc21d858b8275a2e610 SHA256 fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
 DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
diff --git a/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
new file mode 100644
index 000000000000..6fa765282ec3
--- /dev/null
+++ b/net-misc/vtun/files/vtun-3.0.2-build-racing-condition-fix.patch
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2012-06-12 00:20:24.359206241 +0400
++++ Makefile.in	2012-06-12 00:22:46.735301510 +0400
+@@ -60,10 +60,12 @@
+ vtund: $(OBJS)
+ 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
+ 
+-cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h
++cfg_file.tab.h:
+ 	$(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
+ 
+-cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h
++cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
++
++cfg_file.lex.c: cfg_file.l cfg_kwords.h config.h cfg_file.tab.h
+ 	$(LEX) $(LEXFLAGS) cfg_file.l > cfg_file.lex.c 
+ 
+ depend:
diff --git a/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch b/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
new file mode 100644
index 000000000000..15b3bf273c34
--- /dev/null
+++ b/net-misc/vtun/files/vtun-3.0.2-remove-config-presence-check.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2012-06-11 23:31:11.416075337 +0400
++++ Makefile.in	2012-06-11 23:31:21.247324839 +0400
+@@ -86,9 +86,7 @@
+ 
+ install_config: 
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+-	fi
++	$(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+ 
+ install: vtund install_config install_man
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
diff --git a/net-misc/vtun/vtun-2.6-r1.ebuild b/net-misc/vtun/vtun-2.6-r1.ebuild
deleted file mode 100644
index e2259e15adcb..000000000000
--- a/net-misc/vtun/vtun-2.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6-r1.ebuild,v 1.8 2010/10/28 09:40:53 ssuominen Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/vtun
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
-SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-KEYWORDS="alpha ~amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-# NOTE: you also need the tun/tap driver compiled into your kernel
-#		to do tun/tap tunneling
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-2
-	sys-devel/bison
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-lzo2.patch
-}
-
-src_compile() {
-	local use_opts
-	use_opts=""
-	if ! use ssl
-	then
-		use_opts="--disable-ssl"
-	fi
-
-	econf ${use_opts} --with-ssl-headers=/usr/include/openssl || die
-
-	make || die
-}
-
-src_install () {
-	make DESTDIR="${D}" prefix=/usr \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		datadir=/usr/share \
-		sysconfdir=/etc \
-		localstatedir=/var/lib \
-		install || die
-
-	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
-
-	newinitd "${FILESDIR}"/vtun.rc vtun
-
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst () {
-	einfo ">>> You will need the Universal TUN/TAP driver compiled into"
-	einfo ">>> your kernel or as a module to use the associated tunnel"
-	einfo ">>> modes in vtun. 2.2 users will need to download and install"
-	einfo ">>> the driver from http://vtun.sourceforge.net/tun"
-}
diff --git a/net-misc/vtun/vtun-3.0.2-r2.ebuild b/net-misc/vtun/vtun-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..2b5b19786a97
--- /dev/null
+++ b/net-misc/vtun/vtun-3.0.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r2.ebuild,v 1.1 2012/06/12 12:13:18 maksbotan Exp $
+
+EAPI=4
+
+inherit eutils linux-info
+
+DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://vtun.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="lzo socks5 ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	lzo? ( dev-libs/lzo:2 )
+	zlib? ( sys-libs/zlib )
+	socks5? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
+
+DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e '/^LDFLAGS/s|=|+=|g' \
+		|| die "sed Makefile"
+	epatch "${FILESDIR}"/${P}-includes.patch
+	# remove unneeded checking for /etc/vtund.conf
+	epatch "${FILESDIR}"/${P}-remove-config-presence-check.patch
+	# fix build racing condition with bison and lex files, wrt bug #364923
+	epatch "${FILESDIR}"/${P}-build-racing-condition-fix.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl) \
+		$(use_enable zlib) \
+		$(use_enable lzo) \
+		$(use_enable socks5 socks) \
+		--enable-shaper
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/vtun.rc vtun
+	insinto etc
+	doins "${FILESDIR}"/vtund-start.conf
+}
diff --git a/net-misc/vtun/vtun-3.0.2.ebuild b/net-misc/vtun/vtun-3.0.2.ebuild
deleted file mode 100644
index 65159f2db246..000000000000
--- a/net-misc/vtun/vtun-3.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2.ebuild,v 1.4 2010/05/18 13:39:21 hwoarang Exp $
-
-EAPI=2
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )
-	socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-src_configure() {
-	econf $(use_enable ssl) \
-		$(use_enable zlib) \
-		$(use_enable lzo) \
-		$(use_enable socks5 socks) \
-		--enable-shaper
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
-	newinitd "${FILESDIR}"/vtun.rc vtun
-	insinto etc
-	doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst() {
-	elog "You will need the Universal TUN/TAP driver compiled into"
-	elog "your kernel or as a module to use the associated tunnel"
-	elog "modes in vtun."
-}
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
index 92ed682a9ad2..1e44134c8a22 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.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/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild,v 1.1 2012/05/03 09:35:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild,v 1.2 2012/06/12 20:05:05 vostorga Exp $
 
 EAPI=4
 
@@ -29,11 +29,13 @@ src_install() {
 	default
 
 	newsbin smbldap-config.cmd smbldap-config
+	dosym smbldap-passwd /usr/sbin/smbldap-passwd.cmd
 
 	dodoc CONTRIBUTORS ChangeLog FILES INFRA INSTALL README TODO doc/*conf* doc/smbldap-tools*
 	dodoc -r doc/migration_scripts
 
 	sed -i 's/.CMD//g' smbldap-[gpu]*.8 || die
+	doman smbldap-[gpu]*.8
 
 	insinto /etc/smbldap-tools
 	doins smbldap.conf smbldap_bind.conf
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch b/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch
new file mode 100644
index 000000000000..4fa1c664145d
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.6.1-automagic-audio.patch
@@ -0,0 +1,90 @@
+diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
+--- a/gr-audio/lib/CMakeLists.txt	2012-06-11 17:55:20.000000000 +0200
++++ b/gr-audio/lib/CMakeLists.txt	2012-06-12 23:34:58.601611171 +0200
+@@ -38,7 +38,11 @@
+ ########################################################################
+ find_package(ALSA)
+ 
+-if(ALSA_FOUND)
++GR_REGISTER_COMPONENT("gr-audio-alsa" ENABLE_GR_AUDIO_ALSA
++    ALSA_FOUND
++)
++
++if(ALSA_FOUND AND ENABLE_GR_AUDIO_ALSA)
+ 
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${ALSA_LIBRARIES})
+@@ -49,14 +53,18 @@
+     )
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gr-audio-alsa.conf)
+ 
+-endif(ALSA_FOUND)
++endif(ALSA_FOUND AND ENABLE_GR_AUDIO_ALSA)
+ 
+ ########################################################################
+ ## OSS Support
+ ########################################################################
+ find_package(OSS)
+ 
+-if(OSS_FOUND)
++GR_REGISTER_COMPONENT("gr-audio-oss" ENABLE_GR_AUDIO_OSS
++    OSS_FOUND
++)
++
++if(OSS_FOUND AND ENABLE_GR_AUDIO_OSS)
+ 
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS})
+     list(APPEND gr_audio_sources
+@@ -65,7 +73,7 @@
+     )
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/oss/gr-audio-oss.conf)
+ 
+-endif(OSS_FOUND)
++endif(OSS_FOUND AND ENABLE_GR_AUDIO_OSS)
+ 
+ 
+ ########################################################################
+@@ -73,7 +81,11 @@
+ ########################################################################
+ find_package(Jack)
+ 
+-if(JACK_FOUND)
++GR_REGISTER_COMPONENT("gr-audio-jack" ENABLE_GR_AUDIO_JACK
++    JACK_FOUND
++)
++
++if(JACK_FOUND AND ENABLE_GR_AUDIO_JACK)
+ 
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jack ${JACK_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${JACK_LIBRARIES})
+@@ -85,7 +97,7 @@
+     )
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf)
+ 
+-endif(JACK_FOUND)
++endif(JACK_FOUND AND ENABLE_GR_AUDIO_JACK)
+ 
+ ########################################################################
+ ## OSX Support
+@@ -115,7 +127,11 @@
+ ########################################################################
+ find_package(Portaudio)
+ 
+-if(PORTAUDIO_FOUND)
++GR_REGISTER_COMPONENT("gr-audio-portaudio" ENABLE_GR_AUDIO_PORTAUDIO
++    PORTAUDIO_FOUND
++)
++
++if(PORTAUDIO_FOUND AND ENABLE_GR_AUDIO_PORTAUDIO)
+ 
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS})
+     list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
+@@ -127,7 +143,7 @@
+     )
+     list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gr-audio-portaudio.conf)
+ 
+-endif(PORTAUDIO_FOUND)
++endif(PORTAUDIO_FOUND AND ENABLE_GR_AUDIO_PORTAUDIO)
+ 
+ ########################################################################
+ ## Windows Support
diff --git a/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..eda319ee3ad8
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.1-r1.ebuild,v 1.1 2012/06/12 22:31:38 chithanh Exp $
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit base cmake-utils fdo-mime python
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="http://gnuradio.org/"
+SRC_URI="http://gnuradio.org/redmine/attachments/download/389/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc examples fcd grc jack oss portaudio qt4 sdl utils wavelet wxwidgets"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.7 )
+# uhd? ( dev-libs/uhd )
+RDEPEND=">=dev-lang/orc-0.4.12
+	dev-libs/boost
+	dev-util/cppunit
+	sci-libs/fftw:3.0
+	fcd? ( virtual/libusb:1 )
+	alsa? (
+		media-libs/alsa-lib
+	)
+	grc? (
+		dev-python/cheetah
+		dev-python/lxml
+		dev-python/numpy
+		dev-python/pygtk:2
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt4? (
+		dev-python/PyQt4[X,opengl]
+		dev-python/pyqwt:5
+		x11-libs/qt-gui
+	)
+	sdl? ( media-libs/libsdl )
+	wavelet? (
+		sci-libs/gsl
+	)
+	wxwidgets? (
+		dev-python/wxpython:2.8
+		dev-python/numpy
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx
+	)
+	grc? (
+		x11-misc/xdg-utils
+	)
+	oss? (
+		virtual/os-headers
+	)
+"
+
+# Add support for custom SYSCONFDIR, upstream bug #492
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.patch
+	"${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -q -r 2 "${S}"
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	base_src_prepare
+}
+
+src_configure() {
+	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
+	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
+	mycmakeargs=(
+		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA)
+		$(cmake-utils_use_enable doc DOXYGEN) \
+		$(cmake-utils_use_enable doc SPHINX) \
+		$(cmake-utils_use_enable fcd GR_FCD) \
+		$(cmake-utils_use_enable grc GRC) \
+		$(cmake-utils_use_enable jack GR_AUDIO_JACK)
+		$(cmake-utils_use_enable oss GR_AUDIO_OSS)
+		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO)
+		$(cmake-utils_use_enable utils GR_UTILS) \
+		$(cmake-utils_use_enable wavelet GR_WAVELET) \
+		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
+		$(cmake-utils_use_enable qt4 GR_QTGUI) \
+		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		-DENABLE_GR_CORE=ON
+		-DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5
+		-DSYSCONFDIR="${EPREFIX}"/etc
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	python_clean_installation_image -q
+
+	# Remove bad shebangs that creep back in during install
+	sed -i '\|#!/usr/bin/python|d' "${ED}"/usr/bin/* || die
+
+	# Install examples to /usr/share/doc/$PF
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+	python_mod_optimize gnuradio
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+	python_mod_cleanup gnuradio
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/iwl2030-ucode/Manifest b/net-wireless/iwl2030-ucode/Manifest
new file mode 100644
index 000000000000..cb02bb88482a
--- /dev/null
+++ b/net-wireless/iwl2030-ucode/Manifest
@@ -0,0 +1 @@
+DIST iwlwifi-2030-ucode-18.168.6.1.tgz 349851 RMD160 798e6902a5f0d582fa629630f18246d175d595da SHA1 7440e4454d7c9295ad3393188a18bcf115455121 SHA256 c867d2ebc1c3e3880245893a74bd4aa20599125c142def971f663a43d695c92c
diff --git a/net-wireless/iwl2030-ucode/iwl2030-ucode-18.168.6.1.ebuild b/net-wireless/iwl2030-ucode/iwl2030-ucode-18.168.6.1.ebuild
new file mode 100644
index 000000000000..61ac39730d2e
--- /dev/null
+++ b/net-wireless/iwl2030-ucode/iwl2030-ucode-18.168.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl2030-ucode/iwl2030-ucode-18.168.6.1.ebuild,v 1.1 2012/06/12 19:15:48 vapier Exp $
+
+MY_PN="iwlwifi-2030-ucode"
+
+DESCRIPTION="Intel (R) Wireless WiFi Advanced N 2030 ucode"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /lib/firmware
+	doins iwlwifi-2030-6.ucode
+
+	dodoc README*
+}
diff --git a/net-wireless/iwl2030-ucode/metadata.xml b/net-wireless/iwl2030-ucode/metadata.xml
new file mode 100644
index 000000000000..f11c963fc7d1
--- /dev/null
+++ b/net-wireless/iwl2030-ucode/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mobile</herd>
+</pkgmetadata>
+
diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
index 93132a42f1f1..e9276311dcf2 100644
--- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.2 2012/06/11 13:11:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.3 2012/06/13 00:51:03 zerochaos Exp $
 
 EAPI=4
 
-inherit toolchain-funcs eutils
+inherit eutils multilib user
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
new file mode 100644
index 000000000000..fefc897dfa51
--- /dev/null
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.2 2012/06/13 00:51:03 zerochaos Exp $
+
+EAPI=4
+
+inherit eutils multilib user
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="http://www.kismetwireless.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid"
+
+# Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch
+# or 4.96 which still builds properly.
+RDEPEND="net-wireless/wireless-tools
+	kernel_linux? ( sys-libs/libcap
+		>=dev-libs/libnl-1.1 )
+	net-libs/libpcap
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	client? ( sys-libs/ncurses )
+	!arm? ( speech? ( app-accessibility/flite ) )
+	ruby? ( dev-lang/ruby )
+	plugin-btscan? ( || (
+			>=net-wireless/bluez-4.98-r2
+			=net-wireless/bluez-4.96
+			) )
+	plugin-dot15d4? ( virtual/libusb:0 )
+	plugin-spectools? ( net-wireless/spectools )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet.conf.in
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+}
+
+src_configure() {
+	econf \
+		$(use_enable client) \
+		$(use_enable pcre)
+}
+
+src_compile() {
+	emake
+
+	if use plugin-autowep; then
+		cd "${S}"/plugin-autowep
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-btscan; then
+		cd "${S}"/plugin-btscan
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-dot15d4; then
+		cd "${S}"/plugin-dot15d4
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-ptw; then
+		cd "${S}"/plugin-ptw
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-spectools; then
+		cd "${S}"/plugin-spectools
+		KIS_SRC_DIR="${S}" emake
+	fi
+	if use plugin-syslog; then
+		cd "${S}"/plugin-syslog
+		KIS_SRC_DIR="${S}" emake
+	fi
+}
+
+src_install() {
+	if use plugin-autowep; then
+		cd "${S}"/plugin-autowep
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-btscan; then
+		cd "${S}"/plugin-btscan
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-dot15d4; then
+		cd "${S}"/plugin-dot15d4
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-ptw; then
+		cd "${S}"/plugin-ptw
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-spectools; then
+		cd "${S}"/plugin-spectools
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use plugin-syslog; then
+		cd "${S}"/plugin-syslog
+		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+	fi
+	if use ruby; then
+		cd "${S}"/ruby
+		dobin *.rb
+	fi
+
+	cd "${S}"
+	emake DESTDIR="${D}" commoninstall
+
+	##dragorn would prefer I set fire to my head than do this, but it works
+	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
+	##is there an automatic way to force this?
+	# install headers for external plugins
+	insinto /usr/include/kismet
+	doins *.h
+	doins Makefile.inc
+	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
+
+	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
+
+	insinto /etc
+	doins conf/kismet{,_drone}.conf
+
+	if use suid; then
+	dobin kismet_capture
+	fi
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_capture
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_capture
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index aa6e2fe3ea56..ea6b74dcd8ad 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -27,6 +27,7 @@
 		<flag name="plugin-dot15d4">Build the dot15d4 plugin</flag>
 		<flag name="plugin-ptw">Build the ptw plugin</flag>
 		<flag name="plugin-spectools">Build the spectools plugin. This uses <pkg>net-wireless/spectools</pkg></flag>
+		<flag name="plugin-syslog">Build the syslog plugin.</flag>
 		<flag name="ruby">Build extras which are written in ruby, example plugins and the like.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/spectools/metadata.xml b/net-wireless/spectools/metadata.xml
index c8380d3ec172..a83d150859d4 100644
--- a/net-wireless/spectools/metadata.xml
+++ b/net-wireless/spectools/metadata.xml
@@ -18,7 +18,7 @@
 		<description>Maintainer, has 1st gen WiSpy hardware for testing</description>
 	</maintainer>
 <use>
-	<flag name="debug">Build the raw output client for spectools.</flag>
+	<flag name="debug">Build the raw output client for spectools. (for developers)</flag>
 	<flag name="ncurses">Build the ncurses based client for spectools</flag>
 	<flag name="gtk">Build the gtk-2 based client for spectools</flag>
 </use>
diff --git a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
index e2858f4613bd..c1f12aa9f94a 100644
--- a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.2 2012/06/11 13:11:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.4 2012/06/13 03:10:50 zerochaos Exp $
 
 EAPI=4
 
-inherit toolchain-funcs eutils
-
 MY_PN=${PN}
 MY_PV=${PV/\./-}
 MY_PV=${MY_PV/./-R}
 MY_P="${MY_PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer for MetaGeek Wi-Spy spectrum analyzer hardware"
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
 HOMEPAGE="http://www.kismetwireless.net/spectools/"
 
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/spectools"
+	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
 		inherit subversion
 		KEYWORDS=""
 else
@@ -31,7 +29,7 @@ IUSE="ncurses gtk"
 DEPEND="${RDEPEND}"
 RDEPEND="virtual/libusb:0
 	ncurses? ( sys-libs/ncurses )
-	gtk? ( =x11-libs/gtk+-2* )"
+	gtk? ( x11-libs/gtk+:2 )"
 # Upstream has still not migrated to the libusb-1 line.
 # Maemo: Add hildon and bbus
 
@@ -61,8 +59,8 @@ src_install() {
 	use ncurses && dobin spectool_curses
 	use gtk && dobin spectool_gtk
 
-	dodir /$(get_libdir)/udev/rules.d/
-	insinto /$(get_libdir)/udev/rules.d/
+	dodir /lib/udev/rules.d/
+	insinto /lib/udev/rules.d/
 	doins 99-wispy.rules
 	dodoc README
 
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
new file mode 100644
index 000000000000..9d42d4d3e3dd
--- /dev/null
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.2 2012/06/13 04:32:19 mr_bones_ Exp $
+
+EAPI=4
+
+MY_PN=${PN}
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+MY_P="${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+if [[ ${PV} == "9999" ]] ; then
+		ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
+		inherit subversion
+		KEYWORDS=""
+else
+		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
+HOMEPAGE="http://www.kismetwireless.net/spectools/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug ncurses gtk"
+
+DEPEND="${RDEPEND}"
+RDEPEND="virtual/libusb:0
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( x11-libs/gtk+:2 )"
+# Upstream has still not migrated to the libusb-1 line.
+# Maemo: Add hildon and bbus
+
+# Please note that upstream removed the --with-gtk-version option
+# and GTK is now automagical. GTK1 support was also removed.
+src_compile() {
+	emake depend
+
+	emake spectool_net
+
+	use debug && emake spectool_raw
+
+	use ncurses && emake spectool_curses
+
+	use gtk && emake spectool_gtk
+
+	#if use maemo; then
+	#	emake spectool_hildon usbcontrol \
+	#		|| die "emake spectool_hildon usbcontrol failed"
+	#fi
+}
+
+src_install() {
+	dobin spectool_net
+	use debug && dobin spectool_raw
+	use ncurses && dobin spectool_curses
+	use gtk && dobin spectool_gtk
+
+	dodir /lib/udev/rules.d/
+	insinto /lib/udev/rules.d/
+	doins 99-wispy.rules
+	dodoc README
+
+	#if use maemo; then
+	#	dobin spectool_hildon
+	#	dosbin usbcontrol
+	#fi
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 584d35655b2c..9f382dffe638 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13845 2012/06/10 21:08:41 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13846 2012/06/12 20:46:37 pesa 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. Please be extremely
@@ -31,6 +31,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Davide Pesavento <pesa@gentoo.org> (12 Jun 2012)
+# Both have been merged into >=dev-python/shiboken-1.1.1.
+# Removal in 30 days.
+dev-python/apiextractor
+dev-python/generatorrunner
+
 # Alexis Ballier <aballier@gentoo.org> (10 Jun 2012)
 # Beta release, mask until rev. deps are fixed
 >=dev-lang/ocaml-4.00.0_alpha
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 18738f268580..b841adbb0d56 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1066,6 +1066,7 @@ dev-games/ogre:cg - NVIDIA toolkit plugin
 dev-games/ogre:devil - image loading support with DevIL
 dev-games/ogre:double-precision - more precise calculations at the expense of speed
 dev-games/ogre:freeimage - support images via freeimage
+dev-games/ogre:gles2 - build OpenGL ES 2.x RenderSystem
 dev-games/ogre:ois - pull in Object-oriented Input System library for samples
 dev-games/ogre:poco - when USE=threads, use poco for threading
 dev-games/ogre:tbb - when USE=threads, use tbb for threading
@@ -3743,7 +3744,7 @@ net-im/leechcraft-azoth:rosenthal - Build Rosenthal, the spellchecker plugin
 net-im/leechcraft-azoth:standardstyles - Build support for standard Azoth styles engine
 net-im/leechcraft-azoth:xoox - Build Xoox, gloox-based plugin for XMPP support
 net-im/leechcraft-azoth:xtazy - Build Xtazy for publishing currently playing tune
-net-im/leechcraft-azoth:zheet - uild Zheet, libmsn-based plugin for Windows Live Messenger support
+net-im/leechcraft-azoth:zheet - Build Zheet, libmsn-based plugin for Windows Live Messenger support
 net-im/mcabber:aspell - Adds support for app-text/aspell spell checker.
 net-im/mcabber:otr - Enable encrypted conversations using Off-The-Records messaging
 net-im/minbif:video - Add video support
@@ -4582,13 +4583,14 @@ net-wireless/kismet:plugin-btscan - Build the btscan plugin
 net-wireless/kismet:plugin-dot15d4 - Build the dot15d4 plugin
 net-wireless/kismet:plugin-ptw - Build the ptw plugin
 net-wireless/kismet:plugin-spectools - Build the spectools plugin. This uses net-wireless/spectools
+net-wireless/kismet:plugin-syslog - Build the syslog plugin.
 net-wireless/kismet:ruby - Build extras which are written in ruby, example plugins and the like.
 net-wireless/kismet:speech - Audio support using app-accessibility/flite
 net-wireless/kismet:suid - Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks
 net-wireless/madwifi-ng:injection - Adds support for net-wireless/aircrack-ng aireplay-ng packet injection
 net-wireless/pyrit:cuda - Enable CUDA support via net-wireless/cpyrit-cuda
 net-wireless/pyrit:opencl - Enable OpenCL support via net-wireless/cpyrit-opencl
-net-wireless/spectools:debug - Build the raw output client for spectools.
+net-wireless/spectools:debug - Build the raw output client for spectools. (for developers)
 net-wireless/spectools:gtk - Build the gtk-2 based client for spectools
 net-wireless/spectools:ncurses - Build the ncurses based client for spectools
 net-wireless/wepattack:john - Build with app-crypt/johntheripper support
diff --git a/sci-chemistry/aria/aria-2.3.2-r3.ebuild b/sci-chemistry/aria/aria-2.3.2-r3.ebuild
index 0d417c1cdad7..e5076080a560 100644
--- a/sci-chemistry/aria/aria-2.3.2-r3.ebuild
+++ b/sci-chemistry/aria/aria-2.3.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/sci-chemistry/aria/aria-2.3.2-r3.ebuild,v 1.1 2012/03/21 11:48:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aria/aria-2.3.2-r3.ebuild,v 1.2 2012/06/12 18:28:07 ago Exp $
 
 EAPI=3
 
@@ -17,7 +17,7 @@ SRC_URI="http://aria.pasteur.fr/archives/${MY_P}.2.tar.gz"
 
 SLOT="0"
 LICENSE="cns"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-chemistry/cns/cns-1.2.1-r7.ebuild b/sci-chemistry/cns/cns-1.2.1-r7.ebuild
index 8196523ee666..86441c28beb7 100644
--- a/sci-chemistry/cns/cns-1.2.1-r7.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r7.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/sci-chemistry/cns/cns-1.2.1-r7.ebuild,v 1.3 2012/06/06 08:16:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r7.ebuild,v 1.4 2012/06/12 13:31:50 ago Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="cns"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aria openmp"
 
 RDEPEND="
diff --git a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild b/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
index fea8ce6eb02e..34ffb9b9eb1f 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-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/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.4 2011/06/21 15:58:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/procheck/procheck-3.5.4-r1.ebuild,v 1.5 2012/06/12 11:28:23 ago Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="procheck"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17.ebuild
index 9b62ebf8de15..ae4c4823415f 100644
--- a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild
+++ b/sci-libs/clashscore-db/clashscore-db-3.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/sci-libs/clashscore-db/clashscore-db-3.17.ebuild,v 1.3 2012/06/06 09:33:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clashscore-db/clashscore-db-3.17.ebuild,v 1.5 2012/06/12 17:42:11 ago Exp $
 
 EAPI=4
 
@@ -10,9 +10,11 @@ SRC_URI="mirror://gentoo/molprobity-${PV}.tgz"
 
 SLOT="0"
 LICENSE="richardson"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+S="${WORKDIR}"
+
 src_install() {
 	insinto /usr/share/clashscore
 	doins molprobity3/lib/clashscore.db.tab
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 8cc0efc16e5f..3a6b785e2c2e 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -5,4 +5,5 @@ DIST ethtool-2.6.39.tar.bz2 169029 RMD160 88e66eb1fd95794c0b556e91c7bd181132f5db
 DIST ethtool-3.0.tar.bz2 170196 RMD160 e46d4fb5f8e85143a9c2be6684bbd54003e84cfb SHA1 7e6a0d8e2274a49812e3648fd2a81ee781f43170 SHA256 095844d67c1dbe4a2ce3bebc72841475fcee23be0359802e594a202b25ffad7d
 DIST ethtool-3.1.tar.bz2 184118 RMD160 f1f2bff964d3bc5437ad4f8eaea05bf8bbec2c29 SHA1 60b4f859bd9e55341e9b61a77d37174180623e41 SHA256 8df3150af0b76a207cd0af3a2394ed34b5bf98fd39dfd297b7d216cc0bf8fbf5
 DIST ethtool-3.2.tar.bz2 186071 RMD160 31df05c115b015e291e5a4da428e6996f705027c SHA1 56abb8da042dae4c1021fac5d254bdb72f1d4262 SHA256 edeb2f1c44e396c3801ddb56ebb9bb0a8f8a0110acc68ccfd492d5a73ac6ef5b
+DIST ethtool-3.4.tar.bz2 199809 RMD160 4c31c4dba72b14e8ab327f9e886dda37361a19b4 SHA1 9f822ffe2058b1f5c4d2579d896b07deffb3ff40 SHA256 18ec82141c42f7b1f040e3318bdab401bb6292edec458f58db1de2ee26339c4a
 DIST ethtool-6.tar.gz 129849 RMD160 f49265b31b0330e1c7acf1b7bd23efd0736609cb SHA1 808fda9c353714ad1d5f0428e7347fca8c0c23f6 SHA256 5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
diff --git a/sys-apps/ethtool/ethtool-3.4.ebuild b/sys-apps/ethtool/ethtool-3.4.ebuild
new file mode 100644
index 000000000000..9eea99926220
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-3.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.4.ebuild,v 1.1 2012/06/12 21:30:10 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="http://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index db8c2b5e7d09..5f51c7f7be02 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,2 +1,2 @@
-DIST hwids-20120507.tar.xz 278296 RMD160 f444eaa2d51ddb818f3d348f365230b73c263dcf SHA1 faf5d97feff09d9a2d19b0f1798002c5b525eb42 SHA256 3181ffd69d9325782f32b878ffc8e881816840262e846849fada7554c042bfe5
 DIST hwids-20120512.tar.gz 365241 RMD160 63e55e1d206617a868ebe208d9d476516c313926 SHA1 dfe7b69420c5e933c63527f4329267ad242a50af SHA256 e38d7e07b8196feb2e98099923bc7ab51b849d771cad45870a644ac9591d8d2a
+DIST hwids-20120611.tar.gz 365870 RMD160 82d12857f47f10e25b2d19bacd51d32d8b4f30c5 SHA1 8303b60a9e136101ead19595c4032c5e2879c12c SHA256 20f2aa45387c5973df36a8eecf10e251c59aacc54170beee2212cd099d8c58ff
diff --git a/sys-apps/hwids/hwids-20120507.ebuild b/sys-apps/hwids/hwids-20120611.ebuild
similarity index 56%
rename from sys-apps/hwids/hwids-20120507.ebuild
rename to sys-apps/hwids/hwids-20120611.ebuild
index 6bec610a8c76..63a09482c40a 100644
--- a/sys-apps/hwids/hwids-20120507.ebuild
+++ b/sys-apps/hwids/hwids-20120611.ebuild
@@ -1,31 +1,37 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20120507.ebuild,v 1.1 2012/05/10 05:00:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20120611.ebuild,v 1.1 2012/06/12 17:32:52 flameeyes Exp $
 
 EAPI="4"
 
 DESCRIPTION="Hardware (PCI, USB) IDs databases"
-HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/hwids.git;a=summary"
-SRC_URI="http://dev.gentoo.org/~flameeyes/hwids/${P}.tar.xz"
+HOMEPAGE="https://github.com/Flameeyes/hwids"
+SRC_URI="https://github.com/Flameeyes/hwids/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
 RDEPEND="!<sys-apps/pciutils-3.1.9-r2
 	!<sys-apps/usbutils-005-r1"
 
+S="${WORKDIR}"
+
 src_compile() {
+	cd "${S}"/Flameeyes-hwids-*
+
 	for file in {usb,pci}.ids; do
 		gzip -c ${file} > ${file}.gz || die
 	done
 }
 
 src_install() {
+	cd "${S}"/Flameeyes-hwids-*
+
 	insinto /usr/share/misc
 	doins {usb,pci}.ids{,.gz}
 
-	dodoc README
+	dodoc README.md
 }
diff --git a/sys-auth/ykpers/ykpers-1.3.4.ebuild b/sys-auth/ykpers/ykpers-1.3.4.ebuild
index fe27664e436a..0f072527a51f 100644
--- a/sys-auth/ykpers/ykpers-1.3.4.ebuild
+++ b/sys-auth/ykpers/ykpers-1.3.4.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/sys-auth/ykpers/ykpers-1.3.4.ebuild,v 1.3 2012/05/22 16:15:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/ykpers/ykpers-1.3.4.ebuild,v 1.4 2012/06/12 11:52:06 iksaif Exp $
 
 EAPI=2
 inherit eutils autotools
 
 DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="http://yubikey-personalization.googlecode.com/files/${P}.tar.gz"
-HOMEPAGE="http://code.google.com/p/yubikey-personalizaiton/"
+HOMEPAGE="http://code.google.com/p/yubikey-personalization"
 
 KEYWORDS="~amd64"
 SLOT="0"
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 0f555a66b6a2..85fb0d05edb7 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,26 +1,13 @@
-DIST binutils-apple-3.2-unwind-patches-2.tar.xz 23888 RMD160 2d677f7a3f74aaec20f1e999283dd023d1873b54 SHA1 e1b74657fa3f3a0cf479bf7e03d8aceb2295a985 SHA256 2859c3545c467f516bac0704ff97a8d18766d91faa28dfad1dcc07bfbd03919d
-DIST binutils-apple-3.2-unwind-patches-3.tar.xz 23908 RMD160 087a2fdb12b6e4bc23379ebee6f5c6ddc1aabc04 SHA1 9fb923c01056e3ce48b8a85799555335993871b3 SHA256 b3082b464cf8fdc4b1f8fd2a73b5b7580c524cdde09869b82b770e62168b6939
 DIST binutils-apple-3.2-unwind-patches-5.tar.xz 26924 RMD160 462614cf36d5fd67630126e28592d106367cca72 SHA1 30d4155ee643a3dbd0d4bb5f79a6de307d4f1a29 SHA256 65a3b979df5c2033ac34e830d8a77b92b436b6d5707483c619c90a1c2ea46428
-DIST binutils-apple-LP64-patches-1.tar.bz2 10235 RMD160 754e956a9b8b9ecdf1bde5115bad0eb85545292e SHA1 e863f222e2f3eb5134de661987c7e5b58abaa710 SHA256 a107459f3914d57524e51ec4cb5e800f6715d40003514c79add0b5b4521cf809
 DIST cctools-698.1.tar.gz 2318018 RMD160 898c7b46869d4989c115420912fdd8d96ae923d3 SHA1 11cb788151365fb365f7bf4a9083c3fcc6fa88f7 SHA256 383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-DIST cctools-698.tar.gz 2318613 RMD160 6e044c684936172d048e0790d087bb96e47ecb20 SHA1 9016e64d064b99e16ad71c79f2337dd0fc281b1b SHA256 c7a02ebab31fb3ecc18299e85620913ea3729750114d01a50f6e404ff405dc71
-DIST cctools-750.tar.gz 1947953 RMD160 4b4074a93d071fc56f5b9ebd972c6a175bb9904e SHA1 20dd28b6e41e6ca367a6f457f6b465a0e4fbae3c SHA256 188855640da114e37e4ddd4824ff6cdc1ea89dfb6c90a23905c9ca315342f356
-DIST cctools-773.tar.gz 1962238 RMD160 3ea1b348c878efebc1d1ba9d50a89840c272aafd SHA1 762318baef6f4efca75a066d8265e0cddee267e1 SHA256 293729884921bc9c05fcbe8ef9c2b1166a7ff92cfd5bdb30349b483e78464f98
-DIST cctools-782.tar.gz 1981521 RMD160 5b50b75ff7825a97fa4f095d135a6372ce787c10 SHA1 1ed1e38564fc00dc2825382ca5c856403b5eeba3 SHA256 fdf0f60adfab24dd87af9e91c364743e006a241d297ee3cbba7b628fda6d7a9c
 DIST cctools-795.tar.gz 1993795 RMD160 0932fa5a96b81e50528211abfec01a9b66790485 SHA1 e4b67b6dac2173a519a57c92ef7be5bf3013417f SHA256 7fab7044b648e92a9fefd493a1bb6daa4246f24c5838d8b5c913a446e6bbd2ef
-DIST cctools-806.tar.gz 2004935 RMD160 91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 SHA1 e4f9a7ee0eef930e81d50b6b7300b8ddc1c7b341 SHA256 6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
 DIST cctools-809.tar.gz 2014410 RMD160 f433124035ac0ef403bdc6edec087bdedd0b4375 SHA1 b7bff424c86420866543379effb5b70d4404b95b SHA256 03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
 DIST cctools-822.tar.gz 2024412 RMD160 1caf207acbf421cdc975926a392fc75dc1d2594c SHA1 bd04447522aa69c1f71ab01811ac46dca23b92b7 SHA256 dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
 DIST dyld-195.5.tar.gz 411615 RMD160 7f36612730f7fde53359314b899efe493378a086 SHA1 97b68163281a3ec82ab2e2a777bea08511c95976 SHA256 2cf0484c87cf79b606b351a7055a247dae84093ae92c747a74e0cde2c8c8f83c
 DIST dyld-195.6.tar.gz 412518 RMD160 440c49f641e45a7bce459aaea2c4fe0dd0385351 SHA1 1fb2d94f2902975e572d2a0b22d8bd1d1a1ac6d8 SHA256 69296e9b4192bdac778ea899fffc18b02be62b51b5e8474b4cf85ae5f2b08aa4
-DIST ld64-123.2.1.tar.gz 452872 RMD160 8ebca37c8e6b5fa02c43afe419bef12ca8330898 SHA1 0664f9dc2f7e3532444ccaeee118728b2be7fbbf SHA256 8d9d92288375f81ca2c91b74ed1d4206a5bbcbd463ccec1e85decdcdc2f0ca1a
 DIST ld64-127.2.tar.gz 496975 RMD160 8ee709341549a1944732daef6ebab7ef1acfcc6e SHA1 df51258a75e4c5f0df185b99f74f7232d310f45e SHA256 97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
 DIST ld64-128.2.tar.gz 494361 RMD160 0da68b89669233d7b6cc6ebdb92482e191bc9051 SHA1 b908f84a6914de04923e0ab1c7e6eead2e24154c SHA256 96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
 DIST ld64-85.2.1.tar.gz 598524 RMD160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 SHA1 31a7debf4c407c32b8bd1a51a4b4a7ae68dc8b85 SHA256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
-DIST ld64-85.2.2.tar.gz 298144 RMD160 f7f897666a072e07f1888beca5b22fdd75fa1b61 SHA1 33c655bd7cbfecd70807dbde428615fb0947f31b SHA256 01ab6f6f1ce91203722c5cd56666ffa81da0eafe8beee1490a383811d56d86aa
-DIST ld64-95.2.12.tar.gz 401104 RMD160 35de89aa1d31d100bd952829df4316e640c03cb4 SHA1 eea384a5ed3b5a994cc24e076c74ad20e6f8b68a SHA256 5a5ea02bd81d74f4f773403bebe34950acf4830fb7fee0d466305276f869097c
-DIST ld64-97.14.tar.gz 421074 RMD160 5116cc587a7761d06e1da93019362705510c3d7b SHA1 a21da97f574a121ef29b8a1bfc7a7c74692a0152 SHA256 bfc46df452fc60d9befcefabac8db444d963407af4e3a060a01e394d5ee8d2b4
 DIST ld64-97.17.tar.gz 421947 RMD160 d52df7d7f741c8bedd29cbac73dbb9db992b4795 SHA1 7c1d816c2fec02e558f4a528d16d8161f0e379b5 SHA256 02bd46af0809eaa415d096d7d41c3e8e7d80f7d8d181840866fb87f036b4e089
-DIST ld64-97.2.tar.gz 415630 RMD160 e5557db2809627a9a0771c949b42e15c23eb65ba SHA1 3db816678f96db0dc1936af0ceb5c58b049648d6 SHA256 3a94376586656192e16a09c7b82e2a70f0a441fc8cb2ccf8a835a050e82866da
 DIST libunwind-30.tar.gz 82811 RMD160 3e288379a63a78b566df7d185b0677f214b37e56 SHA1 e779fbe8a58e6cfb76798c8e9b2373a9ddc9b2eb SHA256 6ac97d18cc2b05e6de1269bf5af03b81948bd2200dae827527f3dc618b82bd41
 DIST libunwind-llvm-115426.tar.bz2 74622 RMD160 fa69073d23e71c1a5977b3cf4b5b086190079716 SHA1 4a0b371da27361f62380250d2c4a176d939554c4 SHA256 e77a42c04eda5e3db61fc8b5bc98a55c6a015a9b02a74aab0f35d551fc38272f
diff --git a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild
deleted file mode 100644
index b777dfee4c2c..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.1.ebuild,v 1.3 2010/03/21 19:33:06 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test mirror" # the test suite will test what's installed.
-
-LD64=ld64-85.2.2
-CCTOOLS=cctools-698
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.1.1"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-DEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-RDEPEND="${DEPEND}"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-prepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/Makefile .
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64}\\n\""
-	sed -i \
-		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
-		ObjectDump.cpp
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	elog "Deleted $c tests that were bound to fail"
-}
-
-src_prepare() {
-	prepare_ld64
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-as.patch
-	epatch "${FILESDIR}"/${P}-as-dir.patch
-	epatch "${FILESDIR}"/${P}-ranlib.patch
-	epatch "${FILESDIR}"/${P}-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${P}-nmedit.patch
-	epatch "${FILESDIR}"/${P}-no-efi-man.patch
-	epatch "${FILESDIR}"/${P}-no-headers.patch
-	epatch "${FILESDIR}"/${P}-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-testsuite.patch
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
-	# but not on tiger.
-	[[ ${CHOST} == *-apple-darwin8 ]] && \
-		append-flags -isystem "${S}"/${CCTOOLS}/include/
-	emake
-	use test && emake build_test
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		RC_CFLAGS="${CFLAGS}"
-	cd "${S}"/${CCTOOLS}/as
-	# the errors can be ignored
-	emake -k \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-}
-
-src_compile() {
-	tc-export CC CXX
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
deleted file mode 100644
index 1f916b2556b3..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild,v 1.4 2010/05/02 14:37:45 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-LD64=ld64-95.2.12
-CCTOOLS=cctools-750
-UNWIND=binutils-apple-3.2-unwind-patches-2
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.1.1-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-armv7-defines.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/${LD64}-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == *-darwin10 ]] && \
-		epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/${LD64}-darwin8-no-mlong-branch-warning.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		TRIE= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild
deleted file mode 100644
index d564ff155a42..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.2.ebuild,v 1.1 2010/05/18 10:42:10 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.2
-CCTOOLS=cctools-773
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-3
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.2"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == *-darwin10 ]] && \
-		epatch "${WORKDIR}"/ld64-unwind/${LD64}-message-before-abort.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		TRIE= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild
deleted file mode 100644
index d6c86ab14de9..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r1.ebuild,v 1.2 2010/08/16 07:39:37 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.14
-CCTOOLS=cctools-782
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die
-	cp other/prune_trie.h include/mach-o/ || die
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-	sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	# LTO does not exist on older Macs
-	if [[ ${CHOST##-darwin} -ge 10 ]] ; then
-		append-libs LTO
-		append-flags -DLTO_SUPPORT
-	else
-		append-flags -ULTO_SUPPORT
-	fi
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild
deleted file mode 100644
index b8b2ed567062..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.3-r2.ebuild,v 1.1 2010/11/18 19:37:05 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-97.14
-CCTOOLS=cctools-782
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.3"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test"
-SLOT="0"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.2.2-as.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/ld64-95.2.12-Makefile Makefile
-
-	ln -s ../../${CCTOOLS}/include
-	cp "${WORKDIR}"/ld64-unwind/compact_unwind_encoding.h include/mach-o/
-	cp other/prune_trie.h include/mach-o/ || die
-	# use our own copy of lto.h, which doesn't require llvm build-env
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/${LD64}-llvm-lto.h include/llvm-c/lto.h || die
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
-	[[ ${CHOST} == powerpc*-darwin* ]] && \
-		epatch "${FILESDIR}"/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
-	if use !lto ; then
-		sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-	fi
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	if use lto ; then
-		append-flags -DLTO_SUPPORT
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
-		append-libs LTO
-	else
-		append-flags -ULTO_SUPPORT
-	fi
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= LTO= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= LTO= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
deleted file mode 100644
index dce382dbe163..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.6 2010/03/21 19:33:06 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-# LD64=ld64-95.2.12 # can't compile this one, missing libunwind/* includes
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-LD64=ld64-85.2.1 # from 3.1.2
-CCTOOLS=cctools-750
-LP64PATCHES=binutils-apple-LP64-patches-1
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.gentoo.org/~grobian/distfiles/${LD64}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${CCTOOLS}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${LP64PATCHES}.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-SLOT="0"
-
-DEPEND="sys-devel/binutils-config
-	test? ( >=dev-lang/perl-5.8.8 )"
-RDEPEND="${DEPEND}"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-prepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/Makefile .
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	sed -i \
-		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
-		ObjectDump.cpp || die
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	elog "Deleted $c tests that were bound to fail"
-}
-
-src_prepare() {
-	prepare_ld64
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.1.1-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-armv7-defines.patch
-
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-	epatch "${WORKDIR}"/LP64/ld64/*.patch
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
-	# but not on tiger.
-	[[ ${CHOST} == *-apple-darwin8 ]] && \
-		append-flags -isystem "${S}"/${CCTOOLS}/include/
-	emake || die "emake failed for ld64"
-	use test && emake build_test
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		TRIE= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	tc-export CC CXX
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
deleted file mode 100644
index 3809d3ef0420..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.6 2011/11/05 16:37:23 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-LD64=ld64-123.2.1
-CCTOOLS=cctools-806
-LIBUNWIND=libunwind-30
-DYLD=dyld-195.5
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-UNWIND=binutils-apple-3.2-unwind-patches-5
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.gentoo.org/~grobian/distfiles/${UNWIND}.tar.xz
-	http://www.gentoo.org/~grobian/distfiles/libunwind-llvm-115426.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm )
-	test? ( >=dev-lang/perl-5.8.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-apple-4.2.1"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-if is_cross ; then
-	SLOT="${CTARGET}-4"
-else
-	SLOT="4"
-fi
-
-LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-INCPATH=${LIBPATH}/include
-DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-if is_cross ; then
-	BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-else
-	BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-fi
-
-S=${WORKDIR}
-
-src_prepare() {
-	cd "${S}"/${LIBUNWIND}/src
-	cp "${FILESDIR}"/${LIBUNWIND}-Makefile Makefile
-
-	cd "${S}"/${LD64}/src
-	cp "${FILESDIR}"/${LD64%.1}-Makefile Makefile
-	epatch "${FILESDIR}"/${LD64}-lto.patch
-
-	ln -s ../../${CCTOOLS}/include
-	cp other/prune_trie.h include/mach-o/ || die
-	# use our own copy of lto.h, which doesn't require llvm build-env
-	mkdir -p include/llvm-c || die
-	cp "${WORKDIR}"/ld64-unwind/ld64-97.14-llvm-lto.h include/llvm-c/lto.h || die
-	# make libunwind sources known
-	ln -s ../../${LIBUNWIND}/src libunwind || die
-	cp ../../${LIBUNWIND}/include/*.h include/ || die
-	# mimic OS X Lion-style Availability.h macros
-	if [[ ${CHOST#*-darwin} -le 10 ]] ; then
-		{
-			echo "#define __OSX_AVAILABLE_STARTING(x,y)  "
-			echo "#define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d)  "
-		} > include/Availability.h
-	fi
-
-	echo '' > configure.h
-	echo '' > linker_opts
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${FILESDIR}"/${LD64%.1}-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${FILESDIR}"/${LD64%.1}-darwin8-no-mlong-branch-warning.patch
-		sed -i -e '/#include <mach-o\/loader.h>/a\#include <mach/i386/thread_status.h>' \
-			ld/HeaderAndLoadCommands.hpp || die
-	fi
-	if use !lto ; then
-		sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-4.0-as.patch
-	epatch "${FILESDIR}"/${PN}-4.0-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.2.3-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-4.0-no-oss-dir.patch
-
-	# clean up test suite
-	cd "${S}"/${LD64}
-#	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-}
-
-src_configure() {
-	tc-export CC CXX AR
-	if use lto ; then
-		append-flags -DLTO_SUPPORT
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/llvm
-		append-libs LTO
-		LTO=1
-	else
-		append-flags -ULTO_SUPPORT
-		LTO=0
-	fi
-	append-flags -DNDEBUG
-	append-flags -I${WORKDIR}/libunwind/include
-}
-
-compile_libunwind() {
-	# not used, just for testing, and possible use in the future
-	einfo "building ${LIBUNWIND}"
-	cd "${S}"/${LIBUNWIND}/src
-	emake DYLDINCS=-I../../${DYLD}/include || die
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	# remove antiquated copy that's available on any OSX system and
-	# breaks ld64 compilation
-	mv include/mach-o/dyld.h{,.disable}
-	emake \
-		LTO=${LTO} \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} -I../../${DYLD}/include" \
-		LDFLAGS="${LDFLAGS} ${LIBS}" \
-		|| die "emake failed for ld64"
-	use test && emake build_test
-	# restore, it's necessary for cctools' install
-	mv include/mach-o/dyld.h{.disable,}
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= LTO= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		|| die "emake failed for the cctools"
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		|| die "emake failed for as"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= LTO= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch
deleted file mode 100644
index d89a0c19f2c6..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2-armv7-defines.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cctools/include/mach/machine.h
-+++ cctools/include/mach/machine.h
-@@ -306,6 +306,7 @@
- #define CPU_SUBTYPE_ARM_V6		((cpu_subtype_t) 6)
- #define CPU_SUBTYPE_ARM_V5TEJ		((cpu_subtype_t) 7)
- #define CPU_SUBTYPE_ARM_XSCALE		((cpu_subtype_t) 8)
-+#define CPU_SUBTYPE_ARM_V7			((cpu_subtype_t) 9)
- 
- /*
-  *	MC88000 subtypes
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile b/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile
deleted file mode 100644
index 976299a1d430..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2-ld64-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-AR = ar
-CXX = g++
-INCS = -Iinclude -Isrc/abstraction -Isrc/ld
-CXXFLAGS = $(INCS)
-LDFLAGS = 
-
-all: machocheck rebase unwinddump dyldinfo ObjectDump ld
-
-libprunetrie.a: src/other/PruneTrie.o src/other/prune_trie.h
-	$(AR) -r -c libprunetrie.a src/other/PruneTrie.o
-
-ld: libprunetrie.a src/ld/ld.o src/ld/Options.o src/ld/debugline.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-rebase: src/other/rebase.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-dyldinfo: src/other/dyldinfo.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-unwinddump: src/other/unwinddump.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-ObjectDump: src/other/ObjectDump.o src/ld/debugline.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
-machocheck: src/other/machochecker.o
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-
diff --git a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch b/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
deleted file mode 100644
index a13ace81b550..000000000000
--- a/sys-devel/binutils-apple/files/binutils-apple-3.2.3-as-dir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-handles the libexecdir for as and other fixes
-
---- cctools-698/as/driver.c
-+++ cctools-698/as/driver.c
-@@ -27,6 +27,9 @@
- char **envp)
- {
-     const char *LIB =
-+#ifdef ASLIBEXECDIR
-+      ASLIBEXECDIR;
-+#else
- #if defined(__OPENSTEP__) || defined(__HERA__) || \
-     defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__)
- 		    "/usr/libexec/";
-@@ -40,6 +42,7 @@
- #else
- 		    "/usr/local/libexec/gcc/darwin/";
- #endif
-+#endif
-     const char *AS = "/as";
- 
-     int i;
-@@ -170,7 +170,11 @@
- 	    }
- 
- 	}
-+#ifndef ASLIBEXECDIR
-	as = makestr(prefix, LIB, arch_name, AS, NULL);
-+#else
-+	as = makestr(LIB, arch_name, AS, NULL);
-+#endif
- 
- 	/*
- 	 * If this assembler exist try to run it else print an error message.
-@@ -182,6 +182,10 @@
- 	    else
- 		exit(1);
- 	}
-+#ifdef ASLIBEXECDIR
-+    as_local = "";
-+	{
-+#else
- 	as_local = makestr(prefix, LOCALLIB, arch_name, AS, NULL);
- 	if(access(as_local, F_OK) == 0){
- 	    argv[0] = as_local;
-@@ -193,6 +198,7 @@
- 		exit(1);
- 	}
- 	else{
-+#endif
- 	    printf("%s: assembler (%s or %s) for architecture %s not "
- 		   "installed\n", progname, as, as_local, arch_name);
- 	    arch_flags = get_arch_flags();
-@@ -183,6 +190,7 @@
- 		    printf("%s for architecture %s\n", as, arch_flags[i].name);
- 		    count++;
- 		}
-+#ifndef ASLIBEXECDIR
- 		else{
- 		    as_local = makestr(LOCALLIB, arch_flags[i].name, AS, NULL);
- 		    if(access(as_local, F_OK) == 0){
-@@ -193,6 +201,7 @@
- 			count++;
- 		    }
- 		}
-+#endif
- 	    }
- 	    if(count == 0)
- 		printf("%s: no assemblers installed\n", progname);
diff --git a/sys-devel/clang/clang-3.1-r4.ebuild b/sys-devel/clang/clang-3.1-r4.ebuild
index ff132f889baa..0ed93c169203 100644
--- a/sys-devel/clang/clang-3.1-r4.ebuild
+++ b/sys-devel/clang/clang-3.1-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/sys-devel/clang/clang-3.1-r4.ebuild,v 1.1 2012/06/07 00:27:55 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.1-r4.ebuild,v 1.2 2012/06/12 17:49:22 grobian Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug kernel_FreeBSD multitarget +static-analyzer test"
 
 DEPEND="static-analyzer? ( dev-lang/perl )"
diff --git a/sys-devel/llvm/llvm-3.1.ebuild b/sys-devel/llvm/llvm-3.1.ebuild
index 2af7a9b77396..1c08e0a02988 100644
--- a/sys-devel/llvm/llvm-3.1.ebuild
+++ b/sys-devel/llvm/llvm-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/llvm/llvm-3.1.ebuild,v 1.4 2012/06/04 20:23:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1.ebuild,v 1.5 2012/06/12 17:48:20 grobian Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -12,7 +12,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 656522806749..d320c6fb9336 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -2,10 +2,12 @@ DIST deblob-3.0 102531 RMD160 d3ea6f04cd4d6c7f652f4532e7558f931d3952d1 SHA1 3702
 DIST deblob-3.1 103909 RMD160 723d36ef2574419417bbf30eda6a83aaa91922d7 SHA1 39d2c6e69f4e3b84e112b6e3e9389c983976fe4b SHA256 9dcf6f981cb3681f8afab0a4f814aebd6c2f46f8e635d2f35657d8344ef6b30e
 DIST deblob-3.2 107602 RMD160 56f1dfe4f0254c802b49ea5220c4f67e56649852 SHA1 83421184d88d02e24de2adbc5debfb03454a7f4b SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20
 DIST deblob-3.3 107222 RMD160 2796d93a1a0e3034af752ac8684f935cfeff024c SHA1 787e17b058a678f54a4f951510206bc8d72c3d5c SHA256 09a4ee54faf7d96a9ca150bfa3a7a2234d589457bac40f03a6e19b5774b1ef5c
+DIST deblob-3.4 109026 RMD160 ef9be1bdfbca2bfe4d5e60dd33ed6ec30a1e5c52 SHA1 83b455ad2db0470704225d1e81864af8fd3516c3 SHA256 2fca296bccfa7dc25447f36975971597f67730168a9bc4db0853e55347950680
 DIST deblob-check-3.0 377076 RMD160 8a4f53f0a34c46fc6a2aae5878225851d7bf13e1 SHA1 b1b356f55f63746bba284644db8585d15f3da06f SHA256 72ab3f74cbcde9d453f8a4e30fd6a6339812806fe6dab3b632c1c68b90b0b104
 DIST deblob-check-3.1 405438 RMD160 da7efe959bc7c0017214daa764fcb486ff4434f2 SHA1 397157d3f6bf225f8cc4f48b6c05bc56482c2934 SHA256 77d125ae5466049fb3f1fe39ddb9320b66239de782a348c66133de591049db43
 DIST deblob-check-3.2 423268 RMD160 8cb0c1b4a289db94543396c4445c4c7a35d2ba70 SHA1 01e50f824a577d15749f24643fdd136180342808 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638
 DIST deblob-check-3.3 427140 RMD160 98998624c083205452cdc22df60d60d06b807315 SHA1 61161f84859542cd3bfe8e961fc75bf6f72031f7 SHA256 ed8fab94c7f01d89a3007135a1260553b71fa1d8e0b4e42bdecb3ffbba81b3fd
+DIST deblob-check-3.4 448778 RMD160 a00d430d137cd9d653a3c42cb36c6e31330ed007 SHA1 4d54aa271cebc0e770e152802f4cadf0dcc9471e SHA256 28ce952c082e765784f9e5b63f5a3a4fb93545e5e788dc94d094c0b3ae8ea3a0
 DIST genpatches-3.0-18.base.tar.bz2 418620 RMD160 3a75def72f7c18b623237e2b03a64c5dc751f219 SHA1 640de4375675190626e0fb2e3a2e6cdb5d1b631d SHA256 f530f6caae05a06ae04817e4ce3e696154571f219446e20d404addc9208cce79
 DIST genpatches-3.0-18.extras.tar.bz2 17193 RMD160 8eac4d558555912c08748a224b0bee04f9abd93f SHA1 542b36e0b8c712dfe06951f08e4c5fd83f3cf5fa SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91
 DIST genpatches-3.0-22.base.tar.bz2 550897 RMD160 622d6995abb82539432c14c3e1bfd01057a5d790 SHA1 8780e2609dcd4de20397f80ca873e8db6c6f6801 SHA256 49bf5e69505b06524562a1339f6c89353df74ec1fd0a944d7268498602f7e1fa
@@ -42,6 +44,8 @@ DIST genpatches-3.3-9.base.tar.bz2 220169 RMD160 ed6a909c088e3244e86c3fd28cb8445
 DIST genpatches-3.3-9.extras.tar.bz2 17199 RMD160 684b8ee4cdfd826c5713b96c8929d3b88fe72a9d SHA1 ab2111a4ffcf5b32479895007f39c6a77fd749cc SHA256 9c8fdc2671f1a66b5e473f35e2e49febc825d7383c009a5b626f44d872130cf4
 DIST genpatches-3.4-1.base.tar.bz2 5243 RMD160 ce2436bfc2d180e800b61b6688d7b33bd08b68da SHA1 5c08c5cf45e5ceb3e4dce257df43c4c46d770236 SHA256 7712de2fd86e583bc3625759067150df41c800617c02c732b0821837c55c7743
 DIST genpatches-3.4-1.extras.tar.bz2 17508 RMD160 b8b83573526b50f38768bb9b51d9ed0941de2dfd SHA1 413a4d2cb7adaab147488a69941f9c4a4731a3c1 SHA256 be8e087b3a0508e88bd36d2d4bec07e0756a3e7f7b31de4dbfd51d79412c2a96
+DIST genpatches-3.4-2.base.tar.bz2 53731 RMD160 4218a0094a864240fe8ee4844df61d9caff15e6e SHA1 2c1c71a689a0f6343b8f3f152e050cc3a584a8e7 SHA256 165de5663fc5f600777744d9614cdfad9a4f96c07e56660f5f956375df2b1053
+DIST genpatches-3.4-2.extras.tar.bz2 17502 RMD160 c5b834a28335f9a173e8e863b377aff513c791e5 SHA1 7278ac0434a59c1981c585e6a49305351b60573c SHA256 2b537431a408445cd1091562755234e840016f26ad63ab3a73812ac7f7e1c8d9
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
 DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.2.ebuild
new file mode 100644
index 000000000000..ec282c585a3e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.4.2.ebuild,v 1.1 2012/06/12 13:29:27 mpagano Exp $
+
+EAPI="3"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index c02c7178391f..624c15d06de1 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -36,8 +36,11 @@ DIST genpatches-3.3-9.base.tar.bz2 220169 RMD160 ed6a909c088e3244e86c3fd28cb8445
 DIST genpatches-3.3-9.extras.tar.bz2 17199 RMD160 684b8ee4cdfd826c5713b96c8929d3b88fe72a9d SHA1 ab2111a4ffcf5b32479895007f39c6a77fd749cc SHA256 9c8fdc2671f1a66b5e473f35e2e49febc825d7383c009a5b626f44d872130cf4
 DIST genpatches-3.4-1.base.tar.bz2 5243 RMD160 ce2436bfc2d180e800b61b6688d7b33bd08b68da SHA1 5c08c5cf45e5ceb3e4dce257df43c4c46d770236 SHA256 7712de2fd86e583bc3625759067150df41c800617c02c732b0821837c55c7743
 DIST genpatches-3.4-1.extras.tar.bz2 17508 RMD160 b8b83573526b50f38768bb9b51d9ed0941de2dfd SHA1 413a4d2cb7adaab147488a69941f9c4a4731a3c1 SHA256 be8e087b3a0508e88bd36d2d4bec07e0756a3e7f7b31de4dbfd51d79412c2a96
+DIST genpatches-3.4-2.base.tar.bz2 53731 RMD160 4218a0094a864240fe8ee4844df61d9caff15e6e SHA1 2c1c71a689a0f6343b8f3f152e050cc3a584a8e7 SHA256 165de5663fc5f600777744d9614cdfad9a4f96c07e56660f5f956375df2b1053
+DIST genpatches-3.4-2.extras.tar.bz2 17502 RMD160 c5b834a28335f9a173e8e863b377aff513c791e5 SHA1 7278ac0434a59c1981c585e6a49305351b60573c SHA256 2b537431a408445cd1091562755234e840016f26ad63ab3a73812ac7f7e1c8d9
 DIST hardened-patches-2.6.32-110.extras.tar.bz2 737790 RMD160 85dfea7298b080f95e84fceac2b6fb3512fd5fbc SHA1 60be0cc489c0e78b840ae83363b470b9da8c32e3 SHA256 8673caddeb61d7c22990e8019e395d52ce7a3294df5ff3dace7f0fa0ddfd3bc9
 DIST hardened-patches-2.6.32-111.extras.tar.bz2 738015 RMD160 6385b7c378646ad51e318ee7004a1c05fd2c12df SHA1 5290f76cd8b4d3ccb715ce6889bced63637ef460 SHA256 a35140735b19f5589d3e52829eef57044cf2c62239f428c1ed81652e3ccf9f4c
+DIST hardened-patches-2.6.32-112.extras.tar.bz2 740503 RMD160 e5a67e8ac524a63088ccad836df571974e549f3f SHA1 42165f7c93e3f4298284137100a698eabfedc6a2 SHA256 9e64b4792ec1c15813f35912f98e59d95af5099dee01f1843ae11cbf703445bd
 DIST hardened-patches-2.6.32-12.extras.tar.bz2 338946 RMD160 ce283b495ee2f009d36b94aca840f6519fbe9bb6 SHA1 56da715d64c6e2c50e292b19d27006d82118a337 SHA256 bfa5e7d9653b793b2bd88c40b8b52464fe39e1e098f1c5bc95d8476247fd288f
 DIST hardened-patches-2.6.32-45.extras.tar.bz2 378165 RMD160 f3a607fe2ee0afa3709524b29a2bf8cc89b82e31 SHA1 aff7340024bd53ae2237721dba1c489419da1f8f SHA256 04dd316b257644c104c7660a649abcd48a11fff59e7773988ace8e0da49b930c
 DIST hardened-patches-2.6.32-83.extras.tar.bz2 538575 RMD160 541c5122ab122ca7466deaf2431fcafb3135b2c2 SHA1 24173b7178a077a7b8c0c979d3742efb07d2bc9a SHA256 8640f3aaed869c3a88928f12ccadb6314e240f61f29e68de74b572735f2e313d
@@ -52,8 +55,10 @@ DIST hardened-patches-3.2.11-1.extras.tar.bz2 504890 RMD160 be00ee149bb33bbeeaf0
 DIST hardened-patches-3.2.19-1.extras.tar.bz2 557656 RMD160 edd11cea9fa0282bed55e0b578cca66f97059826 SHA1 aaf56ce9e31875460bd31d5ea173f691149577e9 SHA256 609233beba45c7977f9f5d13e302c8b048fa258f5130903c73998c5be3584637
 DIST hardened-patches-3.2.19-2.extras.tar.bz2 557805 RMD160 869555794f9c786ee1b3b261d166e65965dec191 SHA1 8ba56b77fbdc886e64e1a19a3c94fd5f514f8248 SHA256 c6cfce72cb3b052cbc237507503aa5f0f69d571a670599f65c4450c509e27ff9
 DIST hardened-patches-3.2.2-2.extras.tar.bz2 549864 RMD160 13c1c5229cadf18c08a0836154e42b704886e4c3 SHA1 5084934b7e1b910866b3aba55372366b13df5f43 SHA256 ac5a31186deea2324442f0989bc897548d018d0fbd2fa1abcc7cd846b3271a19
+DIST hardened-patches-3.2.20-1.extras.tar.bz2 576830 RMD160 f0463d9582e1649833e6161f3a8174db923bec81 SHA1 4b4b6ebd3189f9d28a583d6a1dbfe7bac46fed3e SHA256 c05b82dbecb18df9ebd3a9064157fa8a316aad409e4b27b955a44dc055ffbe5f
 DIST hardened-patches-3.3.8-1.extras.tar.bz2 550705 RMD160 f1723d28ab7bd84e8a2864d445161df9f127dd39 SHA1 e74588414e2f8a5e77f0133fb994b097f63af987 SHA256 ace43fd903364b7dac5b59308e0cd04a9d439a8d95b1e419bcdca03738ea15b9
 DIST hardened-patches-3.4.1-1.extras.tar.bz2 574083 RMD160 a1a715287e83551b44a9b3b8bf75f2466cb2691f SHA1 9ee51581ce88e575135854cd962362e8c746835c SHA256 4aa4d3cd6f3f8c8906842388f17909fc3be110c7270c6371c44914175a87e91f
+DIST hardened-patches-3.4.2-1.extras.tar.bz2 546639 RMD160 23b07aaa0c87b11b4945fd6f84e31e286dc2c964 SHA1 29fd884c8f4bd53a923bb08835b15a26fa20b9bf SHA256 a513ad66af2e1feccc40c89b492336525db3c4c9e9227b6d957a05ee9fcabfd3
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r110.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r110.ebuild
new file mode 100644
index 000000000000..76efcd6bddc2
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r110.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r110.ebuild,v 1.1 2012/06/12 17:36:08 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="48"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-112"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.9.1"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization]."
+	ewarn
+	ewarn "Those who intend to use one of these predefined grsecurity levels"
+	ewarn "should read the help associated with the level.  Users importing a"
+	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
+	ewarn "should review their selected grsecurity/PaX options carefully."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.20.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.20.ebuild
new file mode 100644
index 000000000000..362c5d0f732a
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.20.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.20.ebuild,v 1.1 2012/06/12 17:41:51 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="15"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.9.1"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
+	ewarn "use one of these predefined grsecurity levels should read the help"
+	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
+	ewarn "users with more, than one version of gcc installed should use gcc-config"
+	ewarn "to select a compatible version."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}*"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.4.2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.4.2.ebuild
new file mode 100644
index 000000000000..92cbb8de3ef7
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.4.2.ebuild,v 1.1 2012/06/12 17:45:05 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.9.1"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
+	ewarn "use one of these predefined grsecurity levels should read the help"
+	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
+	ewarn "users with more, than one version of gcc installed should use gcc-config"
+	ewarn "to select a compatible version."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}*"
+	ewarn
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index c32e6c8c75f8..cf574cfa9661 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,5 +1 @@
-DIST linux-firmware-20110731.tar.bz2 15251521 RMD160 18be95d4e230726c02764d6ee5b12dc546c72922 SHA1 57df268331586c10531ec2249b85ccedd114e98b SHA256 f7e122642b99727db63ec6cf2fb64037e7e49a2e5db59a62cdba444a273905d3
-DIST linux-firmware-20110818.tar.bz2 16023823 RMD160 ff8f4f7fbfc3f9608d44d72bbc5f544f562e1a2d SHA1 4279c2937f7fc834441a3e78e286e6688c873c99 SHA256 4cf4ac66e2b3cff7550857ec7fa52d9d274c0000b2486b701d16f6e9cc57795d
-DIST linux-firmware-20120125.tar.gz 22407395 RMD160 930b8efa5ad05b93fbe79ade2c4e894ed819344b SHA1 84dadf2ab0ca26cb603da850ce0a113129f98a5a SHA256 be15aefa80668288fc1202f32f4be06fcc751eed5cceeaaeb65b6de1c71761aa
-DIST linux-firmware-20120219.tar.gz 23579430 RMD160 77a3b07c8873812c79607631956545e40f0843ae SHA1 7deb392f34617b9f4bc1bf1c23b38a16396b7da9 SHA256 cbcb30f6c42bb5dd64b1835dc1054fffb27126b7be4385f1d65b4f46529c88f4
 DIST linux-firmware-20120502.tar.xz 14956760 RMD160 8c21a99d40dbeed4fc28c02f5f3d744915d92b7b SHA1 9ac33b46953bc794f48b76509eadb6a455ca444c SHA256 b660b4b315060214217370811ccf47593275717b73464046b16858a6812b88d8
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
deleted file mode 100644
index 6768a71f784a..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.8 2012/02/29 17:37:07 tetromino Exp $
-
-EAPI=3
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="amd64 arm x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r * || die "Install failed!"
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
deleted file mode 100644
index 9049690c22d4..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.5 2012/02/29 17:37:07 tetromino Exp $
-
-EAPI=3
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r * || die "Install failed!"
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
deleted file mode 100644
index 64efd576f896..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120125.ebuild,v 1.6 2012/05/28 16:20:13 armin76 Exp $
-
-EAPI=4
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="amd64 arm ~ia64 x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild
deleted file mode 100644
index 3d974afd6813..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120219.ebuild,v 1.3 2012/05/28 16:20:13 armin76 Exp $
-
-EAPI=4
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6030-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
index c11a66b4d065..f12b3a1a216a 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120502.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-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.5 2012/06/09 08:43:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.6 2012/06/12 22:22:52 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -37,6 +37,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
 		!net-wireless/iwl1000-ucode
+		!net-wireless/iwl2030-ucode
 		!net-wireless/iwl3945-ucode
 		!net-wireless/iwl4965-ucode
 		!net-wireless/iwl5000-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index df1c84ccb70f..aac3a1938730 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.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-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.16 2012/05/03 15:57:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.17 2012/06/12 22:22:52 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -37,6 +37,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
 		!net-wireless/iwl1000-ucode
+		!net-wireless/iwl2030-ucode
 		!net-wireless/iwl3945-ucode
 		!net-wireless/iwl4965-ucode
 		!net-wireless/iwl5000-ucode
diff --git a/virtual/pkgconfig/pkgconfig-0.ebuild b/virtual/pkgconfig/pkgconfig-0.ebuild
index 8ae898aa484c..76e407dc7440 100644
--- a/virtual/pkgconfig/pkgconfig-0.ebuild
+++ b/virtual/pkgconfig/pkgconfig-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/pkgconfig/pkgconfig-0.ebuild,v 1.8 2012/05/28 22:26:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0.ebuild,v 1.9 2012/06/12 17:49:03 jdhore Exp $
 
 EAPI=2
 
@@ -16,8 +16,8 @@ IUSE=""
 DEPEND="
 	|| (
 		>=dev-util/pkgconfig-0.26
-		dev-util/pkg-config-lite
 		dev-util/pkgconf[pkg-config]
+		dev-util/pkg-config-lite
 		dev-util/pkgconfig-openbsd[pkg-config]
 	)"
 RDEPEND="${DEPEND}"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index edb4df431346..924357f9b69f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-19.0.1084.52.tar.bz2 184040348 RMD160 1393cb8c423eb7af14d42df40f2bf8afcf4860aa SHA1 e27acc2cdef9f47b0d8a136b3c5867d86e9317b6 SHA256 e725d4aa7608c9975b8989188d85d38846956db2f480a1a217bcab06419dab72
 DIST chromium-19.0.1084.56.tar.bz2 184089352 RMD160 316b908ecdb55714ba544b99f6ece98bfeae5465 SHA1 9a0521fe26fd54f0942ceaef0a767e7854461e13 SHA256 c33a2cac35a3dd6ef359d8dee47dc405732f9e0865c82cffb876f5d936ec1418
 DIST chromium-20.0.1132.27.tar.bz2 185120793 RMD160 aea3c02993878bc2b49ef828fee29d3c50b9ecf2 SHA1 7e5838cc808a5299650d7b2f5a768279439e83fa SHA256 ff9813a6cc8a623eba8d104766d828c1ad8e91ed6496888d5ca0a8b4836b3453
-DIST chromium-21.0.1155.2.tar.bz2 191277883 RMD160 cb009d4aed04f1aeb0e1c261211a85b5f79ecbbf SHA1 7858fb6f6d2010aec30e2d6dea43b50d92ec3d6f SHA256 1624d617b9d3eeeb6a302d85db23dd43d611d0ca558a48a1156119390953838d
 DIST chromium-21.0.1163.0.tar.bz2 192046119 RMD160 59091e5c8ff30210d1cf60196787231058199322 SHA1 8f99f6de0b28a28c53b96391c98093f35724ca2c SHA256 9fa17f1ab2b6fba1039897e23c6bf2e33c567a846cb3a6c29f66bd6a485c4bb7
+DIST chromium-21.0.1171.0.tar.bz2 190680094 RMD160 e1a4dc926b5a34526a30447391dd971fcb700024 SHA1 c91c9139c3d6a9eab4ebb90faf875192f3959b84 SHA256 3fd9b2d8895750a4435a585b9c2dc7d34b583c6470ba67eb6ea6c2579f126377
diff --git a/www-client/chromium/chromium-21.0.1155.2.ebuild b/www-client/chromium/chromium-21.0.1171.0.ebuild
similarity index 97%
rename from www-client/chromium/chromium-21.0.1155.2.ebuild
rename to www-client/chromium/chromium-21.0.1171.0.ebuild
index 8caaf49fcaf4..c890bcb35c91 100644
--- a/www-client/chromium/chromium-21.0.1155.2.ebuild
+++ b/www-client/chromium/chromium-21.0.1171.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/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.3 2012/06/09 10:26:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1171.0.ebuild,v 1.1 2012/06/12 13:53:14 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -41,7 +41,6 @@ RDEPEND="app-arch/bzip2
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
-	>=media-libs/libwebp-0.1.3
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -110,8 +109,8 @@ src_prepare() {
 	sed -i '1i#define OF(x) x' \
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
-	# Unbundle expat, bug #384773.
-	epatch "${FILESDIR}/${PN}-expat-r0.patch"
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
 	epatch_user
 
@@ -136,6 +135,7 @@ src_prepare() {
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libusb/libusb.h' \
 		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
@@ -204,6 +204,8 @@ src_configure() {
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#       needs to become part of webp release)
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -212,7 +214,6 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index a5f26223eea5..20a65d02b9e6 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.119 2012/06/09 10:26:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.120 2012/06/12 13:53:14 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
+	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
@@ -40,7 +41,6 @@ RDEPEND="app-arch/bzip2
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
-	>=media-libs/libwebp-0.1.3
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -173,7 +173,6 @@ src_prepare() {
 		\! -path 'third_party/angle/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
 		\! -path 'third_party/ffmpeg/*' \
 		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/gpsd/*' \
@@ -189,6 +188,7 @@ src_prepare() {
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libusb/libusb.h' \
 		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
@@ -257,6 +257,8 @@ src_configure() {
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#       needs to become part of webp release)
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -265,7 +267,6 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
diff --git a/www-client/chromium/files/chromium-ppapi-r0.patch b/www-client/chromium/files/chromium-ppapi-r0.patch
new file mode 100644
index 000000000000..fb7e160c29c9
--- /dev/null
+++ b/www-client/chromium/files/chromium-ppapi-r0.patch
@@ -0,0 +1,11 @@
+--- ppapi/ppapi_untrusted.gyp.orig	2012-06-12 10:20:16.000000000 +0200
++++ ppapi/ppapi_untrusted.gyp	2012-06-12 10:20:52.000000000 +0200
+@@ -80,7 +80,7 @@
+         ],
+       },
+       'conditions': [
+-        ['target_arch!="arm"', {
++        ['target_arch!="arm" and disable_glibc==0', {
+           'variables': {
+             'build_glibc': 1,
+             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 7d7b288c2959..c2192fa3c6f1 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,18 +1,9 @@
-DIST opera-next-12.00-1440.i386.freebsd.tar.xz 12620252 RMD160 36ab217fc3e0f2cdd61e0bfb6df3491de50ea265 SHA1 f0b285e0182d9b6ad8a9cc30de408711680e6755 SHA256 4fb4218f936a7c8a6e1d6b5c5a45ea02411979b44919d6772f7dd7898ec471f3
-DIST opera-next-12.00-1440.i386.linux.tar.xz 12647208 RMD160 0f3a6c1b8e282549d5b224b4e3bd32586fa0f0d5 SHA1 91d8e246ed495f6e7190802dca796ac5c3727f0c SHA256 c50183b357c042d8ed9b2a397b44820a96b981525e47fdc862ec66f5c77dec83
-DIST opera-next-12.00-1440.x86_64.linux.tar.xz 13714028 RMD160 f6d3fe0e409785a4488cb435e3a6937ed4298f8b SHA1 3c3aeec1b63e5b181d114620aae0ff57cfad42d8 SHA256 8af0e774ba13b2ee5c08ab0a985115866ccf68171a2d832704c49d6dc942b431
-DIST opera-next-12.00-1441.i386.freebsd.tar.xz 12621688 RMD160 3a7251fd51651c9aa72a4119770ecea2d1c3a604 SHA1 d4e7d5a57726e5f78373117fd67df5ba3ca3df11 SHA256 fe6dbbe7ddf7a795b2117d00dedeec03e2169b8c0f51413a6238ceb8779b9065
-DIST opera-next-12.00-1441.i386.linux.tar.xz 12649132 RMD160 7496d4528df9418a5a9188625920e56d707acc68 SHA1 c7ca436c9f0e9a7470209164557f727b55f5555f SHA256 43d27d3f90218b8cfa40e12df04491a147c8fc39a375708e1b95e3c879133267
-DIST opera-next-12.00-1441.x86_64.linux.tar.xz 13715908 RMD160 a4e64beb99272a851eeca46f46a0580f19a1baa9 SHA1 ded896b122da2273bf23337fdf12c560f2be2cd5 SHA256 d568ccaf82f03dc288e79ef388fc29a3ad242ecf44fd4694391b3bef18b574b4
-DIST opera-next-12.00-1445.i386.freebsd.tar.xz 12629092 RMD160 af68e6e1df01457af23ab8c5f87c810b5af0c6c2 SHA1 f5696686c4434dbe8420a4a8d4ded0fe0fbcfa7b SHA256 2e72373d276c763dd59e896e93a4163bbfcb295f3374d3822338336c5dc36601
-DIST opera-next-12.00-1445.i386.linux.tar.xz 12656308 RMD160 edcc2543fed187e80f73fe814286932051f13166 SHA1 39a69f2b94495c3a63b5df586b4bda00d165edd7 SHA256 3b94724086e9fb3c5e168978a6a5396c0c2f306feb02ae0a606e05b5a1b213c0
-DIST opera-next-12.00-1445.x86_64.linux.tar.xz 13712924 RMD160 d1f4b690b5fcce150df5499daaa4633e6362e4b2 SHA1 7d80391031484e5c43df6665e96c32dd8e772e53 SHA256 11e1eca6b97cf59a79a8bbce152e3e164b656e73cd8ccad40f700b30536c46e6
-DIST opera-next-12.00-1448.i386.freebsd.tar.xz 12596020 RMD160 1ee5cebdf0e3fdc4af850b508012259754cbd115 SHA1 ab1283eb69af2456820ca4022464abe99d988433 SHA256 04478ae2a9b80172fe35689b8c39a361002f6586b895e8502bb608068f58d864
-DIST opera-next-12.00-1448.i386.linux.tar.xz 12603472 RMD160 83f8c830a64018daf19c6aeb7d3b0c72b5176598 SHA1 4ff3d14f67deadb9e95ab43a6dabc13bf9081c4b SHA256 e01065842f77730677b091b3184d8fbb3930ca7286b13ed982f8315231832ef4
-DIST opera-next-12.00-1448.x86_64.linux.tar.xz 13682184 RMD160 ce8241db98ca3e463922e918221a89f30a50aa3a SHA1 3b7890f12f18060836240c485f2a5f8623f1b3ee SHA256 799f4b76d71b1c08f74a918fbfe8a07dd6f7710822ada92fb9bf2734a8660367
 DIST opera-next-12.00-1450.i386.freebsd.tar.xz 12598768 RMD160 f9b3402f5a379f06a90e2abad56dbc527e926f84 SHA1 92860325e8ae805868f97044e0c7c23a7b8ea3b6 SHA256 8b6f2b5345a26607d0a6dd74e529d04c2356505f70d534b2bb55240e4a62e4c6
 DIST opera-next-12.00-1450.i386.linux.tar.xz 12618328 RMD160 482521b1dbdf2c7cbb967b0a962dc4aba2d5150d SHA1 4396cbc002577c0d51017cc37dee08c26bea8884 SHA256 b3f06c540f171cdc4c4baae331071cac41b379fe71ea03c860de3e1007c8d8cc
 DIST opera-next-12.00-1450.x86_64.linux.tar.xz 13676240 RMD160 0c8117aa347d31b9040d1a16ad3484c609913a6c SHA1 693016e3cd7bb077b1e011a3769677a2a559e916 SHA256 76de0ff2159570e79fca138dc3e9d2ea721fe020c836477c9b32074583951de0
 DIST opera-next-12.00-1454.i386.freebsd.tar.xz 12561060 RMD160 c88a4b565b9f9efe32315bc78d89d07528727078 SHA1 42e31568b706773ca5b8d02d5cee6947f6b25380 SHA256 cd463114fcd226ec7fa4fc8deb05f1ded9f6a9cd76ab47082e0b3d75d57c6ee4
 DIST opera-next-12.00-1454.i386.linux.tar.xz 12585708 RMD160 b9bebb0c07ea47ed82f89dc838818b0097624e3e SHA1 273c035513f04e2e16d0210bf86c3178b98211af SHA256 ddcf1d227276df5932063cb55d8fdac65ee699fd251a2b0894dce709e09da914
 DIST opera-next-12.00-1454.x86_64.linux.tar.xz 13683260 RMD160 a39160173c09d07b117fd53205d9035797e1e4ce SHA1 6652bf342a5a1807fbc22b58fee7596e3f0bcfe1 SHA256 23aff28fb60cc4684374bafb7555d002deb0ce37b3220a6f377128fc1f650653
+DIST opera-next-12.00-1456.i386.freebsd.tar.xz 12614348 RMD160 8525ffc7e6f7962d757a471eb8cef4c47e6dd9c8 SHA1 9cc40e4aaf1c05b886cfaec92ddfb545a0813742 SHA256 f00c79de802dd37f22eb785eb328472455dfb62c5cf445513bad40f8276ed12f
+DIST opera-next-12.00-1456.i386.linux.tar.xz 12640884 RMD160 aeddcb774db04bb6e94cc1bef311709f2617c951 SHA1 0db7ea7bcac09d5428d64a12101fa536552a835c SHA256 34a129991cbccc3305ad34e2e665c49eeac5fb7df42c1620ae074d5f50ee7c7d
+DIST opera-next-12.00-1456.x86_64.linux.tar.xz 13735156 RMD160 d62c06542fb3cd49db49fda32d905ee69825765d SHA1 9e2e22f6bf28d3b037b6d519307a4ef86dd5179e SHA256 1e541189e5118f9c19ec9bd02076256fd6fd37d469f40d12cabe8879b527874a
diff --git a/www-client/opera-next/opera-next-12.00.1440.ebuild b/www-client/opera-next/opera-next-12.00.1440.ebuild
deleted file mode 100644
index b3ed59f03c93..000000000000
--- a/www-client/opera-next/opera-next-12.00.1440.ebuild
+++ /dev/null
@@ -1,223 +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/opera-next/opera-next-12.00.1440.ebuild,v 1.1 2012/06/02 04:17:11 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="bonkers_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="
-	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv
-	sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m "${D}"/${OPREFIX}/${PN}/opera*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1441.ebuild b/www-client/opera-next/opera-next-12.00.1441.ebuild
deleted file mode 100644
index ddd2c7df52d4..000000000000
--- a/www-client/opera-next/opera-next-12.00.1441.ebuild
+++ /dev/null
@@ -1,223 +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/opera-next/opera-next-12.00.1441.ebuild,v 1.1 2012/06/05 13:07:59 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="14368_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="
-	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv
-	sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m "${D}"/${OPREFIX}/${PN}/opera*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1445.ebuild b/www-client/opera-next/opera-next-12.00.1445.ebuild
deleted file mode 100644
index cd5dec73e05b..000000000000
--- a/www-client/opera-next/opera-next-12.00.1445.ebuild
+++ /dev/null
@@ -1,226 +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/opera-next/opera-next-12.00.1445.ebuild,v 1.2 2012/06/06 18:03:50 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer multilib"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="babyformula_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="
-	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv
-	sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-	if use amd64 && ! use multilib; then
-		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m "${D}"/${OPREFIX}/${PN}/opera*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1448.ebuild b/www-client/opera-next/opera-next-12.00.1456.ebuild
similarity index 93%
rename from www-client/opera-next/opera-next-12.00.1448.ebuild
rename to www-client/opera-next/opera-next-12.00.1456.ebuild
index 8818ae27ac95..97ff4ef03ebd 100644
--- a/www-client/opera-next/opera-next-12.00.1448.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1456.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/opera-next/opera-next-12.00.1448.ebuild,v 1.1 2012/06/08 03:53:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1456.ebuild,v 1.2 2012/06/12 14:32:06 jer Exp $
 
 EAPI="4"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-11 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer multilib"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="cortana_${O_V}-${O_B}"
+O_D="rc4_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
@@ -34,8 +34,8 @@ QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
 
 O_LINGUAS="
 	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv
-	sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+	hi hr hu id it ja ka kk ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr
+	sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
 "
 
 for O_LINGUA in ${O_LINGUAS}; do
@@ -51,8 +51,7 @@ GTKRDEPEND="
 	dev-libs/glib:2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) )
 	x11-libs/pango
 	x11-libs/pixman
 "
@@ -82,7 +81,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXt
 	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
 	kde? ( ${KDERDEPEND} )
 	gstreamer? ( ${GSTRDEPEND} )
 "
@@ -126,8 +124,6 @@ src_prepare() {
 	# Optional libraries
 	if ! use gtk; then
 		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
 		rm lib/${PN}/liboperagtk3.so || die
 	fi
 	if ! use kde; then
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 302c082ff8b7..50796de22dce 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,12 +1,12 @@
 DIST opera-11.64-1403.i386.freebsd.tar.xz 11544224 RMD160 2e8e5916d61f668a53c30f59102cab5b07f5be18 SHA1 67c1cdea983ae6885083fe63baa81e67cc99184d SHA256 09c5e7a058161fc5a8cca2190f8056a656e4a766e425912d436e516fbf49392f
 DIST opera-11.64-1403.i386.linux.tar.xz 11506732 RMD160 c48adf8df95c6ec8fb663b351f06857d421357f1 SHA1 a44e47d9c0fdd5f080ec100892d7b88bad0489c1 SHA256 8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82
 DIST opera-11.64-1403.x86_64.linux.tar.xz 12322044 RMD160 f6ae59b84b7e10ed72a87a2f16d95dc81fea46f0 SHA1 671e38684fb35995dd5b3834d40101e0c42850e1 SHA256 3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69
-DIST opera-12.00-1448.i386.freebsd.tar.xz 12593944 RMD160 c29445a536bcd678b15a9b05ee79c857b3f30a80 SHA1 54cd4ea99e6fcea4197e19bf957a9121a48c2c55 SHA256 c58eb2c8d29516f04f48d4603e6484a3b43858a30757defb0734b98f18e18634
-DIST opera-12.00-1448.i386.linux.tar.xz 12587428 RMD160 3a48aab7ba2f0029872427a2965c7d6d501098bf SHA1 b74a4f3d8230431fe620df2805070a0ccb9dceb3 SHA256 7accb92ccc23b284cf9ed31634ce2f2949e3beb035c21c06377f6358b44e4197
-DIST opera-12.00-1448.x86_64.linux.tar.xz 13682120 RMD160 3fa58a89df8ef3455b2d69ee1e4852030cf15a1d SHA1 76f2bc865372482ee2bf83762deda08ca61c2352 SHA256 a3c16b8aba5d0b740403a02b01cd61671b34c290ea00944b6fc27bc928db9c25
 DIST opera-12.00-1450.i386.freebsd.tar.xz 12597388 RMD160 f20bc4fb2cc22ef4a5f94bc36d6d5d7bd15fb0bc SHA1 56cd8af123c1e8d7c19562366907b7d38dbf8abd SHA256 325740481bd6619b5c9d61abf6359142c8ee63acfd88feb44bc03c1ec849e0d4
 DIST opera-12.00-1450.i386.linux.tar.xz 12608528 RMD160 7af66359e1dbc3dd9f432edad8008b8bafd302a6 SHA1 1619b4374eb9a271dc8943cd75c58f6b98616d87 SHA256 7044f45128a7f40cb73050e8f4eaeb333fd99b292e8cdfb6308b7bed32caedd7
 DIST opera-12.00-1450.x86_64.linux.tar.xz 13674980 RMD160 b5bec44fe04e172ac36867bfff5b7b897901941a SHA1 1e34fd35b7cf30e5272df4f07e772cee1f0c6d6b SHA256 1114503da667b95f38a422092245721e1e814bf338749cb9621ecff39f3f836a
 DIST opera-12.00-1454.i386.freebsd.tar.xz 12557252 RMD160 e375ebc7da65611f020e01ba2d5d89b29abab964 SHA1 89031cca508369044c0a6c267c8f42328ea1614d SHA256 69de7c073f777f6b06b2543d86e18c54fbd8b31aac9e3c51491609ac14a16541
 DIST opera-12.00-1454.i386.linux.tar.xz 12580340 RMD160 f22b147a3f24152b72e13a5778abcb73b84a005c SHA1 09f75bed18dcbde997101a2e25b0f3caae1bae5b SHA256 05882249546e0d48e11e8948574a13aefa947a23cb58763ff1703f60eafb59ad
 DIST opera-12.00-1454.x86_64.linux.tar.xz 13681580 RMD160 502c05af8746c5cd0ccb6d62e9da6206f8c800a1 SHA1 21feade3e09f7ead5f9502dda286228f5a5dd226 SHA256 7fd6052963cfc8fb6536934b7163860fd37f12e2beb4261adc6e5296a6f0a178
+DIST opera-12.00-1456.i386.freebsd.tar.xz 12615144 RMD160 3979eea09c0ce927e8c6915bc246aa971db89881 SHA1 b8bfdd46548cf4d7ce092ca88020fc7a0ed3d0be SHA256 317f251211a2100869c411c29f74a48b8427f0d419818b42cc98e973f02df66a
+DIST opera-12.00-1456.i386.linux.tar.xz 12634532 RMD160 20698afc0e8ab5cebe4820b609946659cc2e624f SHA1 a9c3989e96e57dd00b08798fd743c8e5110b35c9 SHA256 2810e8862431a9e5e4f4f19b9103620efed066d82436719583c551ec28ebcb0d
+DIST opera-12.00-1456.x86_64.linux.tar.xz 13736432 RMD160 92264e266f0cca53771eda7012eeb6696d3150f1 SHA1 b2482d8eae4c06a7c4cd991fe6ac5bdc60d8a79e SHA256 0007ebe1e58cf479ad7e08bdf5ac8f6018fe8dbc84e955f96061e089d4cbb4b7
diff --git a/www-client/opera/opera-12.00.1448.ebuild b/www-client/opera/opera-12.00.1456.ebuild
similarity index 93%
rename from www-client/opera/opera-12.00.1448.ebuild
rename to www-client/opera/opera-12.00.1456.ebuild
index e0920ed0dbd0..1259f38dbec9 100644
--- a/www-client/opera/opera-12.00.1448.ebuild
+++ b/www-client/opera/opera-12.00.1456.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/opera/opera-12.00.1448.ebuild,v 1.1 2012/06/08 03:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.00.1456.ebuild,v 1.2 2012/06/12 14:33:44 jer Exp $
 
 EAPI="4"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-11 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer multilib"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="rc1_${O_V}-${O_B}"
+O_D="rc4main_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
@@ -34,8 +34,8 @@ QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
 
 O_LINGUAS="
 	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv
-	sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+	hi hr hu id it ja ka kk ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr
+	sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
 "
 
 for O_LINGUA in ${O_LINGUAS}; do
@@ -51,8 +51,7 @@ GTKRDEPEND="
 	dev-libs/glib:2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( || ( x11-libs/gtk+:2 x11-libs/gtk+:3 ) )
 	x11-libs/pango
 	x11-libs/pixman
 "
@@ -82,7 +81,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXt
 	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
 	kde? ( ${KDERDEPEND} )
 	gstreamer? ( ${GSTRDEPEND} )
 "
@@ -126,8 +124,6 @@ src_prepare() {
 	# Optional libraries
 	if ! use gtk; then
 		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
 		rm lib/${PN}/liboperagtk3.so || die
 	fi
 	if ! use kde; then
diff --git a/www-client/qupzilla/qupzilla-1.2.0.ebuild b/www-client/qupzilla/qupzilla-1.2.0.ebuild
index 03dc4655f6f0..f830d0dc37f9 100644
--- a/www-client/qupzilla/qupzilla-1.2.0.ebuild
+++ b/www-client/qupzilla/qupzilla-1.2.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/www-client/qupzilla/qupzilla-1.2.0.ebuild,v 1.3 2012/05/09 10:59:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.2.0.ebuild,v 1.4 2012/06/12 15:45:00 kensington Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit multilib qt4-r2 vcs-snapshot
 
 DESCRIPTION="Qt WebKit web browser"
 HOMEPAGE="http://www.qupzilla.com/"
-SRC_URI="https://github.com/nowrep/QupZilla/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/QupZilla/qupzilla/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch b/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch
new file mode 100644
index 000000000000..acb10001d314
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch
@@ -0,0 +1,46 @@
+--- w3mimg/x11/x11_w3mimg.c	2004-11-08 18:14:06.000000000 +0100
++++ w3mimg/x11/x11_w3mimg.c	2012-05-19 06:31:08.908783927 +0200
+@@ -14,7 +14,7 @@
+ #elif defined(USE_GDKPIXBUF)
+ #if defined(USE_GTK2)
+ #include <glib-object.h>
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #else
+ #include <gdk-pixbuf/gdk-pixbuf-xlib.h>
+--- w3mimg/fb/fb_gdkpixbuf.c	2004-11-08 18:14:06.000000000 +0100
++++ w3mimg/fb/fb_gdkpixbuf.c	2012-05-20 05:06:07.744816661 +0200
+@@ -6,7 +6,7 @@
+ #include "config.h"
+ #if defined(USE_GTK2)
+ #include <glib-object.h>
+-#include <gdk/gdk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+ #endif
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include "fb.h"
+--- acinclude.m4	2011-01-04 10:22:18.000000000 +0100
++++ acinclude.m4	2012-05-20 05:15:36.158981506 +0200
+@@ -705,8 +705,8 @@ AC_DEFUN([AC_W3M_IMAGE],
+      IMGTARGETS="x11"    
+      AC_DEFINE(USE_GDKPIXBUF)
+      AC_DEFINE(USE_GTK2)
+-     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
+-     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`"
++     IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
++     IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
+@@ -740,8 +740,8 @@ AC_DEFUN([AC_W3M_IMAGE],
+      IMGTARGETS="${IMGTARGETS} fb"
+      AC_DEFINE(USE_GDKPIXBUF)
+      AC_DEFINE(USE_GTK2)
+-     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`"
+-     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`"
++     IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`"
++     IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`"
+    elif test x"$have_gdkpixbuf" = xyes; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
diff --git a/www-client/w3m/w3m-0.5.3-r2.ebuild b/www-client/w3m/w3m-0.5.3-r2.ebuild
index 4f204bcbb202..fbe98c89e3ef 100644
--- a/www-client/w3m/w3m-0.5.3-r2.ebuild
+++ b/www-client/w3m/w3m-0.5.3-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/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.3 2012/05/29 13:39:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r2.ebuild,v 1.4 2012/06/13 04:27:51 naota Exp $
 
 EAPI="3"
 inherit eutils
@@ -20,7 +20,9 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
 	>=dev-libs/boehm-gc-6.2
 	X? ( x11-libs/libXext x11-libs/libXdmcp )
-	gtk? ( x11-libs/gtk+:2 )
+	gtk? ( 
+		vanilla? ( x11-libs/gtk+:2 )
+		!vanilla? ( x11-libs/gdk-pixbuf ) )
 	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
 	xface? ( media-libs/compface )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
@@ -35,7 +37,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-0.5.3-glibc214.patch" \
 		"${FILESDIR}/${PN}-0.5.3-underlinking.patch"
 	use vanilla || \
-		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch
+		epatch "${FILESDIR}"/${PN}-0.5.3-button.patch \
+			"${FILESDIR}"/${P}-gdk-pixbuf.patch
 	find . -name CVS -type d | xargs rm -r
 }
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 59be530a2a1d..c7619c6a7fd0 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,4 @@
 DIST nginx-1.0.15.tar.gz 693025 RMD160 99653499916b81fb0f5842755484983606cea5ec SHA1 e506b301ea849f58f2efb499d77b819fe55eea9a SHA256 1daf3950623c90b084e7eceb104071596060aca5c721bf890549fc2990b1ebe6
-DIST nginx-1.1.19.tar.gz 715741 RMD160 ffa00dc68caa025df5118e05aa426d2e33781f2f SHA1 8d216d340c45c273bfd8ca65a74c8544b45f008a SHA256 9630bd7532d63832edc41e954c0cd5ef8cd00724feeab37f2d793d4de97873f6
-DIST nginx-1.2.0.tar.gz 716067 RMD160 b2dc5e6cd7f436e56d1bab7cfcde64955f38c11f SHA1 15cec8d1b8dbf2007f9f99594a08a2f45814034e SHA256 ac06b3aa55bf4f634b7e779272685536607183e8669809ce497151e47e518f2d
 DIST nginx-1.2.1.tar.gz 718161 RMD160 81c0d4011a8748f4d3f0d6cb586c977f6199f4d9 SHA1 4fb69411f6c3ebb5818005955a085e891e77b2d8 SHA256 994ad97cbf6f7045f95ea9d6d401aad1e95766671e402c48af85aba5235a2dd7
 DIST nginx-1.3.1.tar.gz 721002 RMD160 3a3d90ac77b8d2cad58f81dcfd73f3c13ed1052d SHA1 36a4147799e303a6f19cd8ff9fb52c2fc07a840d SHA256 9b30a6f67f0a9eda7db026e12d4f09656f9254cddbb66ff9c0c01d8963dc1d73
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
diff --git a/www-servers/nginx/nginx-1.1.19.ebuild b/www-servers/nginx/nginx-1.1.19.ebuild
deleted file mode 100644
index 0d72418b689f..000000000000
--- a/www-servers/nginx/nginx-1.1.19.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.19.ebuild,v 1.4 2012/06/06 08:30:35 patrick Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.1"
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex"
-# gitorious names the tarbell oddly, hence PNPN
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex"
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-	nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_passenger
-	http_push
-	http_cache_purge
-	http_upload
-	http_slowfs_cache
-	http_fancyindex"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_geo? ( dev-libs/geoip )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-REQUIRED_USE="pcre-jit? ( pcre )"
-
-pkg_setup() {
-	if use nginx_modules_http_passenger; then
-		einfo
-		einfo "Passenger support has been removed from the nginx ebuild to"
-		einfo "get rid of file collisions, its broken build system and"
-		einfo "incompatibilities between passenger 2 and 3."
-		einfo
-		einfo "Please switch to passenger-3 standalone or use the"
-		einfo "unicorn gem which provides a sane nginx-like architecture"
-		einfo "out of the box."
-		einfo
-		einfo "For more information on sane ruby deployments with"
-		einfo "passenger-3/unicorn go to:"
-		einfo
-		einfo "https://rvm.beginrescueend.com"
-		einfo
-		die "nginx_modules_http_passenger still in IUSE"
-	fi
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-}
-
-src_prepare() {
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-}
-
-src_configure() {
-	local myconf= http_enabled= mail_enabled=
-
-	use aio       && myconf+=" --with-file-aio --with-aio_module"
-	use debug     && myconf+=" --with-debug"
-	use ipv6      && myconf+=" --with-ipv6"
-	use libatomic && myconf+=" --with-libatomic"
-	use pcre      && myconf+=" --with-pcre"
-	use pcre-jit  && myconf+=" --with-pcre-jit"
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=" --without-http_${mod}_module"
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=" --with-http_${mod}_module"
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=" --with-http_realip_module"
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_push; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}"
-	fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=" --without-http-cache"
-		use ssl && myconf+=" --with-http_ssl_module"
-	else
-		myconf+=" --without-http --without-http-cache"
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=" --without-mail_${mod}_module"
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=" --with-mail"
-		use ssl && myconf+=" --with-mail_ssl_module"
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=" --add-module=${mod}"
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=" --user=${PN} --group=${PN}"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/var/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/var/lock/nginx.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/lib" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}"/var/tmp/${PN}/client \
-		--http-proxy-temp-path="${EPREFIX}"/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}"/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}"/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}"/var/tmp/${PN}/uwsgi \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
-	newinitd "${FILESDIR}"/nginx.initd nginx
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# Keepdir because these are hardcoded above
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-	keepdir /var/www/localhost/htdocs
-	mv "${ED}"/usr/html "${ED}"/var/www/localhost/htdocs || die
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor
-		fixlocalpod
-	fi
-
-	if use nginx_modules_http_push; then
-		docinto ${HTTP_PUSH_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_upload; then
-		docinto ${HTTP_UPLOAD_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.2.0.ebuild b/www-servers/nginx/nginx-1.2.0.ebuild
deleted file mode 100644
index 5163262bfaa9..000000000000
--- a/www-servers/nginx/nginx-1.2.0.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.0.ebuild,v 1.2 2012/06/06 08:30:35 patrick Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.17rc1"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="3580526"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.5"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.8"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.1"
-HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex"
-# gitorious names the tarbell oddly, hence PNPN
-HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex"
-HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-	nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_passenger
-	http_push
-	http_cache_purge
-	http_upload
-	http_slowfs_cache
-	http_fancyindex"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	selinux? ( sec-policy/selinux-nginx )
-	ssl? ( dev-libs/openssl )
-	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_geo? ( dev-libs/geoip )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-REQUIRED_USE="pcre-jit? ( pcre )"
-
-pkg_setup() {
-	if use nginx_modules_http_passenger; then
-		einfo
-		einfo "Passenger support has been removed from the nginx ebuild to"
-		einfo "get rid of file collisions, its broken build system and"
-		einfo "incompatibilities between passenger 2 and 3."
-		einfo
-		einfo "Please switch to passenger-3 standalone or use the"
-		einfo "unicorn gem which provides a sane nginx-like architecture"
-		einfo "out of the box."
-		einfo
-		einfo "For more information on sane ruby deployments with"
-		einfo "passenger-3/unicorn go to:"
-		einfo
-		einfo "https://rvm.beginrescueend.com"
-		einfo
-		die "nginx_modules_http_passenger still in IUSE"
-	fi
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-}
-
-src_prepare() {
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-}
-
-src_configure() {
-	local myconf= http_enabled= mail_enabled=
-
-	use aio       && myconf+=" --with-file-aio --with-aio_module"
-	use debug     && myconf+=" --with-debug"
-	use ipv6      && myconf+=" --with-ipv6"
-	use libatomic && myconf+=" --with-libatomic"
-	use pcre      && myconf+=" --with-pcre"
-	use pcre-jit  && myconf+=" --with-pcre-jit"
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=" --without-http_${mod}_module"
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=" --with-http_${mod}_module"
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=" --with-http_realip_module"
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_push; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}"
-	fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=" --without-http-cache"
-		use ssl && myconf+=" --with-http_ssl_module"
-	else
-		myconf+=" --without-http --without-http-cache"
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=" --without-mail_${mod}_module"
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=" --with-mail"
-		use ssl && myconf+=" --with-mail_ssl_module"
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=" --add-module=${mod}"
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=" --user=${PN} --group=${PN}"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/var/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/var/lock/nginx.lock \
-		--with-cc-opt="-I${EROOT}usr/include" \
-		--with-ld-opt="-L${EROOT}usr/lib" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}"/var/tmp/${PN}/client \
-		--http-proxy-temp-path="${EPREFIX}"/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}"/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}"/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}"/var/tmp/${PN}/uwsgi \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
-	newinitd "${FILESDIR}"/nginx.initd nginx
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# Keepdir because these are hardcoded above
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-	keepdir /var/www/localhost/htdocs
-	mv "${ED}"/usr/html "${ED}"/var/www/localhost/htdocs || die
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor
-		fixlocalpod
-	fi
-
-	if use nginx_modules_http_push; then
-		docinto ${HTTP_PUSH_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_upload; then
-		docinto ${HTTP_UPLOAD_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.2.1.ebuild b/www-servers/nginx/nginx-1.2.1.ebuild
index ba83b1c73725..6f7ec730a037 100644
--- a/www-servers/nginx/nginx-1.2.1.ebuild
+++ b/www-servers/nginx/nginx-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/www-servers/nginx/nginx-1.2.1.ebuild,v 1.3 2012/06/11 20:17:29 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.1.ebuild,v 1.4 2012/06/12 13:08:35 ago Exp $
 
 EAPI="4"
 
@@ -73,7 +73,7 @@ SRC_URI="http://nginx.org/download/${P}.tar.gz
 
 LICENSE="as-is BSD BSD-2 GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
 geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 8885118af4f1..5464c4136dc5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,4 @@
 DIST xorg-server-1.10.6.tar.bz2 5406712 RMD160 a920b609e462e1b6ac750e6e1466aa0f880b41a8 SHA1 398b5ba7332829f1831b8fa69e2ea071fb7d1e59 SHA256 c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682
 DIST xorg-server-1.11.4.tar.bz2 4900810 RMD160 26eafdda9e7c9e21e606281dacc13e67d0144eef SHA1 adb5b0bf95a943385c08f826a647871aa1d8d6eb SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc
 DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7dd805f66 SHA1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
+DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-3
new file mode 100644
index 000000000000..9c560bb1a978
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.confd-3
@@ -0,0 +1,16 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?  [ xdm | gdm | kdm | kdm-4.3 | gpe | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+#
+# KDE-specific note:
+# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3".
+#     You can find possible versions by looking at the directories in /usr/kde/.
+# - Else, if you are using KDE 3 enter "kdm-3.5"
+# - Else, if you are using KDE 4 enter "kdm" without a version
+DISPLAYMANAGER="xdm"
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-3
new file mode 100644
index 000000000000..4e4c8b207901
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.initd-3
@@ -0,0 +1,218 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.5 2012/06/12 11:27:07 chithanh Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+	need localmount xdm-setup
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	# (#139824) Start after ypbind and autofs for network authentication
+	# (#145219 #180163) Could use lirc mouse as input device
+	# (#70689 comment #92) Start after consolefont to avoid display corruption
+	# (#291269) Start after quota, since some dm need readable home
+	after bootmisc consolefont modules netmount
+	after readahead-list ypbind autofs openvpn gpm lircmd
+	after quota
+	before alsasound
+
+	# Start before X
+	use consolekit xfs
+}
+
+setup_dm() {
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+	# Load our root path from profile.env
+	# Needed for kdm
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+	NAME=
+	case "${MY_XDM}" in
+		kdm|kde)
+			EXE="$(which kdm)"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		kdm-*)
+			EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+			PIDFILE=/var/run/kdm.pid
+			;;
+		entrance*)
+			EXE=/usr/sbin/entranced
+			PIDFILE=/var/lib/entranced.pid
+			;;
+		gdm|gnome)
+			EXE=/usr/bin/gdm
+			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+			PIDFILE=/var/run/gdm.pid
+			;;
+		wdm)
+			EXE=/usr/bin/wdm
+			PIDFILE=
+			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm-binary
+			PIDFILE=/var/run/lxdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		lightdm)
+			EXE=/usr/sbin/lightdm
+			PIDFILE=/var/run/lightdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		*)
+			# first find out if there is such executable
+			EXE="$(which ${MY_XDM} 2>/dev/null)"
+			PIDFILE="/var/run/${MY_XDM}.pid"
+
+			# warn user that he is doing sick things if the exe was not found
+			if [ -z "${EXE}" ]; then
+				echo "ERROR: Your XDM value is invalid."
+				echo "  No ${MY_XDM} executable could be found on your system."
+			fi
+			;;
+	esac
+
+	if ! [ -x "${EXE}" ]; then
+		EXE=/usr/bin/xdm
+		PIDFILE=/var/run/xdm.pid
+		if ! [ -x "/usr/bin/xdm" ]; then
+			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+			echo "	or install x11-apps/xdm package"
+			eend 255
+		fi
+	fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+	if [ -e /etc/inittab ] ; then
+		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+	elif [ -e /etc/ttys ] ; then
+		grep -q "^ttyv$(($1 - 1))" /etc/ttys
+	else
+		return 1
+	fi
+}
+
+start() {
+	local EXE NAME PIDFILE
+	setup_dm
+
+	if [ -f /etc/.noxdm ]; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+		rm /etc/.noxdm
+		return 0
+	fi
+
+	ebegin "Setting up ${EXE##*/}"
+
+	# save the prefered DM
+	save_options "service" "${EXE}"
+	save_options "name"    "${NAME}"
+	save_options "pidfile" "${PIDFILE}"
+	save_options "start_stop_args" "${START_STOP_ARGS}"
+
+	if [ -n "${CHECKVT-y}" ] ; then
+		if vtstatic "${CHECKVT:-7}" ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+				telinit a >/dev/null 2>&1
+				return 0
+			else
+				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+				return 1
+			fi
+		fi
+	fi
+
+	/etc/X11/startDM.sh
+	eend 0
+}
+
+stop() {
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
+		else
+			curvt=$(tty)
+			case "${curvt}" in
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+				*) curvt= ;;
+			esac
+		fi
+	fi
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
+
+	[ -z "${myexe}" ] && return 0
+
+	ebegin "Stopping ${myservice}"
+
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+			${mypidfile:+--pidfile} ${mypidfile} \
+			${myname:+--name} ${myname}
+		retval=${?}
+	fi
+
+	# switch back to original vt
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
+			chvt "${curvt}"
+		else
+			vidcontrol -s "$((curvt + 1))"
+		fi
+	fi
+
+	eend ${retval} "Error stopping ${myservice}"
+	return ${retval}
+}
+
+# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
new file mode 100644
index 000000000000..66e77f66e002
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch
@@ -0,0 +1,22 @@
+diff --git a/os/utils.c b/os/utils.c
+index e8ecb71..18ff1ca 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -297,7 +297,7 @@ LockServer(void)
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+   (void) write(lfd, pid_str, 11);
+-  (void) chmod(tmp, 0444);
++  (void) fchmod(lfd, 0444);
+   (void) close(lfd);
+
+   /*
+@@ -318,7 +318,7 @@ LockServer(void)
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd = open(LockFile, O_RDONLY);
++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile);
diff --git a/x11-base/xorg-server/files/xorg-server-glapi_c.patch b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
new file mode 100644
index 000000000000..e65a969af176
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-glapi_c.patch
@@ -0,0 +1,78 @@
+From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 02 Mar 2011 18:21:39 +0000
+Subject: glx: Lobotomize _glapi_get_proc_address
+
+This isn't a meaningful thing in the indirect glx loader, so just warn
+if it ever happens and move on.
+
+But also, mark it PUBLIC, so if the driver does ever call it we merely
+warn instead of aborting because ld.so can't find the symbol.
+
+Reviewed-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/glx/glapi.c b/glx/glapi.c
+index 1814493..79ff6b1 100644
+--- a/glx/glapi.c
++++ b/glx/glapi.c
+@@ -54,6 +54,7 @@
+ 
+ #include <dix-config.h>
+ #include <X11/Xfuncproto.h>
++#include <os.h>
+ #define PUBLIC _X_EXPORT
+ 
+ #else
+@@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names,
+    return offset;
+ }
+ 
+-/**
+- * Return pointer to the named function.  If the function name isn't found
+- * in the name of static functions, try generating a new API entrypoint on
+- * the fly with assembly language.
++/*
++ * glXGetProcAddress doesn't exist in the protocol, the drivers never call
++ * this themselves, and neither does the server.  warn if it happens though.
+  */
+-_glapi_proc
++PUBLIC _glapi_proc
+ _glapi_get_proc_address(const char *funcName)
+ {
+-   struct _glapi_function * entry;
+-   GLuint i;
+-
+-#ifdef MANGLE
+-   if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l')
+-      return NULL;
+-#else
+-   if (funcName[0] != 'g' || funcName[1] != 'l')
+-      return NULL;
+-#endif
+-
+-   /* search extension functions first */
+-   for (i = 0; i < NumExtEntryPoints; i++) {
+-      if (strcmp(ExtEntryTable[i].name, funcName) == 0) {
+-         return ExtEntryTable[i].dispatch_stub;
+-      }
+-   }
+-
+-#if !defined( XFree86Server ) && !defined( XGLServer )
+-   /* search static functions */
+-   {
+-      const _glapi_proc func = get_static_proc_address(funcName);
+-      if (func)
+-         return func;
+-   }
+-#endif /* !defined( XFree86Server ) */
+-
+-   entry = add_function_name(funcName);
+-   return (entry == NULL) ? NULL : entry->dispatch_stub;
++    ErrorF("_glapi_get_proc_address called!\n");
++    return NULL;
+ }
+ 
+ /**
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
new file mode 100644
index 000000000000..cf31691cae90
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild,v 1.7 2012/06/12 11:27:07 chithanh Exp $
+
+EAPI=3
+inherit flag-o-matic xorg-2 multilib versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev"
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/pixman-0.15.20
+	>=x11-libs/xtrans-1.2.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXfixes-4.0.3
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.3
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-7.8_rc[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	udev? ( >=sys-fs/udev-150 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-4.1
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.11
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.0.99.3
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.17
+	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+	doc? (
+		>=app-doc/doxygen-1.6.1
+		app-text/xmlto
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.3
+		>=x11-libs/libdrm-2.4.20
+	)
+	>=x11-apps/xinit-1.3"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+	)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+	"${FILESDIR}"/xorg-cve-2011-4028+4029.patch
+	)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	use minimal || ensure_a_server_is_building
+
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	#	--enable-install-setuid needed because sparcs default off
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontrootdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--disable-config-hal
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		${conf_opts}
+	)
+
+	# Xorg-server requires includes from OS mesa which are not visible for
+	# users of binary drivers.
+	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this
+	mkdir -p "${T}/mesa-symlinks/GL"
+	for i in gl glx glxmd glxproto glxtokens; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	for i in glext glxext; do
+		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
+	done
+	append-cppflags "-I${T}/mesa-symlinks"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	# Incompatible with GCC 3.x CPP, bug #314615
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
+		ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
+	fi
+
+	# detect if we should inform user about ebuild breakage
+	if ! has_version "x11-base/xorg-server" ||
+			has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
+		INFO="yes"
+	fi
+}
+
+src_install() {
+	xorg-2_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed"
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set --use-old xorg-x11
+
+	if [[ ${INFO} = yes ]]; then
+		elog "You should consider reading upgrade guide for this release:"
+		elog "	http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+		echo
+		ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+		ewarn "because the ABI changed. If you cannot start X because"
+		ewarn "of module version mismatch errors, this is your problem."
+
+		echo
+		ewarn "You can generate a list of all installed packages in the x11-drivers"
+		ewarn "category using this command:"
+		ewarn "	emerge portage-utils; qlist -I -C x11-drivers/"
+	fi
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
index 56b20643a4b8..0b72079058d5 100644
--- a/x11-libs/agg/agg-2.5-r2.ebuild
+++ b/x11-libs/agg/agg-2.5-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/agg/agg-2.5-r2.ebuild,v 1.6 2012/05/05 03:52:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/agg/agg-2.5-r2.ebuild,v 1.7 2012/06/12 12:54:33 chithanh Exp $
 
 EAPI="2"
 
@@ -36,6 +36,8 @@ src_prepare() {
 	sed -r -i \
 		-e 's:^(.*)  -L@.*:\1:' \
 		src/platform/X11/Makefile.am || die "Failed to sed"
+	# fix building against automake-1.12, bug 420701
+	sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
 	eautoreconf
 }
 
diff --git a/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch
new file mode 100644
index 000000000000..1e53985ed740
--- /dev/null
+++ b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch
@@ -0,0 +1,24 @@
+From 56b5a5887349e9d0e1d28da157fe6441ca691f56 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 08 Mar 2012 19:49:36 +0000
+Subject: Build fix when sizeof(off_t) > sizeof(void *)
+
+https://trac.macports.org/ticket/33532
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index e81b486..32f455b 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -928,7 +928,7 @@ DGAMapPhysical(
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch
new file mode 100644
index 000000000000..bcc0db595eb7
--- /dev/null
+++ b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch
@@ -0,0 +1,23 @@
+From d4f89f7f42484963575b4c7d2fa694051e111e76 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri, 09 Mar 2012 10:48:14 +0000
+Subject: Include <stdint.h> for uintptr_t
+
+Found-by: Tinderbox
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index 32f455b..964de18 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -21,6 +21,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+ 
++#include <stdint.h>
+ 
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
index cc98024c7af2..0ca1e3933646 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.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/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.2 2012/05/09 13:21:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.3 2012/06/12 13:11:44 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
@@ -16,3 +16,8 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xproto
 	>=x11-proto/xf86dgaproto-2.0.99.2"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libXxf86dga-1.1.3-x32-off_t-cast.patch
+	"${FILESDIR}"/libXxf86dga-1.1.3-x32-stdint-include.patch
+)
diff --git a/x11-misc/util-macros/util-macros-1.14.0.ebuild b/x11-misc/util-macros/util-macros-1.14.0.ebuild
index a8b08e812c88..ff3d09ca48c2 100644
--- a/x11-misc/util-macros/util-macros-1.14.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.14.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/x11-misc/util-macros/util-macros-1.14.0.ebuild,v 1.2 2011/06/19 08:30:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.14.0.ebuild,v 1.3 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ 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"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/util-macros-1.15.0.ebuild b/x11-misc/util-macros/util-macros-1.15.0.ebuild
index 85d31c65c168..ad5b68e88d12 100644
--- a/x11-misc/util-macros/util-macros-1.15.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.15.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/x11-misc/util-macros/util-macros-1.15.0.ebuild,v 1.2 2011/08/20 09:17:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.15.0.ebuild,v 1.3 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ 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"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/util-macros-1.16.0.ebuild b/x11-misc/util-macros/util-macros-1.16.0.ebuild
index cdf9f1348142..d46ba3733654 100644
--- a/x11-misc/util-macros/util-macros-1.16.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.16.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/x11-misc/util-macros/util-macros-1.16.0.ebuild,v 1.1 2011/12/11 19:57:36 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.16.0.ebuild,v 1.2 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ 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"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/util-macros-1.16.1.ebuild b/x11-misc/util-macros/util-macros-1.16.1.ebuild
index dae31fc9df58..397d8119bffc 100644
--- a/x11-misc/util-macros/util-macros-1.16.1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.16.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-misc/util-macros/util-macros-1.16.1.ebuild,v 1.1 2012/01/25 17:35:41 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.16.1.ebuild,v 1.2 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ 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"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/util-macros-1.16.2.ebuild b/x11-misc/util-macros/util-macros-1.16.2.ebuild
index 4081d2b65d78..2030a9c226fb 100644
--- a/x11-misc/util-macros/util-macros-1.16.2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.16.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-misc/util-macros/util-macros-1.16.2.ebuild,v 1.1 2012/03/07 21:23:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.16.2.ebuild,v 1.2 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ 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"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/util-macros/util-macros-1.17.ebuild b/x11-misc/util-macros/util-macros-1.17.ebuild
index 696701aa67e3..c60a75184ad7 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.4 2012/06/03 11:15:15 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.17.ebuild,v 1.5 2012/06/13 03:54:01 vapier Exp $
 
 EAPI=4
 inherit xorg-2
@@ -10,6 +10,3 @@ DESCRIPTION="X.Org autotools utility macros"
 
 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=""
-DEPEND="${RDEPEND}"
diff --git a/x11-plugins/asclock/asclock-2.0.12-r1.ebuild b/x11-plugins/asclock/asclock-2.0.12-r1.ebuild
index d531fc52d97d..f5676bc13109 100644
--- a/x11-plugins/asclock/asclock-2.0.12-r1.ebuild
+++ b/x11-plugins/asclock/asclock-2.0.12-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/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v 1.9 2010/08/25 15:41:16 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v 1.10 2012/06/12 13:32:15 ago Exp $
 
 EAPI=3
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"
 HOMEPAGE="http://www.tigr.net/afterstep/list.pl"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="x11-libs/libXpm"
 RDEPEND="${DEPEND}