diff --git a/app-admin/eselect-pinentry/eselect-pinentry-0.3.ebuild b/app-admin/eselect-pinentry/eselect-pinentry-0.3.ebuild
index 734f806ae595..263ca83ac82c 100644
--- a/app-admin/eselect-pinentry/eselect-pinentry-0.3.ebuild
+++ b/app-admin/eselect-pinentry/eselect-pinentry-0.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/app-admin/eselect-pinentry/eselect-pinentry-0.3.ebuild,v 1.5 2012/06/25 19:23:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/eselect-pinentry-0.3.ebuild,v 1.6 2012/07/03 19:37:46 jer Exp $
 
 DESCRIPTION="Manage /usr/bin/pinentry symlink"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect
diff --git a/app-arch/alien/alien-8.86.ebuild b/app-arch/alien/alien-8.86.ebuild
index 65f75bd66dfb..6006fa65803c 100644
--- a/app-arch/alien/alien-8.86.ebuild
+++ b/app-arch/alien/alien-8.86.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/alien/alien-8.86.ebuild,v 1.3 2012/06/11 10:15:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.86.ebuild,v 1.5 2012/07/03 20:01:08 jer Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc x86"
+KEYWORDS="~alpha amd64 hppa ppc x86"
 IUSE="+bzip2"
 
 RDEPEND="app-arch/rpm
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index 8f2bcb92e47d..242dca26fdd9 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1 +1,2 @@
 DIST innoextract-1.2.tar.gz 106162 RMD160 9442f535a673667db93c07e0c523e89c625ce3db SHA1 8d7b822597e92a881dcbfe5db40df75c96f765a7 SHA256 a56b11bab2e209c7b37a93b3bd7416eb7359824071fc3ae1cf16a8421747cb9a
+DIST innoextract-1.3.tar.gz 130613 RMD160 0fb3983ab7c83557601a235c3755467c2720f88d SHA1 8b0b19b92f1bfbeb48bdb0cd01e1dab8c15cac2d SHA256 bee65d1df2223870acb91ab90e9d933157167b8f7f5691ddd70f6a041d5bf671
diff --git a/app-arch/innoextract/files/innoextract-1.3-gentoo.patch b/app-arch/innoextract/files/innoextract-1.3-gentoo.patch
new file mode 100644
index 000000000000..31f7e9088ec7
--- /dev/null
+++ b/app-arch/innoextract/files/innoextract-1.3-gentoo.patch
@@ -0,0 +1,49 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Jul  3 18:00:33 UTC 2012
+Subject: build system
+
+respect flags
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -57,40 +57,13 @@
+ 
+ add_cxxflag("-std=c++11")
+ 
+-add_cxxflag("-Wall")
+-add_cxxflag("-Wextra")
+-add_cxxflag("-Wformat=2")
+-add_cxxflag("-Wundef")
+-add_cxxflag("-Wpointer-arith")
+-add_cxxflag("-Wcast-qual")
+-add_cxxflag("-Woverloaded-virtual")
+-add_cxxflag("-Wlogical-op")
+-add_cxxflag("-Wliteral-conversion")
+-add_cxxflag("-Wshift-overflow")
+-add_cxxflag("-Woverflow")
+-add_cxxflag("-Wbool-conversions")
+-add_cxxflag("-Wconversion")
+-add_cxxflag("-Wsign-conversion")
+-add_cxxflag("-Wmissing-declarations")
+-add_cxxflag("-Wredundant-decls")
+-
+ if(DEBUG_EXTRA)
+ 	add_cxxflag("-ftrapv") # to add checks for (undefined) signed integer overflow
+ 	add_cxxflag("-fbounds-checking")
+ 	add_cxxflag("-fcatch-undefined-behavior")
+ 	add_cxxflag("-Wstrict-aliasing=1")
+-else()
+-	# -Wuninitialized causes too many false positives - thanks very much, gcc
+-	add_cxxflag("-Wno-uninitialized")
+-	# (clang only) Conflicts with using const variables for configuration.
+-	add_cxxflag("-Wno-constant-logical-operand")
+-	add_cxxflag("-Wno-unneeded-internal-declaration")
+-	add_cxxflag("-Wno-unused-function")
+ endif()
+ 
+-# Because i'm lazy
+-add_ldflag("-Wl,--as-needed")
+-
+ check_symbol_exists(isatty "unistd.h" HAVE_ISATTY)
+ check_symbol_exists(ioctl "sys/ioctl.h" HAVE_IOCTL)
+ 
diff --git a/app-arch/innoextract/innoextract-1.3.ebuild b/app-arch/innoextract/innoextract-1.3.ebuild
new file mode 100644
index 000000000000..e67c43bcc626
--- /dev/null
+++ b/app-arch/innoextract/innoextract-1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2012-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/innoextract/innoextract-1.3.ebuild,v 1.1 2012/07/03 18:22:55 hasufell Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="A tool to unpack installers created by Inno Setup"
+HOMEPAGE="http://innoextract.constexpr.org/"
+SRC_URI="mirror://github/dscharrer/InnoExtract/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +lzma"
+
+RDEPEND=">=dev-libs/boost-1.37
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( README.md CHANGELOG )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		$(cmake-utils_use lzma USE_LZMA)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
+}
diff --git a/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild b/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild
index b75e42cd2f3b..67eb9456a57e 100644
--- a/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild
+++ b/app-cdr/xfburn/xfburn-0.4.3_p20120601.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-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild,v 1.5 2012/07/03 11:16:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild,v 1.6 2012/07/03 16:38:15 ranger Exp $
 
 EAPI=4
 #EAUTORECONF=yes
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug gstreamer udev"
 
 RDEPEND=">=dev-libs/glib-2.30
diff --git a/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild b/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
index d61fb35bb452..6469ef472987 100644
--- a/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
+++ b/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild,v 1.2 2012/07/02 01:19:04 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/hashcat-bin-0.39.ebuild,v 1.3 2012/07/03 22:27:31 zerochaos Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ QA_PREBUILT="hashcat-cli*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -rf *.exe docs
+	rm -rf *.exe docs || die
 	use x86 && rm hashcat-cli64.bin
 	use amd64 && rm hashcat-cli32.bin
 
@@ -40,23 +40,27 @@ src_install() {
 	insinto /opt/${PN}
 	doins -r "${S}"/*
 
-	dodir /usr/bin
+	dodir /opt/bin
 	if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
 	then
 		fperms +x /opt/${PN}/hashcat-cli32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli32.bin
-		echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		echo 'echo "Warning: hashcat-cli32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		echo './hashcat-cli32.bin $@' >> "${ED}"/usr/bin/hashcat-cli32.bin
-		fperms +x /usr/bin/hashcat-cli32.bin
+		cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
+		#! /bin/sh
+		cd /opt/${PN}
+		echo "Warning: hashcat-cli32.bin is running from /opt/${PN} so be careful of relative paths."
+		./hashcat-cli32.bin $@
+		EOF
+		fperms +x /opt/bin/hashcat-cli32.bin
 	fi
 	if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
 	then
 		fperms +x /opt/${PN}/hashcat-cli64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/hashcat-cli64.bin
-		echo 'cd /opt/hashcat-bin' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		echo 'echo "Warning: hashcat-cli64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		echo './hashcat-cli64.bin $@' >> "${ED}"/usr/bin/hashcat-cli64.bin
-		fperms +x /usr/bin/hashcat-cli64.bin
+		cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
+		#! /bin/sh
+		cd /opt/${PN}
+		echo "Warning: hashcat-cli64.bin is running from /opt/${PN} so be careful of relative paths."
+		./hashcat-cli64.bin $@
+		EOF
+		fperms +x /opt/bin/hashcat-cli64.bin
 	fi
 }
diff --git a/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
index 5ee715c080b5..079a5669073a 100644
--- a/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
+++ b/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild,v 1.1 2012/07/02 02:12:24 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-gui/hashcat-gui-0.5.1.ebuild,v 1.2 2012/07/03 21:45:22 zerochaos Exp $
 
 EAPI=4
 
-inherit eutils qt4-r2
+inherit qt4-r2
 
 DESCRIPTION="A gui for the *hashcat* suite of tools"
 HOMEPAGE="https://github.com/scandium/hashcat-gui"
-#HOMEPAGE="http://hashcat.net/hashcat-gui/"
 
-SRC_URI="https://github.com/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> ${P}.zip"
+SRC_URI="mirror://github/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> ${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,20 +24,16 @@ RDEPEND="app-crypt/hashcat-bin
 	x11-libs/qt-core"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"/scandium-hashcat-gui-b6b01be
+S="${WORKDIR}"/scandium-hashcat-gui-b6b01be/src
 
 src_prepare() {
-	sed -i 's#./hashcat#/opt/hashcat-bin#g' src/mainwindow.cpp
-	sed -i 's#./oclHashcat-plus#/opt/oclhashcat-plus-bin#g' src/mainwindow.cpp
-	sed -i 's#./oclHashcat-lite#/opt/oclhashcat-lite-bin#g' src/mainwindow.cpp
+	sed -i 's#./hashcat#/opt/hashcat-bin#g' mainwindow.cpp || die
+	sed -i 's#./oclHashcat-plus#/opt/oclhashcat-plus-bin#g' mainwindow.cpp || die
+	sed -i 's#./oclHashcat-lite#/opt/oclhashcat-lite-bin#g' mainwindow.cpp || die
 }
 
 src_install() {
-	dodoc ChangeLog FAQ INSTALL README TODO
-
-	cd src
-	eqmake4 -config release
-	emake
-
 	dobin hashcat-gui
+	cd "${WORKDIR}"/scandium-hashcat-gui-b6b01be || die
+	dodoc ChangeLog FAQ INSTALL README TODO
 }
diff --git a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
index dbfcbc0ffe87..474e237ab340 100644
--- a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
+++ b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild,v 1.1 2012/07/02 01:25:52 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild,v 1.2 2012/07/04 02:58:19 zerochaos Exp $
 
 EAPI=4
 
@@ -34,22 +34,22 @@ QA_PREBUILT="*Hashcat-lite*.bin"
 
 src_install() {
 	dodoc docs/*
-	rm -rf *.exe docs
+	rm -rf *.exe docs || die
 	if use x86; then
-		rm oclHashcat-lite64.bin
-		rm cudaHashcat-lite64.bin
+		rm oclHashcat-lite64.bin || die
+		rm cudaHashcat-lite64.bin || die
 	fi
 	if use amd64; then
-		rm oclHashcat-lite32.bin
-		rm cudaHashcat-lite32.bin
+		rm oclHashcat-lite32.bin || die
+		rm cudaHashcat-lite32.bin || die
 	fi
 	if ! use video_cards_fglrx; then
-		rm -rf kernels/4098
-		rm -f oclHashcat-lite*.bin
+		rm -rf kernels/4098 || die
+		rm -f oclHashcat-lite*.bin || die
 	fi
 	if ! use video_cards_nvidia; then
-		rm -rf kernels/4318
-		rm -f cudaHashcat-lite*.bin
+		rm -rf kernels/4318 || die
+		rm -f cudaHashcat-lite*.bin || die
 	fi
 
 	#I assume this is needed but I didn't check
@@ -58,53 +58,48 @@ src_install() {
 	insinto /opt/${PN}
 	doins -r "${S}"/*
 
-	dodir /usr/bin
-	echo '#! /bin/sh' > "${ED}"/usr/bin/oclhashcat-lite
-	echo 'echo "oclHashcat-lite and all related files have been installed in /opt/oclhashcat-lite-bin"' >> "${ED}"/usr/bin/oclhashcat-lite
-	echo 'echo "Please run one of the following binaries to use gpu accelerated hashcat:"' >> "${ED}"/usr/bin/oclhashcat-lite
-	if [ -f "${ED}"/opt/${PN}/oclHashcat-lite64.bin ]
-	then
-		echo 'echo "64 bit ATI accelerated \"oclHashcat-lite64.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
-		fperms +x /opt/${PN}/oclHashcat-lite64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-lite64.bin
-		echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
-		echo 'echo "Warning: oclHashcat-lite64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
-		echo './oclHashcat-lite64.bin $@' >> "${ED}"/usr/bin/oclHashcat-lite64.bin
-		fperms +x /usr/bin/oclHashcat-lite64.bin
+	dodir /opt/bin
 
-	fi
-	if [ -f "${ED}"/opt/${PN}/oclHashcat-lite32.bin ]
-	then
-		echo 'echo "32 bit ATI accelerated \"oclHashcat-lite32.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
-		fperms +x /opt/${PN}/oclHashcat-lite32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/oclHashcat-lite32.bin
-		echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
-		echo 'echo "Warning: oclHashcat-lite32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
-		echo './oclHashcat-lite32.bin $@' >> "${ED}"/usr/bin/oclHashcat-lite32.bin
-		fperms +x /usr/bin/oclHashcat-lite32.bin
-	fi
-	if [ -f "${ED}"/opt/${PN}/cudaHashcat-lite64.bin ]
-	then
-		echo 'echo "64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
-		fperms +x /opt/${PN}/cudaHashcat-lite64.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-lite64.bin
-		echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
-		echo 'echo "Warning: cudaHashcat-lite64.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
-		echo './cudaHashcat-lite64.bin $@' >> "${ED}"/usr/bin/cudaHashcat-lite64.bin
-		fperms +x /usr/bin/cudaHashcat-lite64.bin
+	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-lite
+	#! /bin/sh
+	echo "oclHashcat-lite and all related files have been installed in /opt/${PN}"
+	echo "Please run one of the following binaries to use gpu accelerated hashcat:"
+	EOF
 
-	fi
-	if [ -f "${ED}"/opt/${PN}/cudaHashcat-lite32.bin ]
-	then
-		echo 'echo 32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\""' >> "${ED}"/usr/bin/oclhashcat-lite
-		fperms +x /opt/${PN}/cudaHashcat-lite32.bin
-		echo '#! /bin/sh' > "${ED}"/usr/bin/cudaHashcat-lite32.bin
-		echo 'cd /opt/oclhashcat-lite-bin' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
-		echo 'echo "Warning: cudaHashcat-lite32.bin is running from $(pwd) so be careful of relative paths."' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
-		echo './cudaHashcat-lite32.bin $@' >> "${ED}"/usr/bin/cudaHashcat-lite32.bin
-		fperms +x /usr/bin/oclHashcat-lite32.bin
-	fi
-	fperms +x /usr/bin/oclhashcat-lite
+	for x in oclHashcat-lite64.bin oclHashcat-lite32.bin cudaHashcat-lite64.bin cudaHashcat-lite32.bin
+	do
+		if [ -f "${ED}"/opt/${PN}/${x} ]
+		then
+			case "${x}" in
+				oclHashcat-lite64.bin)
+					echo "echo '64 bit ATI accelerated \"oclHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				oclHashcat-lite32.bin)
+					echo "echo '32 bit ATI accelerated \"oclHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				cudaHashcat-lite64.bin)
+					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+				cudaHashcat-lite32.bin)
+					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
+					;;
+			esac
+
+			fperms +x /opt/${PN}/${x}
+
+			cat <<-EOF > "${ED}"/opt/bin/${x}
+			#! /bin/sh
+			cd /opt/${PN}
+			echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
+			./${x} "\$@"
+			EOF
+
+			fperms +x /opt/bin/${x}
+
+		fi
+	done
+
+	fperms +x /opt/bin/oclhashcat-lite
 	fowners root:video /opt/${PN}
 	einfo "oclhashcat-lite can be run as user if you are in the video group"
 }
diff --git a/app-crypt/pinentry/pinentry-0.8.1.ebuild b/app-crypt/pinentry/pinentry-0.8.1.ebuild
index 74632ff04479..0e190a974c23 100644
--- a/app-crypt/pinentry/pinentry-0.8.1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.1.ebuild,v 1.9 2012/06/25 19:32:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.1.ebuild,v 1.10 2012/07/03 19:38:18 jer Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk ncurses qt4 caps static"
 
 RDEPEND="app-admin/eselect-pinentry
diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
index 8d5c7b6032ff..64f3aa9fcaaf 100644
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.7 2012/07/03 07:42:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.8 2012/07/03 20:23:58 jer Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
index 4b8ce2a2fd37..1b5e371bfb95 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.4 2012/07/03 07:43:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r3.ebuild,v 1.5 2012/07/03 20:22:29 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 5e3f24ef64d1..98341ae2fbfd 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,2 +1 @@
-DIST sleuthkit-3.2.1.tar.gz 2033920 RMD160 d20a6e46da9aef30117f93a24701a18c5d513626 SHA1 07966f3b95e00569d0df826fa713b8272b272bf6 SHA256 e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37
 DIST sleuthkit-3.2.3.tar.gz 2039699 RMD160 ee9849ff34bd7d1ce90819f22f1e09a71e4d0e8c SHA1 85d100ffde54f051916a4ea9452563ff85fad4ac SHA256 ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62
diff --git a/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild b/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild
deleted file mode 100644
index 7ddbdea88083..000000000000
--- a/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.1.ebuild,v 1.8 2012/03/01 23:31:01 ranger Exp $
-
-EAPI="4"
-
-DESCRIPTION="A collection of file system and media management forensic analysis tools"
-HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 IBM"
-SLOT=0
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="aff ewf"
-
-DEPEND="ewf? ( app-forensics/libewf[-ewf2] )
-	aff? ( app-forensics/afflib )"
-RDEPEND="${DEPEND}
-	dev-perl/DateManip"
-
-src_configure() {
-	econf \
-		$(use_with aff afflib) \
-		$(use_with ewf libewf)
-}
-
-src_install() {
-	default
-	dodoc docs/*.txt README.txt
-}
diff --git a/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
index 1e4dd124e10d..769ae1923df1 100644
--- a/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild,v 1.6 2012/06/29 12:38:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild,v 1.7 2012/07/03 20:15:33 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 IBM"
 SLOT=0
-KEYWORDS="amd64 ~hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE="aff ewf static-libs"
 
 DEPEND="dev-db/sqlite:3
diff --git a/app-i18n/scim/scim-1.4.11-r1.ebuild b/app-i18n/scim/scim-1.4.11-r1.ebuild
index c23a110ce3f3..d53eb0f34e79 100644
--- a/app-i18n/scim/scim-1.4.11-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.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/app-i18n/scim/scim-1.4.11-r1.ebuild,v 1.8 2012/06/28 12:46:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.11-r1.ebuild,v 1.9 2012/07/03 20:21:07 jer Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild
similarity index 93%
rename from app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1.ebuild
rename to app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild
index 2e4e3d8207f5..b532bc8714da 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1.ebuild,v 1.1 2012/07/03 14:14:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild,v 1.1 2012/07/03 20:39:20 floppym Exp $
 
 EAPI=4
 
@@ -38,7 +38,7 @@ src_install() {
 	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
 
 	insinto ${DOCBOOKDIR}
-	doins VERSION
+	doins VERSION VERSION.xsl
 
 	local i
 	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
similarity index 94%
rename from app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1.ebuild
rename to app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
index c23bf524c897..6b79ebda394c 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1.ebuild,v 1.1 2012/07/03 13:54:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild,v 1.1 2012/07/03 20:26:29 floppym Exp $
 
 EAPI=4
 
@@ -38,7 +38,7 @@ src_install() {
 	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
 
 	insinto ${DOCBOOKDIR}
-	doins VERSION
+	doins VERSION VERSION.xsl
 
 	local i
 	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
diff --git a/app-text/dos2unix/dos2unix-6.0.ebuild b/app-text/dos2unix/dos2unix-6.0.ebuild
index 0bc8bf1b22f0..4551980de9ba 100644
--- a/app-text/dos2unix/dos2unix-6.0.ebuild
+++ b/app-text/dos2unix/dos2unix-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/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.4 2012/07/03 16:26:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.5 2012/07/03 19:26:22 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"
 
 RDEPEND="
diff --git a/app-text/noweb/noweb-2.11b-r3.ebuild b/app-text/noweb/noweb-2.11b-r3.ebuild
index e22e5273a05f..374f7604cf8a 100644
--- a/app-text/noweb/noweb-2.11b-r3.ebuild
+++ b/app-text/noweb/noweb-2.11b-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r3.ebuild,v 1.5 2012/06/07 22:26:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/noweb/noweb-2.11b-r3.ebuild,v 1.6 2012/07/03 19:35:49 jer Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
 
 LICENSE="noweb emacs? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="emacs examples"
 
 DEPEND="virtual/tex-base
diff --git a/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild
index 3b45287dfe8d..5b09297abc71 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild,v 1.5 2012/07/03 14:02:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.3.1.ebuild,v 1.6 2012/07/04 01:11:36 jdhore Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.6.27
diff --git a/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild b/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
index 9e0079bce1b6..258f96d91d54 100644
--- a/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild
+++ b/dev-db/SchemaSync/SchemaSync-0.9.2.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/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild,v 1.1 2012/04/28 00:22:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/SchemaSync/SchemaSync-0.9.2.ebuild,v 1.2 2012/07/04 00:44:59 blueness Exp $
 
 EAPI="4"
 
-PYTHON_DEPEND="2:2.5:2.6"
+PYTHON_DEPEND="2:2.5:2.7"
 
 inherit distutils
 
diff --git a/dev-db/postgis/postgis-2.0.0.ebuild b/dev-db/postgis/postgis-2.0.0.ebuild
index a8628270e6fe..978ebea7c359 100644
--- a/dev-db/postgis/postgis-2.0.0.ebuild
+++ b/dev-db/postgis/postgis-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.3 2012/06/12 09:16:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.0.ebuild,v 1.4 2012/07/03 16:32:35 ranger Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://postgis.refractions.net"
 SRC_URI="http://postgis.refractions.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="doc gtk"
 
 RDEPEND="
diff --git a/dev-lang/php/php-5.3.14.ebuild b/dev-lang/php/php-5.3.14.ebuild
index 118569228212..3b043c7ee329 100644
--- a/dev-lang/php/php-5.3.14.ebuild
+++ b/dev-lang/php/php-5.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.14.ebuild,v 1.6 2012/06/23 17:13:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.14.ebuild,v 1.7 2012/07/03 17:26:06 ranger Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {
diff --git a/dev-libs/Ice/Ice-3.4.2.ebuild b/dev-libs/Ice/Ice-3.4.2.ebuild
index 2eca6ca190f8..f27240e1ecf9 100644
--- a/dev-libs/Ice/Ice-3.4.2.ebuild
+++ b/dev-libs/Ice/Ice-3.4.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-libs/Ice/Ice-3.4.2.ebuild,v 1.5 2012/04/14 19:39:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.6 2012/07/04 01:11:25 jdhore Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${
 	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 x86"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
diff --git a/dev-libs/eb/eb-4.4.1.ebuild b/dev-libs/eb/eb-4.4.1.ebuild
index d31795629adc..9d0f0a0b63ea 100644
--- a/dev-libs/eb/eb-4.4.1.ebuild
+++ b/dev-libs/eb/eb-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/eb-4.4.1.ebuild,v 1.5 2012/06/07 21:37:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/eb-4.4.1.ebuild,v 1.6 2012/07/03 20:19:43 jer Exp $
 
 IUSE="nls ipv6 threads"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="sys-libs/zlib
 	nls? ( virtual/libintl )"
diff --git a/dev-libs/libatasmart/libatasmart-0.19.ebuild b/dev-libs/libatasmart/libatasmart-0.19.ebuild
index 5e0e993e53c0..5728018f7e7b 100644
--- a/dev-libs/libatasmart/libatasmart-0.19.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatasmart/libatasmart-0.19.ebuild,v 1.4 2012/06/29 12:41:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatasmart/libatasmart-0.19.ebuild,v 1.5 2012/07/03 20:26:15 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=sys-fs/udev-143"
diff --git a/dev-libs/libelf/libelf-0.8.13-r1.ebuild b/dev-libs/libelf/libelf-0.8.13-r1.ebuild
index 992b39568b49..890bd7a7e6c6 100644
--- a/dev-libs/libelf/libelf-0.8.13-r1.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.9 2012/05/05 18:22:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.10 2012/07/03 19:40:04 blueness Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
diff --git a/dev-libs/uriparser/uriparser-0.7.7.ebuild b/dev-libs/uriparser/uriparser-0.7.7.ebuild
index 9fbd2e9f8f16..c0eb182c0c7f 100644
--- a/dev-libs/uriparser/uriparser-0.7.7.ebuild
+++ b/dev-libs/uriparser/uriparser-0.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.7.ebuild,v 1.4 2012/06/04 06:11:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.7.ebuild,v 1.5 2012/07/03 16:52:16 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc qt4 test unicode"
 
 RDEPEND=""
diff --git a/dev-ml/core_extended/core_extended-108.00.01.ebuild b/dev-ml/core_extended/core_extended-108.00.01.ebuild
index 1db517ba1f24..860d80c03146 100644
--- a/dev-ml/core_extended/core_extended-108.00.01.ebuild
+++ b/dev-ml/core_extended/core_extended-108.00.01.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-ml/core_extended/core_extended-108.00.01.ebuild,v 1.2 2012/07/01 16:08:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core_extended/core_extended-108.00.01.ebuild,v 1.3 2012/07/03 17:38:32 mr_bones_ Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SRC_URI="http://bitbucket.org/yminsky/ocaml-core/downloads/${P}.tar.gz"
 LICENSE="LGPL-2.1-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 RDEPEND="dev-ml/pcre-ocaml
 	>=dev-ml/sexplib-108.00.01
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild
index 45da655fb831..707efbece8be 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild,v 1.5 2012/06/25 19:34:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0.ebuild,v 1.7 2012/07/03 20:36:59 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl API for memcached"
 HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-perl/string-crc32"
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.520.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.520.0.ebuild
new file mode 100644
index 000000000000..bd456b531a4b
--- /dev/null
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.520.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.520.0.ebuild,v 1.1 2012/07/03 18:33:12 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.52
+inherit perl-module
+
+DESCRIPTION="Parse and Format DateTimes using Strptime"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/DateTime-0.44
+	>=dev-perl/DateTime-Locale-0.45
+	>=dev-perl/DateTime-TimeZone-0.79
+	>=dev-perl/Params-Validate-0.91"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index e446d766408b..745e750fb83f 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,2 +1,3 @@
 DIST DateTime-Format-Strptime-1.5000.tar.gz 27707 RMD160 70ec474a8b57b7b36bf99a6378fd56fa2be3eff2 SHA1 8040a3e3e89340e5e240e3ef7cf1871cc1e4e238 SHA256 1ef191ac4adff361e873c88e27a432b03398815248e36a9e514ee71e17cea554
 DIST DateTime-Format-Strptime-1.51.tar.gz 26632 RMD160 89424b4a73226f269023c20d04b61827feecb2ea SHA1 e859aa9e4192623a628ffa5fbffdd82932e44986 SHA256 9c499ff101fc54516a10d0b737ed31ba016fd3ede8fe4798eaf25841e3d56267
+DIST DateTime-Format-Strptime-1.52.tar.gz 26398 RMD160 1ad68f8c0643bb37c6179005522e33596d1fd54e SHA1 d2484792ce12852091c6850cf0ab4f3d4cf7579f SHA256 ca66c73972a8bff0b7c6c8ed3ff8618f27f6d5ab1beea49cc5fe0c05611a9f30
diff --git a/dev-perl/DateTime/DateTime-0.760.0.ebuild b/dev-perl/DateTime/DateTime-0.760.0.ebuild
new file mode 100644
index 000000000000..c2ed162d0610
--- /dev/null
+++ b/dev-perl/DateTime/DateTime-0.760.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime/DateTime-0.760.0.ebuild,v 1.1 2012/07/03 18:30:46 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=0.76
+inherit perl-module
+
+DESCRIPTION="A date and time object"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Params-Validate-0.76
+	>=dev-perl/DateTime-TimeZone-1.09
+	>=dev-perl/DateTime-Locale-0.44
+	dev-perl/Math-Round
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		dev-perl/Test-Fatal
+	)
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index b63d9014cc18..16bf35d0b76b 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -4,3 +4,4 @@ DIST DateTime-0.72.tar.gz 170910 RMD160 3dbed542212e1b2176976c758942a53027bdb1bd
 DIST DateTime-0.73.tar.gz 171082 RMD160 0c02b296b2c10ed1f3c04943ac517fe0794dc2de SHA1 a6162cf7996f7c3b970fb0d4efb6a389a39b85c3 SHA256 088f8f9b4418640a12709b4b1eb8ab5c0521da05303ee596536798bc3a24bd8b
 DIST DateTime-0.74.tar.gz 171130 RMD160 edad8b939c49924b8ed7f73176d64bce2c0cb1d0 SHA1 853bb737a14a5d65fcc974728339a65752e71b16 SHA256 1e23cdb8425f61ea64da4fd136b5f7a3f5fa258a39303a24e1e34c1b88a54b71
 DIST DateTime-0.75.tar.gz 169751 RMD160 75fd044ec24423b72073ee6cbf990b4e85c4fb74 SHA1 e8d6b27e5f324e397fe9a1e8e459fb8b8c7c4d7c SHA256 9ebe1698c5227869381fd278d64ce9f92cd04912dd8774e4832a900c38d95904
+DIST DateTime-0.76.tar.gz 171511 RMD160 654f43b9dd7398894d290db60929718a6427a0a7 SHA1 9b4478e050448ad2bd9b7bc1cc29fc8ecd9d9cf4 SHA256 9ca0ab3c5b09d421cc260f83566a0c71f6cf683d57ff64c5a70e6cf4eb1773f0
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
index aae6ce46590d..dea6b16746af 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.7 2012/06/29 14:56:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.8 2012/07/03 16:47:39 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for simple HTTP servers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
index 82189c80f05f..72818b2b85eb 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.7 2012/06/29 14:57:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.8 2012/07/03 16:48:35 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
index c5b691f5bda4..d624df429b2c 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.7 2012/06/29 14:59:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.8 2012/07/03 16:49:29 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Moose/Manifest b/dev-perl/Moose/Manifest
index fd9a4361b51f..8a12e21a0825 100644
--- a/dev-perl/Moose/Manifest
+++ b/dev-perl/Moose/Manifest
@@ -2,3 +2,4 @@ DIST Moose-1.24.tar.gz 470108 RMD160 1562e35f184d2ddb9478892654d71869b9bc9d1f SH
 DIST Moose-2.0402.tar.gz 677553 RMD160 2b1121764c785bb1cb2697f2dce897807bccb412 SHA1 745c825c354dea555c3ceb395157934082ea4dca SHA256 d033fa37b7c7451312fdd1b758511afe43b4bba10acce063aaf219dbd7008a6e
 DIST Moose-2.0601.tar.gz 1032978 RMD160 1d2b03afecdab21d35afe4cdcf360a84b01de39c SHA1 0aad640877c67ac90093ab7e2e1d10fbb150716f SHA256 81e299a1e686bddd1dbb012793f0d7c367cf8eccce27b4fd44253e38fb8e4ab9
 DIST Moose-2.0602.tar.gz 696832 RMD160 ccfcd24ad0d9725343e8f1e2cde06210236eac9f SHA1 b22e4353d24c6f5ae068457af7211b9f7115b835 SHA256 fa20e3633bfb767656760c0887e4e6164593b7822fc3130ab37c1004d32b5c3f
+DIST Moose-2.0603.tar.gz 696979 RMD160 218a12f58921c2a2bcd590c76d495647600644f6 SHA1 65e6cea0c62e01b375c04f8881a0e610dee0bacc SHA256 279738dc91407ccb8c02cb444c3ed0feb4d4525549bece4fdde6c2bae371c356
diff --git a/dev-perl/Moose/Moose-2.60.300.ebuild b/dev-perl/Moose/Moose-2.60.300.ebuild
new file mode 100644
index 000000000000..a485bfd62a40
--- /dev/null
+++ b/dev-perl/Moose/Moose-2.60.300.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Moose/Moose-2.60.300.ebuild,v 1.1 2012/07/03 18:37:37 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DOY
+MODULE_VERSION=2.0603
+inherit perl-module
+
+DESCRIPTION="A postmodern object system for Perl 5"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+CONFLICTS="
+	!<=dev-perl/Catalyst-5.800.280
+	!<=dev-perl/Devel-REPL-1.003008
+	!<=dev-perl/Fey-0.360
+	!<=dev-perl/Fey-ORM-0.420
+	!<=dev-perl/File-ChangeNotify-0.150
+	!<=dev-perl/KiokuDB-0.510.0
+	!<=dev-perl/Markdent-0.160
+	!<=dev-perl/Mason-2.180.0
+	!<=dev-perl/MooseX-ABC-0.50.0
+	!<=dev-perl/MooseX-Aliases-0.80
+	!<=dev-perl/MooseX-AlwaysCoerce-0.130.0
+	!<=dev-perl/MooseX-Attribute-Deflator-2.1.7
+	!<=dev-perl/MooseX-Attribute-Dependent-1.1.0
+	!<=dev-perl/MooseX-Attribute-Prototype-0.100
+	!<=dev-perl/MooseX-AttributeHelpers-0.22
+	!<=dev-perl/MooseX-AttributeIndexes-1.0.0
+	!<=dev-perl/MooseX-AttributeInflate-0.20
+	!<=dev-perl/MooseX-CascadeClearing-0.30.0
+	!<=dev-perl/MooseX-ClassAttribute-0.250.0
+	!<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0
+	!<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0
+	!<=dev-perl/MooseX-Constructor-AllErrors-0.12
+	!<=dev-perl/MooseX-FollowPBP-0.20
+	!<=dev-perl/MooseX-HasDefaults-0.20
+	!<=dev-perl/MooseX-InstanceTracking-0.40
+	!<=dev-perl/MooseX-LazyRequire-0.60.0
+	!<=dev-perl/MooseX-NonMoose-0.170.0
+	!<=dev-perl/MooseX-POE-0.214.0
+	!<=dev-perl/MooseX-Params-Validate-0.50
+	!<=dev-perl/MooseX-PrivateSetters-0.30.0
+	!<=dev-perl/MooseX-Role-Cmd-0.60
+	!<=dev-perl/MooseX-Role-Parameterized-0.230.0
+	!<=dev-perl/MooseX-Role-WithOverloading-0.070
+	!<=dev-perl/MooseX-Scaffold-0.50.0
+	!<=dev-perl/MooseX-SemiAffordanceAccessor-0.50
+	!<=dev-perl/MooseX-SetOnce-0.100.472
+	!<=dev-perl/MooseX-Singleton-0.250
+	!<=dev-perl/MooseX-StrictConstructor-0.120
+	!<=dev-perl/MooseX-Types-Parameterizable-0.50.0
+	!<=dev-perl/MooseX-Types-Signal-1.101930
+	!<=dev-perl/MooseX-Types-0.190
+	!<=dev-perl/MooseX-UndefTolerant-0.110.0
+	!<=dev-perl/PRANG-0.140.0
+	!<=dev-perl/Pod-Elemental-0.93.280
+	!<=dev-perl/Reaction-0.2.3
+	!<=dev-perl/Test-Able-0.100.0
+	!<=dev-perl/namespace-autoclean-0.08
+"
+
+RDEPEND="
+	${CONFLICTS}
+	!dev-perl/Class-MOP
+	>=dev-perl/Class-Load-0.90.0
+	>=dev-perl/Class-Load-XS-0.10.0
+	>=dev-perl/Dist-CheckConflicts-0.20
+	>=dev-perl/Data-OptList-0.107.0
+	dev-perl/Devel-GlobalDestruction
+	>=dev-perl/Eval-Closure-0.40.0
+	>=dev-perl/List-MoreUtils-0.280.0
+	>=dev-perl/MRO-Compat-0.05
+	>=dev-perl/Package-DeprecationManager-0.110.0
+	>=dev-perl/Package-Stash-0.320.0
+	>=dev-perl/Package-Stash-XS-0.240.0
+	>=dev-perl/Params-Util-1
+	>=virtual/perl-Scalar-List-Utils-1.19
+	>=dev-perl/Sub-Exporter-0.980
+	>=dev-perl/Sub-Name-0.05
+	>=dev-perl/Try-Tiny-0.20
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.56
+	test? (
+		dev-perl/PadWalker
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.88
+		dev-perl/Test-Requires
+		>=dev-perl/Test-Output-0.09
+		>=dev-perl/Test-Warn-0.11
+		dev-perl/Test-Deep
+		dev-perl/Module-Refresh
+	)"
+
+SRC_TEST=do
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index f4a5a5f5e1ec..eefa054f0315 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,2 +1,3 @@
 DIST Mouse-0.64-ppport.h.bz2 39634 RMD160 0fc8bc05235db2a06d650f5c5fde81d65c72f6d7 SHA1 36a0e53d4a662a671ab91b418bf273efe5a60cd7 SHA256 adbd5a9eb45a677b948b9c119815977df82981991dfd66b2eecb44a47ff61c7a
 DIST Mouse-0.97.tar.gz 229149 RMD160 4be9e12a2c860098131989ef0ee52da131a940c1 SHA1 12d785e2c8821c52ee0714c94cc3614112cfe7a2 SHA256 dfb1f3abbc46e7646a685efa4e5804c4cf9772eb807ac6abf8f1d1529b57b97a
+DIST Mouse-0.99.tar.gz 231593 RMD160 09a70811677661ee81847e66b7ea5a795fda4914 SHA1 921678ff048f84250aec95072b20dba749b1d3bb SHA256 81c33229c3dc0b715093f84fb46d1fc2a6804aa811d3f72406aba372c6fa03f9
diff --git a/dev-perl/Mouse/Mouse-0.990.0.ebuild b/dev-perl/Mouse/Mouse-0.990.0.ebuild
new file mode 100644
index 000000000000..ab68a719f859
--- /dev/null
+++ b/dev-perl/Mouse/Mouse-0.990.0.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/dev-perl/Mouse/Mouse-0.990.0.ebuild,v 1.1 2012/07/03 18:14:03 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=GFUJI
+MODULE_VERSION=0.99
+inherit eutils perl-module
+
+DESCRIPTION="Moose minus the antlers"
+SRC_URI+=" mirror://gentoo/Mouse-0.64-ppport.h.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
+IUSE="test"
+
+RDEPEND="virtual/perl-XSLoader"
+DEPEND=">=virtual/perl-ExtUtils-ParseXS-2.21
+	test? ( dev-perl/Sub-Uplevel
+		>=virtual/perl-Test-Simple-0.88 )"
+
+src_prepare() {
+	perl-module_src_prepare
+	epatch "${FILESDIR}"/0.64-ppport.patch
+	mv "${WORKDIR}"/Mouse-0.64-ppport.h "${S}"/ppport.h || die
+}
+
+SRC_TEST=do
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest b/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
index 7941839ac800..8a833a995a88 100644
--- a/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
+++ b/dev-perl/Net-SMTP-TLS-ButMaintained/Manifest
@@ -1 +1,2 @@
 DIST Net-SMTP-TLS-ButMaintained-0.19.tar.gz 16052 RMD160 237c1a4ff19aa3e4da4cef897c90b77d4e3c9d51 SHA1 197d8bcada2e5ec0772531654ce26d3004825556 SHA256 988fcde159992f7ebf96a29a4b6ce7963ddce1561653066e8a91f7ced2fd7f81
+DIST Net-SMTP-TLS-ButMaintained-0.20.tar.gz 16057 RMD160 fa1d1b1e066807cb5e4ff46a01b52f58e78777ca SHA1 dc85fa1d8045d32916cf02af8cd65657261b4fd9 SHA256 bc67b23e6bde2e8e4dae74fec7afdde2b1d36044dc7334bb152f8755c3a54d03
diff --git a/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.200.0.ebuild b/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.200.0.ebuild
new file mode 100644
index 000000000000..b9097a0d798e
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.200.0.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/dev-perl/Net-SMTP-TLS-ButMaintained/Net-SMTP-TLS-ButMaintained-0.200.0.ebuild,v 1.1 2012/07/03 18:20:01 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FAYLAND
+MODULE_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="An SMTP client supporting TLS and AUTH"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-IO
+	virtual/perl-libnet
+	>=dev-perl/IO-Socket-SSL-1.760.0
+	dev-perl/Net-SSLeay
+	virtual/perl-MIME-Base64
+	dev-perl/Digest-HMAC
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+"
+
+SRC_TEST=do
diff --git a/dev-perl/SQL-Translator/Manifest b/dev-perl/SQL-Translator/Manifest
index fe1844a2e259..957625cc39be 100644
--- a/dev-perl/SQL-Translator/Manifest
+++ b/dev-perl/SQL-Translator/Manifest
@@ -1,2 +1,3 @@
 DIST SQL-Translator-0.11010.tar.gz 415743 RMD160 89a3aad2729c0f77351566ad408b232f92fa2506 SHA1 bc2a32bf8d57363c0937b0d465f0b6991e4cefc7 SHA256 e5b39a88ef2c5e3bb0669d6e581247f0784a6a6e5db326163daf687e5ae5f109
 DIST SQL-Translator-0.11011.tar.gz 806751 RMD160 91dab2327756b684ed8e4481827fad85930ea886 SHA1 c97267cda56e7f10a9cc4b12c2f9aafa3b35fc90 SHA256 a5a68e60fbd986f8def7dc999bda9bf2e455203697f34b1e84c9f7552bbba99e
+DIST SQL-Translator-0.11012.tar.gz 418455 RMD160 734161f69a2d3d9b79d6e797e591ecee4c1a39fb SHA1 9bec0128ce9911a0b6ffa4903b619627ecff45d6 SHA256 b22bbcf1f83d2ffbdebed635a113764be8fbff16f7dd8e658d838316588be05f
diff --git a/dev-perl/SQL-Translator/SQL-Translator-0.110.120.ebuild b/dev-perl/SQL-Translator/SQL-Translator-0.110.120.ebuild
new file mode 100644
index 000000000000..1b0ccd669c1c
--- /dev/null
+++ b/dev-perl/SQL-Translator/SQL-Translator-0.110.120.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-perl/SQL-Translator/SQL-Translator-0.110.120.ebuild,v 1.1 2012/07/03 18:11:14 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FREW
+MODULE_VERSION=${PV:2:6}
+MODULE_VERSION=${PV:0:1}.${MODULE_VERSION/.}
+inherit perl-module
+
+DESCRIPTION="Convert RDBMS SQL CREATE syntax"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/yaml-0.68
+	>=dev-perl/IO-stringy-2.110
+	dev-perl/Class-Base
+	>=dev-perl/Digest-SHA1-2.12
+	dev-perl/Class-Accessor
+	>=dev-perl/Parse-RecDescent-1.967.9
+	>=dev-perl/File-ShareDir-1.00
+	dev-perl/Class-MakeMethods
+	>=dev-perl/XML-Writer-0.606
+	dev-perl/Carp-Clan
+	dev-perl/Class-Data-Inheritable
+	dev-perl/DBI
+	dev-perl/Moo
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/HTML-Parser
+		>=dev-perl/XML-LibXML-1.69
+		dev-perl/Spreadsheet-ParseExcel
+		>=dev-perl/Template-Toolkit-2.2
+		dev-perl/Test-Exception
+		dev-perl/Test-Differences
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/SQL-Translator/metadata.xml b/dev-perl/SQL-Translator/metadata.xml
index f6bea6d5fd4e..be2d6184ed5f 100644
--- a/dev-perl/SQL-Translator/metadata.xml
+++ b/dev-perl/SQL-Translator/metadata.xml
@@ -13,6 +13,7 @@
     <remote-id type="cpan-module">SQL::Translator::Filter::DefaultExtra</remote-id>
     <remote-id type="cpan-module">SQL::Translator::Filter::Globals</remote-id>
     <remote-id type="cpan-module">SQL::Translator::Filter::Names</remote-id>
+    <remote-id type="cpan-module">SQL::Translator::Generator::DDL::PostgreSQL</remote-id>
     <remote-id type="cpan-module">SQL::Translator::Generator::DDL::SQLServer</remote-id>
     <remote-id type="cpan-module">SQL::Translator::Generator::DDL::SQLite</remote-id>
     <remote-id type="cpan-module">SQL::Translator::Generator::Role::DDL</remote-id>
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 698102f6e4cb..a1a842f47582 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -1,3 +1,4 @@
 DIST Sys-Virt-0.9.10.tar.gz 76896 RMD160 e69f636a4a5429bc7907d3350065404199279aec SHA1 920af577b9a025b8d09545449d0e4bcac50dbe7e SHA256 1fdf35b96d8d77b6f3eeb1737e7c56040d11e7ec14ba52a9368bcdd98710d8e8
 DIST Sys-Virt-0.9.11.tar.gz 78780 RMD160 8d791ae18517ffd57764018255adec2be42e9c42 SHA1 6226275a12e55037269e41f3b562150b2cacb42f SHA256 3428544d25b234d27d2894c68bab559ebba719f61a1c6a9f923b83abf3552055
 DIST Sys-Virt-0.9.12.tar.gz 79426 RMD160 71fb1a35643861f26267893bcbe99d7a36755776 SHA1 7e0c682addcdab7a9cf799d0052445d42c077bd9 SHA256 8228cc437cf295f8f81de48b065c93ca4fc71536633cd0cc5f5ce3c8b61eafc0
+DIST Sys-Virt-0.9.13.tar.gz 80647 RMD160 7685dec27fe2a33b345283a11e8cedcc66560809 SHA1 61055ff85a5e852824a50a1a4856d66eb3dd3c65 SHA256 a9132ce6bfd7ad9b81ba1724064c32aef73296fa777767727989038c9a989a5e
diff --git a/dev-perl/Sys-Virt/Sys-Virt-0.9.13.ebuild b/dev-perl/Sys-Virt/Sys-Virt-0.9.13.ebuild
new file mode 100644
index 000000000000..1302028262a8
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-0.9.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-Virt/Sys-Virt-0.9.13.ebuild,v 1.1 2012/07/03 17:41:25 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DANBERR
+MODULE_VERSION=0.9.13
+inherit perl-module
+
+DESCRIPTION="Sys::Virt provides an API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=app-emulation/libvirt-${PV}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		dev-perl/XML-XPath
+		virtual/perl-Time-HiRes
+	)"
+
+SRC_TEST="do"
+
+src_compile() {
+	MAKEOPTS+=" -j1" perl-module_src_compile
+}
diff --git a/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild b/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild
index d674d069bc2b..9963dc91c4bc 100644
--- a/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild
+++ b/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild,v 1.3 2012/06/19 14:03:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0.ebuild,v 1.4 2012/07/03 20:36:11 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Terminal control using ANSI escape sequences"
 
 LICENSE="CC0-1.0-Universal"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Test-TCP/Manifest b/dev-perl/Test-TCP/Manifest
index 8874c3bc033b..c5404e50ec61 100644
--- a/dev-perl/Test-TCP/Manifest
+++ b/dev-perl/Test-TCP/Manifest
@@ -1 +1,2 @@
 DIST Test-TCP-1.15.tar.gz 25981 RMD160 6c77b4bae559de57bc3b3b75cab1dde88adf7ebf SHA1 58c53fe985428050e03d228697439d3785762f67 SHA256 22fed9fe3d683843524530327fd552548a87cd49e73d3286105f951e30e78664
+DIST Test-TCP-1.16.tar.gz 26703 RMD160 2e410fa5790ed098d64ae3662849f9c45cadf5ae SHA1 0453b12186a8cfa58e1e190cda38a79040a4eee8 SHA256 5801bf667a4cd403a6effb12834f63c58d7131915a7d483c80c898ab57aba08b
diff --git a/dev-perl/Test-TCP/Test-TCP-1.160.0.ebuild b/dev-perl/Test-TCP/Test-TCP-1.160.0.ebuild
new file mode 100644
index 000000000000..a7be87bee41f
--- /dev/null
+++ b/dev-perl/Test-TCP/Test-TCP-1.160.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/Test-TCP-1.160.0.ebuild,v 1.1 2012/07/03 17:46:57 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=TOKUHIROM
+MODULE_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Testing TCP program"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Test-SharedFork-0.190.0
+	>=virtual/perl-IO-1.23
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/perltidy/Manifest b/dev-perl/perltidy/Manifest
index 062808386e9a..c9faa52a3dd0 100644
--- a/dev-perl/perltidy/Manifest
+++ b/dev-perl/perltidy/Manifest
@@ -1,2 +1,3 @@
 DIST Perl-Tidy-20101217.tar.gz 387834 RMD160 bd28763749424456598135e877890c97fdf594cc SHA1 d9efd9bd29403fcda7d6f1667b0b0bdd62d8d744 SHA256 5e45756f91ded3f9df4680eb959b646e814dfcf742573a21554f53704b9fb2a7
 DIST Perl-Tidy-20120619.tar.gz 396208 RMD160 f90ad2f3db0d891d3469fcab697f2504089e7d69 SHA1 f48e983371821d6a32d999d0864b9eaca7e42c50 SHA256 da21203d46b708a9a0f29d7a9989b92c44a7482635aa4c88da68ddbfcba9140f
+DIST Perl-Tidy-20120701.tar.gz 400133 RMD160 b410bfb0cb7138b4f497a316502e64bce17906bf SHA1 d19acc3912a3b210daff7719bc76f1204ddacead SHA256 798a7e5de6a3c461e4625cc71821cf2b4273529ffb8450dad5afc17b2b6e415b
diff --git a/dev-perl/perltidy/perltidy-20120701.0.0.ebuild b/dev-perl/perltidy/perltidy-20120701.0.0.ebuild
new file mode 100644
index 000000000000..29ae987e6f77
--- /dev/null
+++ b/dev-perl/perltidy/perltidy-20120701.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perltidy/perltidy-20120701.0.0.ebuild,v 1.1 2012/07/03 18:16:12 tove Exp $
+
+EAPI=4
+
+MY_PN=Perl-Tidy
+MODULE_AUTHOR=SHANCOCK
+MODULE_VERSION=20120701
+inherit perl-module
+
+DESCRIPTION="Perl script indenter and beautifier"
+HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	docinto examples
+	dodoc "${S}"/examples/*
+}
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild
index 5ba896293ee2..61e5592488e6 100644
--- a/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild
+++ b/dev-python/SchemaObject/SchemaObject-0.5.3.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/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild,v 1.1 2012/04/28 00:03:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/SchemaObject/SchemaObject-0.5.3.ebuild,v 1.2 2012/07/04 00:46:37 blueness Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="2:2.5:2.6"
+PYTHON_DEPEND="2:2.5:2.7"
 
 inherit distutils
 
diff --git a/dev-python/foolscap/foolscap-0.6.4.ebuild b/dev-python/foolscap/foolscap-0.6.4.ebuild
index 9bb058bd0583..dd58aaee147d 100644
--- a/dev-python/foolscap/foolscap-0.6.4.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.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-python/foolscap/foolscap-0.6.4.ebuild,v 1.1 2012/06/28 06:23:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4.ebuild,v 1.2 2012/07/03 19:43:18 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -26,13 +26,6 @@ RDEPEND=">=dev-python/twisted-2.4.0
 DEPEND="${DEPEND}
 	dev-python/setuptools"
 
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable test failing with dev-python/pyopenssl and dev-libs/openssl-1.
-	sed -e "s/test_generate/_&/" -i foolscap/test/test_tub.py
-}
-
 src_test() {
 	LC_ALL="C" distutils_src_test
 }
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild
index c217210d05e7..ae07860a1f83 100644
--- a/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild
+++ b/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild,v 1.4 2012/07/01 18:15:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r1.ebuild,v 1.5 2012/07/03 20:38:06 jer Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc sparc x86 ~x86-fbsd"
 IUSE="doc examples X"
 
 DEPEND="dev-python/numpy
diff --git a/dev-python/rsa/rsa-3.1.1.ebuild b/dev-python/rsa/rsa-3.1.1.ebuild
index d7bdc8ad44d3..e0eac6edf71c 100644
--- a/dev-python/rsa/rsa-3.1.1.ebuild
+++ b/dev-python/rsa/rsa-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rsa/rsa-3.1.1.ebuild,v 1.1 2012/06/28 07:26:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rsa/rsa-3.1.1.ebuild,v 1.2 2012/07/03 19:44:15 floppym Exp $
 
 EAPI="4"
 
@@ -22,5 +22,4 @@ IUSE=""
 
 RDEPEND=">=dev-python/pyasn1-0.0.13
 	>=dev-python/setuptools-0.6.10"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/whoosh/whoosh-2.4.1.ebuild b/dev-python/whoosh/whoosh-2.4.1.ebuild
index ae1be05e7713..396555376af1 100644
--- a/dev-python/whoosh/whoosh-2.4.1.ebuild
+++ b/dev-python/whoosh/whoosh-2.4.1.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/dev-python/whoosh/whoosh-2.4.1.ebuild,v 1.2 2012/06/29 16:50:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.1.ebuild,v 1.3 2012/07/03 19:45:02 floppym Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="2:2.6 3:3.1"
+PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="setup.py"
 PYTHON_MODNAME="whoosh"
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index da1ebac6ea8c..5b42d8add7aa 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,2 +1,3 @@
 DIST nokogiri-1.4.4.gem 198656 RMD160 9f5fc2b15da160ccd03a096cf3074afb46e1a170 SHA1 15f5c381d98a4e53a879981b8fbc301d3561c675 SHA256 3d1ed8cc4b6caf1f1cdb7b53be26e72ab70b7111d463d76f898f1f32d998a7b2
 DIST nokogiri-1.5.2.tgz 1988760 RMD160 5acd8d4bbf8916f53237b102db21049510539e73 SHA1 fb75adc5fe4ea7e9cf6defdd634dc7614b2da045 SHA256 d977baa45baa700c107a25eefea6e4b4b2771dd05204d734eee2dab9d69b1dbc
+DIST nokogiri-1.5.5.tgz 2003354 RMD160 79e0b7e983059d3539de5d359b908fe27f97d8cc SHA1 ff3a8065dd81f32bb817abe4f8f911be1ccc23f6 SHA256 18c1dd504596e9f60267f48d9b9b28901bf1ba66be53b64ac78b32f5d277c685
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild
new file mode 100644
index 000000000000..ee9d84b65978
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild,v 1.1 2012/07/03 18:23:15 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+inherit ruby-fakegem eutils multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
+HOMEPAGE="http://nokogiri.rubyforge.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="sparklemotion-nokogiri-*"
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	dev-libs/libxml2
+	dev-libs/libxslt"
+DEPEND="${DEPEND}
+	dev-libs/libxml2
+	dev-libs/libxslt"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+	dev-ruby/rake-compiler
+	dev-ruby/rexical
+	dev-ruby/hoe
+	dev-ruby/rdoc
+	dev-ruby/racc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Avoid failing tests:
+			# https://github.com/sparklemotion/nokogiri/issues/721
+			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_configure() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			${RUBY} -Cext/${PN} extconf.rb \
+				--with-zlib-include="${EPREFIX}"/usr/include \
+				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+				--with-iconv-include="${EPREFIX}"/usr/include \
+				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+				--with-xslt-dir="${EPREFIX}"/usr \
+				--with-iconvlib=iconv \
+				|| die "extconf.rb failed"
+			;;
+	esac
+}
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*jruby)
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			${RUBY} -S rake compile || die
+			;;
+		*)
+			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+			fi
+
+			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+			fi
+
+			emake -Cext/${PN} \
+				CFLAGS="${CFLAGS} -fPIC" \
+				archflag="${LDFLAGS}" || die "make extension failed"
+			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+			;;
+	esac
+}
diff --git a/dev-util/lockrun/lockrun-20120508.ebuild b/dev-util/lockrun/lockrun-20120508.ebuild
index 18d739f92cda..2da4530f96c8 100644
--- a/dev-util/lockrun/lockrun-20120508.ebuild
+++ b/dev-util/lockrun/lockrun-20120508.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/lockrun/lockrun-20120508.ebuild,v 1.4 2012/06/21 19:35:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lockrun/lockrun-20120508.ebuild,v 1.5 2012/07/03 20:30:35 jer Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.unixwiz.net/tools/lockrun.html"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/dev-util/monkeystudio/Manifest b/dev-util/monkeystudio/Manifest
new file mode 100644
index 000000000000..b41fd5b5af45
--- /dev/null
+++ b/dev-util/monkeystudio/Manifest
@@ -0,0 +1 @@
+DIST mks_1.9.0.2-src.tar.gz 7550662 RMD160 f4d56c109193cfac50ba3f72c0ca5a1a47ad6beb SHA1 a729448129b330903a73acc5d3c5c856b7f4b0cf SHA256 e7acd13d2f25982a6950938b18b455868199d7bd3cafabb5ba8f42bdc6f5e7cb
diff --git a/dev-util/monkeystudio/metadata.xml b/dev-util/monkeystudio/metadata.xml
new file mode 100644
index 000000000000..79f13541af69
--- /dev/null
+++ b/dev-util/monkeystudio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<use>
+		<flag name="plugins">Build and install additional plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">monkeystudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/monkeystudio/monkeystudio-1.9.0.2.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.2.ebuild
new file mode 100644
index 000000000000..d19739f4a34f
--- /dev/null
+++ b/dev-util/monkeystudio/monkeystudio-1.9.0.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monkeystudio/monkeystudio-1.9.0.2.ebuild,v 1.1 2012/07/03 17:20:33 kensington Exp $
+
+EAPI=4
+LANGS="be es fr ru"
+
+inherit qt4-r2
+
+MY_P="mks_${PV}-src"
+
+DESCRIPTION="A cross platform Qt 4 IDE"
+HOMEPAGE="http://www.monkeystudio.org"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+IUSE="doc plugins"
+
+RDEPEND="plugins? ( >=x11-libs/qt-webkit-4.7.0:4 )
+	>=x11-libs/qt-assistant-4.7.0:4
+	>=x11-libs/qt-core-4.7.0:4
+	>=x11-libs/qt-gui-4.7.0:4
+	>=x11-libs/qt-sql-4.7.0:4
+	x11-libs/qscintilla"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.5.8 )"
+
+DOCS="ChangeLog readme.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# avoid installing every translation
+	sed -e "s:datas/\*:datas/apis datas/scripts datas/templates:" \
+		-i installs.pri || die "sed installs.pri failed"
+
+	rm -r qscintilla/QScintilla-gpl-snapshot \
+		|| die "failed removing bundled qscintilla"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 build.pro prefix=/usr system_qscintilla=1
+
+	if use plugins ; then
+		eqmake4 plugins/plugins.pro
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	if use plugins ; then
+		insinto /usr/lib64/monkeystudio
+		doins -r bin/plugins/*
+	fi
+
+	insinto /usr/share/${PN}/translations
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+			doins datas/translations/monkeystudio_${lang}.qm
+		fi
+	done
+
+	fperms 755 /usr/bin/${PN}
+
+	if use doc ; then
+		doxygen || die "doxygen failed"
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
index df287e7a2ec3..5ba6b68d7c4d 100644
--- a/dev-vcs/git/git-1.7.8.6.ebuild
+++ b/dev-vcs/git/git-1.7.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.5 2012/07/02 05:49:01 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.6 2012/07/03 19:28:00 jer Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index 1c44d0821494..e733aafb2c52 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.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/games-fps/openarena/openarena-0.8.8.ebuild,v 1.2 2012/06/20 17:52:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/openarena-0.8.8.ebuild,v 1.3 2012/07/04 03:16:53 jdhore Exp $
 
 EAPI=2
 inherit eutils flag-o-matic versionator games
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/oarena/${P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+curl +openal +vorbis"
 
 RDEPEND="virtual/opengl
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 7931a629c0ed..a6d8ffc500fa 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,3 +1,2 @@
-DIST lgeneral-1.2.2.tar.gz 1628913 RMD160 21299a3cc6114a728d4a510efdbf982d6bb2037a SHA1 6098057874fac023ba7870620feaab1b7ac29705 SHA256 1817c409120b9e5f51da2cd43c96c5eda91d6a1207417eeb3e8bacd11248eb74
 DIST lgeneral-1.2.3.tar.gz 1630400 RMD160 05378b06f1f5f9af22c9fa52abba07180daad3e3 SHA1 2762f9dd2a87a67638c389187f1eaef94515b57c SHA256 55d17bb173c956c705b94bc8a6399d5311b3ec82c9f1821a97fe9ec45da0d9a1
 DIST pg-data.tar.gz 410454 RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a SHA1 d78db7705e55751332fd1163311311ec36fff3ea SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76
diff --git a/games-strategy/lgeneral/lgeneral-1.2.2.ebuild b/games-strategy/lgeneral/lgeneral-1.2.2.ebuild
deleted file mode 100644
index 044b80050386..000000000000
--- a/games-strategy/lgeneral/lgeneral-1.2.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.2.ebuild,v 1.3 2011/10/08 16:30:27 phajdan.jr Exp $
-
-EAPI=2
-inherit eutils autotools games
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/beta-}"
-DESCRIPTION="A Panzer General clone written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LGeneral"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://sourceforge/${PN}/pg-data.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="media-libs/libsdl[audio,video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e '/desktop_DATA/d' \
-		-e '/icon_DATA/d' \
-		Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	rm -f missing
-	eautoreconf
-
-	# Build a temporary lgc-pg that knows about ${WORKDIR}:
-	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die "cp failed"
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@::" \
-		{lgc-pg,src}/misc.c \
-		|| die "sed failed"
-
-	cd "${WORKDIR}"/tmp-build
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		-e "s:@D@:${D}:" \
-		{lgc-pg,src}/misc.c \
-		|| die "sed failed (tmp)"
-}
-
-src_configure() {
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		|| die
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	egamesconf \
-		--disable-dependency-tracking \
-		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}" \
-		|| die
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build
-	emake || die "emake failed (tmp)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
-
-	# Generate scenario data:
-	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg \
-		-s "${WORKDIR}"/pg-data \
-		-d "${D}/${GAMES_DATADIR}"/${PN} \
-		|| die "Failed to generate scenario data"
-
-	dodoc AUTHORS ChangeLog README.lgeneral README.lgc-pg TODO
-	newicon lgeneral48.png ${PN}.png
-	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
-}
diff --git a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
index 76bc35721682..165c27468ff6 100644
--- a/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.2 2012/07/01 18:22:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2.3.ebuild,v 1.3 2012/07/03 23:31:11 jdhore Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[audio,video]
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
index 8189032f86a8..150620cbfeea 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,3 +1,2 @@
-DIST Cenon-3.82.tar.bz2 2153537 RMD160 323ee0590ea2046df821c91c5d320fbfd0def874 SHA1 513acf72c9a21bf669f1bd4f532debf25dfef392 SHA256 40ec970655e046bbafed33c57b02dbfe8f3691d83cffc5cd40e8dbe70695a0db
-DIST Cenon-3.9.4.tar.bz2 2001681 RMD160 87006f122625501f34939fba97c0f510d0d89b75 SHA1 0e24d1140b14dc5001c5dbcd3af523d6c915dace SHA256 4bb66273283f6e2aa32f1626448cda428e60514d1d7bf34c7b2d18c07fcf0ef3
 DIST Cenon-3.9.5.tar.bz2 2003607 RMD160 3ab6af7c49f00bc1fa8f63e5f987aa91b7798c29 SHA1 f3d9251290cc0ffa9e09e884a971f926a0eab9b5 SHA256 523049066f88e9e022127c017633b0431a29b9eda847e875c8c82d1f976f4977
+DIST Cenon-3.9.6.tar.bz2 2005991 RMD160 9a80e3ed91f861715e486199de6523fe6d0c3a29 SHA1 083f0f15beea03b534b814edc574e149dec3082f SHA256 373e6c3b7e23950aef865cc3719eece97e1bfbfcecae901cac2e5e6e6ff9175d
diff --git a/gnustep-apps/cenon/cenon-3.8.2.ebuild b/gnustep-apps/cenon/cenon-3.8.2.ebuild
deleted file mode 100644
index bf4b729d9861..000000000000
--- a/gnustep-apps/cenon/cenon-3.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.8.2.ebuild,v 1.1 2011/08/19 12:38:23 voyageur Exp $
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/c/C}
-
-DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
-HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.vhf-group.com/vhfInterservice/download/source/${PN/c/C}-3.82.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="Cenon"
-
-RDEPEND=">=gnustep-libs/cenonlibrary-3.8.2"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${PN}-3.82"-install.patch
-}
diff --git a/gnustep-apps/cenon/cenon-3.9.4.ebuild b/gnustep-apps/cenon/cenon-3.9.6.ebuild
similarity index 68%
rename from gnustep-apps/cenon/cenon-3.9.4.ebuild
rename to gnustep-apps/cenon/cenon-3.9.6.ebuild
index 83bae2cd55c1..336058f7346f 100644
--- a/gnustep-apps/cenon/cenon-3.9.4.ebuild
+++ b/gnustep-apps/cenon/cenon-3.9.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/gnustep-apps/cenon/cenon-3.9.4.ebuild,v 1.1 2011/08/19 12:38:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.6.ebuild,v 1.1 2012/07/03 18:37:08 voyageur Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -15,9 +15,10 @@ SLOT="0"
 LICENSE="Cenon"
 IUSE=""
 
+DEPEND=""
 RDEPEND=">=gnustep-libs/cenonlibrary-3.9.0"
 
 src_prepare() {
-	sed -e "s/App.m/App.m UpdateController.m/" -i GNUmakefile || die "UpdateController sed failed"
-	epatch "${FILESDIR}"/${P}-install.patch
+	epatch "${FILESDIR}"/${PN}-3.9.4-install.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
diff --git a/gnustep-apps/cenon/files/cenon-3.82-install.patch b/gnustep-apps/cenon/files/cenon-3.82-install.patch
deleted file mode 100644
index f47513573013..000000000000
--- a/gnustep-apps/cenon/files/cenon-3.82-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur Cenon.orig/GNUmakefile Cenon/GNUmakefile
---- Cenon.orig/GNUmakefile	2007-05-31 15:53:12.000000000 +0200
-+++ Cenon/GNUmakefile	2007-05-31 15:53:18.000000000 +0200
-@@ -23,7 +23,6 @@
- # eMail: info@vhf.de
- # http://www.vhf.de
- 
--GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
- #GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
- 
- include $(GNUSTEP_MAKEFILES)/common.make
-diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
---- Cenon.orig/GNUmakefile.postamble	2007-05-31 15:53:12.000000000 +0200
-+++ Cenon/GNUmakefile.postamble	2007-05-31 15:54:10.000000000 +0200
-@@ -18,13 +18,7 @@
- # before-install::
- 
- # Things to do after installing
--after-install::
--	# copy library
--	#rm -R $(GNUSTEP_INSTALLATION_DIR)/Library/$(APP_NAME)
--	cp -R Library/$(APP_NAME)/ $(GNUSTEP_INSTALLATION_DIR)/Library/
--	# set permissions (rrr)
--	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
--	#chmod -R ugo+rX $(GNUSTEP_INSTALLATION_DIR)/Library/$(APP_NAME)
-+#after-install::
- 
- # Things to do before uninstalling
- # before-uninstall::
diff --git a/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch b/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch
new file mode 100644
index 000000000000..662a8ea5ca70
--- /dev/null
+++ b/gnustep-apps/cenon/files/cenon-3.9.6-gcc47.patch
@@ -0,0 +1,11 @@
+--- cenon.app-3.93.orig/VHFShared/vhfCompatibility.h
++++ cenon.app-3.93/VHFShared/vhfCompatibility.h
+@@ -44,7 +44,7 @@
+ #if defined( GNUSTEP_BASE_VERSION )
+ 
+ #    define VHFIsDrawingToScreen()	[[NSGraphicsContext currentContext] isDrawingToScreen]
+-#    define VHFSelectorIsEqual(a, b)	sel_eq(a, b)
++#    define VHFSelectorIsEqual(a, b)	sel_isEqual(a, b)
+ #    define VHFAntialiasing()		[[NSGraphicsContext currentContext] shouldAntialias]
+ #    define VHFSetAntialiasing(f)	[[NSGraphicsContext currentContext] setShouldAntialias:f]
+ #    define PSWait()			[[NSGraphicsContext currentContext] flushGraphics]
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 59d3de0d264c..d44350f957dd 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,4 +1,2 @@
 DIST gnustep-make-2.4.0.tar.gz 521818 RMD160 6f1dd81039c9935e41eb7988923c3b3c6507e383 SHA1 afda14186394c65b0871dba93f92dc965b2fc724 SHA256 8ad6c9d0e532e0bf70fdc25abe60afbd4103b16dc47b324646a147cbac6c6ef9
-DIST gnustep-make-2.6.0.tar.gz 564848 RMD160 05421b3ac78467abe798937905eee81316d2b286 SHA1 e3cd5dd9d1f0314c66e6e45b5e5bf9b2513f9be4 SHA256 db8312a0fc637d5c66c11c33ec51b1ecc0c693091ec06ca39ebac43ca0f27828
-DIST gnustep-make-2.6.1.tar.gz 565262 RMD160 a72970e1bf0fa93622981e991717714795cdb7a5 SHA1 32144e6f9474dff0001372ade68674620f9ed20c SHA256 c48b0a4c85eee4799b12cceeb327c470b168100cbcda4f111b1edad71f8762eb
 DIST gnustep-make-2.6.2.tar.gz 562770 RMD160 683b6a034d4bb7e17b64209c7e7e289e9e94a042 SHA1 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff SHA256 7a95b3fc5bf14f6b06c4f1f716b48e9de13a11c1fa972aa3cc87736cd98f3e3a
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
deleted file mode 100644
index d8bf555d1151..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild,v 1.4 2011/06/07 13:48:56 voyageur Exp $
-
-EAPI="3"
-
-inherit gnustep-base eutils prefix
-
-DESCRIPTION="GNUstep Makefile Package"
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="native-exceptions"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/gcc-3.3[objc]
-	>=sys-devel/make-3.75
-	!gnustep-base/libobjc2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch
-	cp "${FILESDIR}"/gnustep-4.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-4.{csh,sh}
-}
-
-src_configure() {
-	econf \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		$(use_enable native-exceptions native-objc-exceptions) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "compilation failed"
-	# Prepare doc here (needed when no gnustep-make is already installed)
-	if use doc ; then
-		# If a gnustep-1 environment is set
-		unset GNUSTEP_MAKEFILES
-		pushd Documentation &> /dev/null
-		emake all install || die "doc make has failed"
-		popd &> /dev/null
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install || die "install has failed"
-
-	# Copy the documentation
-	if use doc ; then
-		dodir ${GNUSTEP_SYSTEM_LIBRARY}
-		cp -r Documentation/tmp-installation/System/Library/Documentation \
-			"${ED}"${GNUSTEP_SYSTEM_LIBRARY}
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-4.sh
-	doexe "${T}"/gnustep-4.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild
deleted file mode 100644
index 22219a45e4e8..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild,v 1.1 2011/06/09 09:47:21 voyageur Exp $
-
-EAPI="3"
-
-inherit gnustep-base eutils prefix
-
-DESCRIPTION="GNUstep Makefile Package"
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="native-exceptions"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/gcc-3.3[objc]
-	>=sys-devel/make-3.75
-	!gnustep-base/libobjc2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch
-	cp "${FILESDIR}"/gnustep-4.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-4.{csh,sh}
-}
-
-src_configure() {
-	econf \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		$(use_enable native-exceptions native-objc-exceptions) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "compilation failed"
-	# Prepare doc here (needed when no gnustep-make is already installed)
-	if use doc ; then
-		# If a gnustep-1 environment is set
-		unset GNUSTEP_MAKEFILES
-		pushd Documentation &> /dev/null
-		emake all install || die "doc make has failed"
-		popd &> /dev/null
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install || die "install has failed"
-
-	# Copy the documentation
-	if use doc ; then
-		dodir ${GNUSTEP_SYSTEM_DOC}
-		cp -r Documentation/tmp-installation/System/Library/Documentation/* \
-			"${ED}"${GNUSTEP_SYSTEM_DOC=}
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-4.sh
-	doexe "${T}"/gnustep-4.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
similarity index 87%
rename from gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild
rename to gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
index dbc2fe947d70..9f0f2177c05b 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild,v 1.1 2012/04/02 20:46:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild,v 1.1 2012/07/03 18:23:12 voyageur Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -18,7 +18,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 	>=sys-devel/make-3.75
 	libobjc2? ( gnustep-base/libobjc2
 		>=sys-devel/clang-2.9 )
-	!libobjc2? ( >=sys-devel/gcc-3.3[objc] )"
+	!libobjc2? ( >=sys-devel/gcc-3.3[objc]
+		!!gnustep-base/libobjc2 )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -26,10 +27,20 @@ pkg_setup() {
 	if use libobjc2; then
 		libobjc_version=libobjc.so.4
 	else
-		# Test new libobjc.so.3
-		$(tc-getCC) -Werror -Wl,-l:libobjc.so.3 "${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null \
-			&& libobjc_version=libobjc.so.3 \
-			|| libobjc_version=libobjc.so.2
+		# Find version in active gcc
+		for ver in {2..5};
+		do
+			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
+				"${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null;
+			then
+				libobjc_version=libobjc.so.${ver}
+			fi
+		done
+	fi
+
+	# Stop if we could not get libobjc.so
+	if [[ -z ${libobjc_version} ]]; then
+		die "Could not find Objective-C runtime"
 	fi
 
 	# For existing installations, determine if we will use another libobjc.so
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index 2ca94df3a2d6..cdf32211e75a 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.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/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.9 2012/06/16 09:31:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.10 2012/07/03 18:23:12 voyageur Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -16,7 +16,8 @@ IUSE="native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	>=sys-devel/make-3.75
-	>=sys-devel/gcc-3.3[objc]"
+	>=sys-devel/gcc-3.3[objc]
+	!!gnustep-base/libobjc2"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -24,10 +25,20 @@ pkg_setup() {
 	if use libobjc2; then
 		libobjc_version=libobjc.so.4
 	else
-		# Test new libobjc.so.3
-		$(tc-getCC) -Werror -Wl,-l:libobjc.so.3 "${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null \
-			&& libobjc_version=libobjc.so.3 \
-			|| libobjc_version=libobjc.so.2
+		# Find version in active gcc
+		for ver in {2..5};
+		do
+			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
+				"${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null;
+			then
+				libobjc_version=libobjc.so.${ver}
+			fi
+		done
+	fi
+
+	# Stop if we could not get libobjc.so
+	if [[ -z ${libobjc_version} ]]; then
+		die "Could not find Objective-C runtime"
 	fi
 
 	# For existing installations, determine if we will use another libobjc.so
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
index e18e5bcf5e0a..cb48505e6da5 100644
--- a/gnustep-base/gnustep-updater/Manifest
+++ b/gnustep-base/gnustep-updater/Manifest
@@ -1 +1,2 @@
 DIST gnustep-updater-0.2.tar.bz2 3523 RMD160 5fe0b5e77ddc00305cce8fe82bec5d27684673b9 SHA1 4e4c02378802741f68c2eb6032d20097b36b59bd SHA256 9bd5cb66ff8a4365e365d630691a79349b642e3af720fdaeef5ed25589ca7953
+DIST gnustep-updater-0.3.tar.bz2 3685 RMD160 de038b31a62cb62efec7512b4effb632069f3d93 SHA1 e0ebfe65c642f320f77cbb2bccab089cc2c00c53 SHA256 001fcd21cf76f511af3cc734400dee009cfc61a9cc95e233ed9cdc6a42a4041a
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
new file mode 100644
index 000000000000..62eaf5945562
--- /dev/null
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild,v 1.1 2012/07/03 18:18:34 voyageur Exp $
+
+EAPI=4
+
+DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-shells/bash"
+RDEPEND="${DEPEND}
+	app-misc/pax-utils
+	>=gnustep-base/gnustep-make-2.6.0"
+
+src_install() {
+	dosbin gnustep-updater
+	doman gnustep-updater.1
+}
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild
index 834c0a6f6df3..2310dc9c9da5 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild,v 1.6 2012/06/08 11:44:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r5.ebuild,v 1.7 2012/07/03 20:00:02 jer Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
diff --git a/mail-client/sylpheed/sylpheed-3.1.4.ebuild b/mail-client/sylpheed/sylpheed-3.1.4.ebuild
index e56bc7ec1f40..4bb5043c03ca 100644
--- a/mail-client/sylpheed/sylpheed-3.1.4.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.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/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.6 2012/07/03 16:09:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.4.ebuild,v 1.7 2012/07/03 20:03:12 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
 
 CDEPEND="x11-libs/gtk+:2
diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild
index f1ca924d6fd1..aca875f35ae9 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild,v 1.4 2012/06/08 11:40:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.7.1.ebuild,v 1.5 2012/07/03 19:53:51 jer Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 2b1c47be2dcc..610c034f9806 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -3,3 +3,4 @@ DIST ASSP_1.9.1.3-Install.zip 763977 RMD160 bf970857e001178f4540d94bf8b15d702bfe
 DIST ASSP_1.9.2.0-Install.zip 839038 RMD160 a6bea0de136b970c30f219ff4fb808023319110e SHA1 9dbc77a6164eb43531c173d86124579165a8d6f6 SHA256 65bdad2405011430fe373a8cefcb006d77f1c5d4842fbefd7b81aeb11cd4254e
 DIST ASSP_1.9.3.5-Install.zip 862341 RMD160 429a1aa539936ccff6f0a1989d66253a1ce46f18 SHA1 183d19f61b16b3a3fffd1690af287910e452c2ca SHA256 28ba8f1d665db883a8364f269251453659617876bc6d889b8c58d7b233f44735
 DIST ASSP_1.9.3.6-Install.zip 862688 RMD160 69b89dc3fff58d1a2abe6692f7de58f45809f8c7 SHA1 8bf66e6446da7dc3abcd95bfcd55dbf5bcadbf57 SHA256 ace76aa09a005e863a6b5313dce176501b5929c3103e09b2eafe0131092f9a70
+DIST ASSP_1.9.3.7-Install.zip 863327 RMD160 06702e49fcff6b29a7f90885159711e6239b97ef SHA1 79f0fa2c8e47b74125f4b000877b017b5fa940ee SHA256 28ef08ce26f745ca2ae4d58e06b022a33f8f4cf18eaa2981ea95f5f577975f0d
diff --git a/mail-filter/assp/assp-1.9.3.7.ebuild b/mail-filter/assp/assp-1.9.3.7.ebuild
new file mode 100644
index 000000000000..47d1251f114d
--- /dev/null
+++ b/mail-filter/assp/assp-1.9.3.7.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.3.7.ebuild,v 1.1 2012/07/04 02:35:19 patrick Exp $
+
+inherit eutils user
+
+DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
+HOMEPAGE="http://assp.sourceforge.net/"
+MY_PN=ASSP_${PV}-Install
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+
+# this is a pre-release, so no keywords for now
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ipv6 ldap sasl spf srs ssl syslog"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Net-DNS
+	dev-perl/File-ReadBackwards
+	virtual/perl-IO-Compress
+	dev-perl/Email-MIME
+	dev-perl/Email-Send
+	dev-perl/Email-Valid
+	dev-perl/libwww-perl
+	dev-perl/mime-construct
+	dev-perl/Net-CIDR-Lite
+	virtual/perl-Digest-MD5
+	virtual/perl-Time-HiRes
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	sasl? ( dev-perl/Authen-SASL )
+	spf? ( dev-perl/Mail-SPF )
+	srs? ( dev-perl/Mail-SRS )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	syslog? ( perl-core/Sys-Syslog )
+	ldap? ( dev-perl/perl-ldap )"
+
+S=${WORKDIR}/${MY_PN}/ASSP
+
+pkg_setup() {
+	enewgroup assp
+	enewuser assp -1 -1 /dev/null assp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local FILES="
+		assp.pl
+		rebuildspamdb.pl
+		stat.pl
+	"
+	# just being safe
+	for file in ${FILES}; do
+		edos2unix ${file}
+	done
+
+	# portable changes via sed vs patch
+	sed -i -e 's|file:files/|file:/etc/assp/|' \
+		-e 's|$base/images|/usr/share/assp/images|' \
+		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
+		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
+		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
+		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
+		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
+		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
+		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
+		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
+		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
+		-e 's|mkdir "$base/$logdir",0700;||' \
+		-e 's|$base/$logfile|$logfile|' \
+		-e 's|$base/$logdir|$logdir|' \
+		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
+		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
+		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
+		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
+		-e 's|$base/$archivelogfile|$archivelogfile|' \
+		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
+		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
+		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
+		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
+		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
+		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
+		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
+		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
+		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
+		-e 's|$base/$bf|/etc/assp/$bf|g' \
+		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
+		assp.pl || die
+
+	# sed rebuildspamdb.pl
+	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
+		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
+		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
+		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
+		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
+		-e 's|$base/$DropList|$DropList|' \
+		-e 's|&fixPath($base) . "/|"|' \
+		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
+		-e 's|"$base//|"/|g' \
+		rebuildspamdb.pl || die
+
+	# remove windows stuff
+	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
+	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
+}
+
+src_install() {
+	# Configuration directory
+	dodir /etc/assp/notes
+
+	insinto /etc/assp
+	# Installs files that are used by assp for black/gray lists,
+	# and domain country lookup. To be changed by admin as needed.
+	doins files/*.txt || die
+
+	fowners assp:assp /etc/assp -R
+	fperms 770 /etc/assp /etc/assp/notes
+
+	# Setup directories for mail to be stored for filter
+	keepdir /var/lib/assp/spam /var/lib/assp/notspam
+	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
+
+	# Logs directory
+	keepdir /var/log/assp
+	fowners assp:assp -R /var/log/assp
+	fperms 770 /var/log/assp
+
+	# Install the app
+	exeinto /usr/share/assp
+	doexe *.pl *.sh || die
+	insinto /usr/share/assp
+	doins -r images/ || die
+
+	# Lock down the files/data
+	fowners assp:assp -R /usr/share/assp
+	fperms 770 /usr/share/assp
+
+	# Data storage
+	fowners assp:assp -R /var/lib/assp
+	fperms 770 /var/lib/assp
+
+	# PID directory
+	dodir /var/run/assp
+	keepdir /var/run/assp
+	fowners assp:assp -R /var/run/assp
+	fperms 770 /var/run/assp
+
+	# Install the init.d script to listen
+	newinitd "${FILESDIR}/asspd.init" asspd
+
+	dohtml docs/*.htm || die "Failed to install html docs"
+}
+
+pkg_postinst() {
+	elog
+	elog "To configure ASSP, start /etc/init.d/asspd then point"
+	elog "your browser to http://localhost:55555"
+	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
+	elog
+	elog "File permissions have been set to use assp:assp"
+	elog "with mode 770 on directories.  When you configure"
+	elog "ASSP, make sure and use the user assp."
+	elog
+	elog "Don't change any path related options."
+	elog
+	elog "See the on-line docs for a complete tutorial."
+	elog "http://assp.sourceforge.net/docs.html"
+	elog
+	elog "If upgrading, please update your old config to set both"
+	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
+	elog "also many new options that you should review."
+	elog
+}
diff --git a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
index 09782b290042..4b3ff1fca5ba 100644
--- a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.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/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.10 2012/06/29 14:40:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.11 2012/07/03 16:46:44 ranger Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.inkscape.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="dia gnome postscript inkjar lcms nls spell wmf"
 
 RESTRICT="test"
diff --git a/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
index a7e53d6dceec..2333d7c211bf 100644
--- a/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild,v 1.6 2012/06/22 16:12:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild,v 1.7 2012/07/03 16:44:44 ranger Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild
index 3cd35e8e59ed..094da2849c9f 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild,v 1.7 2012/06/07 21:41:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.12.ebuild,v 1.8 2012/07/03 20:32:58 jer Exp $
 
 EAPI=4
 inherit autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
index 801a1c9c7edd..b6d59bd11a5d 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-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/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.7 2012/06/29 12:46:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.8 2012/07/03 20:18:46 jer Exp $
 
 EAPI=4
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild b/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild
index 208a67f86deb..a811628a6fd9 100644
--- a/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild
+++ b/media-plugins/vdr-autosort/vdr-autosort-0.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/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild,v 1.1 2012/06/30 17:38:49 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-autosort/vdr-autosort-0.1.3.ebuild,v 1.2 2012/07/03 18:33:27 hd_brummy Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 src_install() {
 	vdr-plugin-2_src_install
 	insinto /etc/vdr/plugins
-	doins autosort.conf
+	doins examples/autosort.conf
 }
 
 pkg_preinst() {
diff --git a/media-sound/mpg123/mpg123-1.14.2.ebuild b/media-sound/mpg123/mpg123-1.14.2.ebuild
index a65cce3c9022..11acdfd201ef 100644
--- a/media-sound/mpg123/mpg123-1.14.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.14.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/media-sound/mpg123/mpg123-1.14.2.ebuild,v 1.6 2012/07/03 16:27:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.14.2.ebuild,v 1.7 2012/07/03 19:40:00 jer Exp $
 
 EAPI=4
 inherit toolchain-funcs libtool
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="3dnow 3dnowext alsa altivec coreaudio ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-video/ushare/ushare-1.1a-r3.ebuild b/media-video/ushare/ushare-1.1a-r3.ebuild
index cf6c0fbd1b32..3afe618261d6 100644
--- a/media-video/ushare/ushare-1.1a-r3.ebuild
+++ b/media-video/ushare/ushare-1.1a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r3.ebuild,v 1.3 2012/06/28 10:38:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r3.ebuild,v 1.4 2012/07/04 03:17:03 jdhore Exp $
 
 EAPI=4
 inherit eutils multilib user
@@ -11,7 +11,7 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dlna nls"
 
 RDEPEND=">=net-libs/libupnp-1.6.14
diff --git a/metadata/cache/app-admin/eselect-pinentry-0.3 b/metadata/cache/app-admin/eselect-pinentry-0.3
index 464fe43e608b..013b0529267b 100644
--- a/metadata/cache/app-admin/eselect-pinentry-0.3
+++ b/metadata/cache/app-admin/eselect-pinentry-0.3
@@ -6,7 +6,7 @@ app-admin/eselect !<app-crypt/pinentry-0.8.0-r1
 http://www.gentoo.org/
 GPL-2
 Manage /usr/bin/pinentry symlink
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-arch/alien-8.86 b/metadata/cache/app-arch/alien-8.86
index 25e1c3a2bb64..81270a0b2c92 100644
--- a/metadata/cache/app-arch/alien-8.86
+++ b/metadata/cache/app-arch/alien-8.86
@@ -6,7 +6,7 @@ mirror://debian/pool/main/a/alien/alien_8.86.tar.gz
 http://kitenet.net/programs/alien
 LGPL-2.1
 Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats
-~alpha amd64 ~hppa ~ppc x86
+~alpha amd64 hppa ppc x86
 base eutils multilib multiprocessing perl-app perl-module toolchain-funcs user
 +bzip2
 
diff --git a/metadata/cache/app-arch/innoextract-1.3 b/metadata/cache/app-arch/innoextract-1.3
new file mode 100644
index 000000000000..90a957c38d69
--- /dev/null
+++ b/metadata/cache/app-arch/innoextract-1.3
@@ -0,0 +1,22 @@
+>=dev-libs/boost-1.37 lzma? ( app-arch/xz-utils ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=dev-libs/boost-1.37 lzma? ( app-arch/xz-utils )
+0
+mirror://github/dscharrer/InnoExtract/innoextract-1.3.tar.gz mirror://sourceforge/innoextract/innoextract-1.3.tar.gz
+
+http://innoextract.constexpr.org/
+ZLIB
+A tool to unpack installers created by Inno Setup
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+debug doc +lzma
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-cdr/xfburn-0.4.3_p20120601 b/metadata/cache/app-cdr/xfburn-0.4.3_p20120601
index 19844b078b3f..9e9a2577aaea 100644
--- a/metadata/cache/app-cdr/xfburn-0.4.3_p20120601
+++ b/metadata/cache/app-cdr/xfburn-0.4.3_p20120601
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~ssuominen/xfburn-0.4.3_p20120601.tar.xz
 http://goodies.xfce.org/projects/applications/xfburn
 GPL-2
 GTK+ based CD and DVD burning application
-amd64 ~ppc x86
+amd64 ppc x86
 autotools base eutils fdo-mime gnome2-utils libtool multilib multiprocessing toolchain-funcs user xfconf
 debug gstreamer udev
 
diff --git a/metadata/cache/app-crypt/hashcat-gui-0.5.1 b/metadata/cache/app-crypt/hashcat-gui-0.5.1
index cb1e72799b2f..16031cd0af24 100644
--- a/metadata/cache/app-crypt/hashcat-gui-0.5.1
+++ b/metadata/cache/app-crypt/hashcat-gui-0.5.1
@@ -1,7 +1,7 @@
 app-crypt/hashcat-bin app-crypt/oclhashcat-plus-bin app-crypt/oclhashcat-lite-bin x11-libs/qt-gui x11-libs/qt-core
 app-crypt/hashcat-bin app-crypt/oclhashcat-plus-bin app-crypt/oclhashcat-lite-bin x11-libs/qt-gui x11-libs/qt-core
 0
-https://github.com/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> hashcat-gui-0.5.1.zip
+mirror://github/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> hashcat-gui-0.5.1.zip
 
 https://github.com/scandium/hashcat-gui
 GPL-3
diff --git a/metadata/cache/app-crypt/pinentry-0.8.1 b/metadata/cache/app-crypt/pinentry-0.8.1
index da73822e613e..a9c27f40d04a 100644
--- a/metadata/cache/app-crypt/pinentry-0.8.1
+++ b/metadata/cache/app-crypt/pinentry-0.8.1
@@ -6,7 +6,7 @@ mirror://gnupg/pinentry/pinentry-0.8.1.tar.gz
 http://gnupg.org/aegypten2/index.html
 GPL-2
 Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils flag-o-matic multilib toolchain-funcs user
 gtk ncurses qt4 caps static
 
diff --git a/metadata/cache/app-editors/emacs-23.4-r3 b/metadata/cache/app-editors/emacs-23.4-r3
index bd0f78a438a5..f6366855ca23 100644
--- a/metadata/cache/app-editors/emacs-23.4-r3
+++ b/metadata/cache/app-editors/emacs-23.4-r3
@@ -6,7 +6,7 @@ mirror://gnu/emacs/emacs-23.4.tar.bz2 mirror://gentoo/emacs-23.4-patches-4.tar.b
 http://www.gnu.org/software/emacs/
 GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
 The extensible, customizable, self-documenting real-time display editor
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools elisp-common eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
 alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
 aqua? ( !X )
diff --git a/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r3 b/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r3
index f43d4fd2763f..665a269b8a65 100644
--- a/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r3
+++ b/metadata/cache/app-emacs/emacs-common-gentoo-1.3-r3
@@ -6,7 +6,7 @@ mirror://gentoo/emacs-common-gentoo-1.3.tar.gz
 http://www.gentoo.org/proj/en/lisp/emacs/
 GPL-3
 Common files needed by all GNU Emacs versions
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 elisp-common eutils fdo-mime gnome2-utils multilib toolchain-funcs user
 games X
 
diff --git a/metadata/cache/app-forensics/sleuthkit-3.2.1 b/metadata/cache/app-forensics/sleuthkit-3.2.1
deleted file mode 100644
index d6d2d209b085..000000000000
--- a/metadata/cache/app-forensics/sleuthkit-3.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib )
-ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) dev-perl/DateManip
-0
-mirror://sourceforge/sleuthkit/sleuthkit-3.2.1.tar.gz
-
-http://www.sleuthkit.org/sleuthkit/
-GPL-2 IBM
-A collection of file system and media management forensic analysis tools
-amd64 hppa ppc x86
-
-aff ewf
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/app-forensics/sleuthkit-3.2.3 b/metadata/cache/app-forensics/sleuthkit-3.2.3
index 1d676c8fcbea..c46b085555c9 100644
--- a/metadata/cache/app-forensics/sleuthkit-3.2.3
+++ b/metadata/cache/app-forensics/sleuthkit-3.2.3
@@ -6,7 +6,7 @@ mirror://sourceforge/sleuthkit/sleuthkit-3.2.3.tar.gz
 http://www.sleuthkit.org/sleuthkit/
 GPL-2 IBM
 A collection of file system and media management forensic analysis tools
-amd64 ~hppa ppc x86
+amd64 hppa ppc x86
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 aff ewf static-libs
 
diff --git a/metadata/cache/app-i18n/scim-1.4.11-r1 b/metadata/cache/app-i18n/scim-1.4.11-r1
index e8b28a2ad024..6bea9d9f2b88 100644
--- a/metadata/cache/app-i18n/scim-1.4.11-r1
+++ b/metadata/cache/app-i18n/scim-1.4.11-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/scim/scim-1.4.11.tar.gz
 http://www.scim-im.org/
 GPL-2
 Smart Common Input Method (SCIM) is an Input Method (IM) development platform
-~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd
 eutils flag-o-matic gnome2-utils multilib toolchain-funcs user
 doc
 
diff --git a/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.77.1 b/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.77.1-r1
similarity index 100%
rename from metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.77.1
rename to metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.77.1-r1
diff --git a/metadata/cache/app-text/docbook-xsl-stylesheets-1.77.1 b/metadata/cache/app-text/docbook-xsl-stylesheets-1.77.1-r1
similarity index 100%
rename from metadata/cache/app-text/docbook-xsl-stylesheets-1.77.1
rename to metadata/cache/app-text/docbook-xsl-stylesheets-1.77.1-r1
diff --git a/metadata/cache/app-text/dos2unix-6.0 b/metadata/cache/app-text/dos2unix-6.0
index ed1ec7b48e9e..a3f1643917c0 100644
--- a/metadata/cache/app-text/dos2unix-6.0
+++ b/metadata/cache/app-text/dos2unix-6.0
@@ -6,7 +6,7 @@ http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-6.0.tar.gz mirror://sourceforge
 http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/
 BSD-2
 Convert DOS or MAC text files to UNIX format or vice versa
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 eutils multilib toolchain-funcs user
 debug nls
 
diff --git a/metadata/cache/app-text/noweb-2.11b-r3 b/metadata/cache/app-text/noweb-2.11b-r3
index 6b6acf32f5f3..0a53c2d1f2e4 100644
--- a/metadata/cache/app-text/noweb-2.11b-r3
+++ b/metadata/cache/app-text/noweb-2.11b-r3
@@ -6,7 +6,7 @@ http://www.eecs.harvard.edu/~nr/noweb/dist/noweb-2.11b.tgz
 http://www.eecs.harvard.edu/~nr/noweb/
 noweb emacs? ( GPL-2 )
 a literate programming tool, lighter than web
-~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 elisp-common eutils multilib toolchain-funcs user
 emacs examples
 
diff --git a/metadata/cache/app-text/xmlstarlet-1.3.1 b/metadata/cache/app-text/xmlstarlet-1.3.1
index b53a02d6933f..4312433ac71b 100644
--- a/metadata/cache/app-text/xmlstarlet-1.3.1
+++ b/metadata/cache/app-text/xmlstarlet-1.3.1
@@ -6,7 +6,7 @@ mirror://sourceforge/xmlstar/xmlstarlet-1.3.1.tar.gz
 http://xmlstar.sourceforge.net/
 MIT
 A set of tools to transform, query, validate, and edit XML documents
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 
 
 
diff --git a/metadata/cache/dev-db/SchemaSync-0.9.2 b/metadata/cache/dev-db/SchemaSync-0.9.2
index c472e4683d4c..bb8680aedb13 100644
--- a/metadata/cache/dev-db/SchemaSync-0.9.2
+++ b/metadata/cache/dev-db/SchemaSync-0.9.2
@@ -1,5 +1,5 @@
-dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
-dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://www.schemasync.org/downloads/SchemaSync-0.9.2.tar.gz
 
diff --git a/metadata/cache/dev-db/postgis-2.0.0 b/metadata/cache/dev-db/postgis-2.0.0
index 031f72a44c6f..8e9794ef7d01 100644
--- a/metadata/cache/dev-db/postgis-2.0.0
+++ b/metadata/cache/dev-db/postgis-2.0.0
@@ -6,7 +6,7 @@ test
 http://postgis.refractions.net
 GPL-2
 Geographic Objects for PostgreSQL
-amd64 ~ppc ~x86
+amd64 ppc ~x86
 eutils multilib toolchain-funcs user versionator
 doc gtk
 
diff --git a/metadata/cache/dev-lang/php-5.3.14 b/metadata/cache/dev-lang/php-5.3.14
index e9594f4faa5b..f671ebb62a12 100644
--- a/metadata/cache/dev-lang/php-5.3.14
+++ b/metadata/cache/dev-lang/php-5.3.14
@@ -6,7 +6,7 @@ mirror
 http://php.net/
 PHP-3
 The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
+alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
 apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
 kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
 truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-libs/Ice-3.4.2 b/metadata/cache/dev-libs/Ice-3.4.2
index 3c2f1d09600f..d01c5674335c 100644
--- a/metadata/cache/dev-libs/Ice-3.4.2
+++ b/metadata/cache/dev-libs/Ice-3.4.2
@@ -6,7 +6,7 @@ http://www.zeroc.com/download/Ice/3.4/Ice-3.4.2.tar.gz doc? ( http://www.zeroc.c
 http://www.zeroc.com/
 GPL-2
 ICE middleware C++ library and generator tools
-~amd64 ~arm ~ia64 ~x86
+~amd64 ~arm ~ia64 x86
 db-use eutils java-utils-2 mono multilib python ruby-ng toolchain-funcs user versionator
 doc examples +ncurses mono python ruby test debug elibc_FreeBSD ruby_targets_ruby18
 
diff --git a/metadata/cache/dev-libs/eb-4.4.1 b/metadata/cache/dev-libs/eb-4.4.1
index 1a69386638ac..4c950dede700 100644
--- a/metadata/cache/dev-libs/eb-4.4.1
+++ b/metadata/cache/dev-libs/eb-4.4.1
@@ -6,7 +6,7 @@ ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
 http://www.sra.co.jp/people/m-kasahr/eb/
 BSD
 EB is a C library and utilities for accessing CD-ROM books
-~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
 
 nls ipv6 threads
 
diff --git a/metadata/cache/dev-libs/libatasmart-0.19 b/metadata/cache/dev-libs/libatasmart-0.19
index 464b8265f46e..a13b764d88d4 100644
--- a/metadata/cache/dev-libs/libatasmart-0.19
+++ b/metadata/cache/dev-libs/libatasmart-0.19
@@ -6,7 +6,7 @@ http://0pointer.de/public/libatasmart-0.19.tar.xz
 http://0pointer.de/blog/projects/being-smart.html
 LGPL-2.1
 A small and lightweight parser library for ATA S.M.A.R.T. hard disks
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
 
 static-libs
 
diff --git a/metadata/cache/dev-libs/libelf-0.8.13-r1 b/metadata/cache/dev-libs/libelf-0.8.13-r1
index 216b6c3728c6..5fce25a25488 100644
--- a/metadata/cache/dev-libs/libelf-0.8.13-r1
+++ b/metadata/cache/dev-libs/libelf-0.8.13-r1
@@ -6,7 +6,7 @@ http://www.mr511.de/software/libelf-0.8.13.tar.gz
 http://www.mr511.de/software/
 LGPL-2
 A ELF object file access library
-alpha amd64 hppa ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 hppa ~mips ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 debug nls elibc_FreeBSD
 
diff --git a/metadata/cache/dev-libs/uriparser-0.7.7 b/metadata/cache/dev-libs/uriparser-0.7.7
index edc0d1cdeb70..77c2a43e3257 100644
--- a/metadata/cache/dev-libs/uriparser-0.7.7
+++ b/metadata/cache/dev-libs/uriparser-0.7.7
@@ -6,7 +6,7 @@ mirror://sourceforge/uriparser/uriparser-0.7.7.tar.bz2
 http://uriparser.sourceforge.net/
 BSD
 Uriparser is a strictly RFC 3986 compliant URI parsing library in C
-amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils multilib toolchain-funcs user
 doc qt4 test unicode
 test? ( unicode )
diff --git a/metadata/cache/dev-ml/core_extended-108.00.01 b/metadata/cache/dev-ml/core_extended-108.00.01
index 0503821af1fc..d5ed1468e159 100644
--- a/metadata/cache/dev-ml/core_extended-108.00.01
+++ b/metadata/cache/dev-ml/core_extended-108.00.01
@@ -8,7 +8,7 @@ LGPL-2.1-linking-exception
 Jane Street's alternative to the standard library
 ~amd64
 base eutils findlib multilib oasis toolchain-funcs user
-+ocamlopt debug doc
+test +ocamlopt debug doc
 
 
 
diff --git a/metadata/cache/dev-perl/Cache-Memcached-1.290.0 b/metadata/cache/dev-perl/Cache-Memcached-1.290.0
index 424593101cf6..5bcff3eb5cdb 100644
--- a/metadata/cache/dev-perl/Cache-Memcached-1.290.0
+++ b/metadata/cache/dev-perl/Cache-Memcached-1.290.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.29.tar.gz
 http://www.danga.com/memcached/ http://search.cpan.org/dist/Cache-Memcached/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl API for memcached
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/DateTime-0.760.0 b/metadata/cache/dev-perl/DateTime-0.760.0
new file mode 100644
index 000000000000..7ce135423f35
--- /dev/null
+++ b/metadata/cache/dev-perl/DateTime-0.760.0
@@ -0,0 +1,22 @@
+>=dev-perl/Params-Validate-0.76 >=dev-perl/DateTime-TimeZone-1.09 >=dev-perl/DateTime-Locale-0.44 dev-perl/Math-Round virtual/perl-Module-Build test? ( dev-perl/Test-Fatal ) dev-lang/perl[-build]
+>=dev-perl/Params-Validate-0.76 >=dev-perl/DateTime-TimeZone-1.09 >=dev-perl/DateTime-Locale-0.44 dev-perl/Math-Round dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-0.76.tar.gz
+
+http://search.cpan.org/dist/DateTime/
+Artistic-2
+A date and time object
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/DateTime-Format-Strptime-1.520.0 b/metadata/cache/dev-perl/DateTime-Format-Strptime-1.520.0
new file mode 100644
index 000000000000..3b210363e1cc
--- /dev/null
+++ b/metadata/cache/dev-perl/DateTime-Format-Strptime-1.520.0
@@ -0,0 +1,22 @@
+>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 >=virtual/perl-ExtUtils-MakeMaker-6.31 dev-lang/perl[-build]
+>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.52.tar.gz
+
+http://search.cpan.org/dist/DateTime-Format-Strptime/
+Artistic-2
+Parse and Format DateTimes using Strptime
+~amd64 ~x86 ~x64-macos ~x86-solaris
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/HTTP-Daemon-6.10.0 b/metadata/cache/dev-perl/HTTP-Daemon-6.10.0
index 28214906ea5b..a957fba5af68 100644
--- a/metadata/cache/dev-perl/HTTP-Daemon-6.10.0
+++ b/metadata/cache/dev-perl/HTTP-Daemon-6.10.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz
 http://search.cpan.org/dist/HTTP-Daemon/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Base class for simple HTTP servers
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/HTTP-Message-6.30.0 b/metadata/cache/dev-perl/HTTP-Message-6.30.0
index eb23bebec4ec..965e8921a63a 100644
--- a/metadata/cache/dev-perl/HTTP-Message-6.30.0
+++ b/metadata/cache/dev-perl/HTTP-Message-6.30.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/G/GA/GAAS/HTTP-Message-6.03.tar.gz
 http://search.cpan.org/dist/HTTP-Message/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Base class for Request/Response
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/LWP-MediaTypes-6.20.0 b/metadata/cache/dev-perl/LWP-MediaTypes-6.20.0
index afac05cedf50..70f04a866ffc 100644
--- a/metadata/cache/dev-perl/LWP-MediaTypes-6.20.0
+++ b/metadata/cache/dev-perl/LWP-MediaTypes-6.20.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz
 http://search.cpan.org/dist/LWP-MediaTypes/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Media types and mailcap processing
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Moose-2.60.300 b/metadata/cache/dev-perl/Moose-2.60.300
new file mode 100644
index 000000000000..fb73521d6383
--- /dev/null
+++ b/metadata/cache/dev-perl/Moose-2.60.300
@@ -0,0 +1,22 @@
+!<=dev-perl/Catalyst-5.800.280 !<=dev-perl/Devel-REPL-1.003008 !<=dev-perl/Fey-0.360 !<=dev-perl/Fey-ORM-0.420 !<=dev-perl/File-ChangeNotify-0.150 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160 !<=dev-perl/Mason-2.180.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100 !<=dev-perl/MooseX-AttributeHelpers-0.22 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.250.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.12 !<=dev-perl/MooseX-FollowPBP-0.20 !<=dev-perl/MooseX-HasDefaults-0.20 !<=dev-perl/MooseX-InstanceTracking-0.40 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-NonMoose-0.170.0 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60 !<=dev-perl/MooseX-Role-Parameterized-0.230.0 !<=dev-perl/MooseX-Role-WithOverloading-0.070 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.472 !<=dev-perl/MooseX-Singleton-0.250 !<=dev-perl/MooseX-StrictConstructor-0.120 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Signal-1.101930 !<=dev-perl/MooseX-Types-0.190 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/namespace-autoclean-0.08 !dev-perl/Class-MOP >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Dist-CheckConflicts-0.20 >=dev-perl/Data-OptList-0.107.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/List-MoreUtils-0.280.0 >=dev-perl/MRO-Compat-0.05 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1 >=virtual/perl-Scalar-List-Utils-1.19 >=dev-perl/Sub-Exporter-0.980 >=dev-perl/Sub-Name-0.05 >=dev-perl/Try-Tiny-0.20 >=virtual/perl-ExtUtils-MakeMaker-6.56 test? ( dev-perl/PadWalker dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.88 dev-perl/Test-Requires >=dev-perl/Test-Output-0.09 >=dev-perl/Test-Warn-0.11 dev-perl/Test-Deep dev-perl/Module-Refresh ) dev-lang/perl[-build]
+!<=dev-perl/Catalyst-5.800.280 !<=dev-perl/Devel-REPL-1.003008 !<=dev-perl/Fey-0.360 !<=dev-perl/Fey-ORM-0.420 !<=dev-perl/File-ChangeNotify-0.150 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160 !<=dev-perl/Mason-2.180.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100 !<=dev-perl/MooseX-AttributeHelpers-0.22 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.250.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.12 !<=dev-perl/MooseX-FollowPBP-0.20 !<=dev-perl/MooseX-HasDefaults-0.20 !<=dev-perl/MooseX-InstanceTracking-0.40 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-NonMoose-0.170.0 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60 !<=dev-perl/MooseX-Role-Parameterized-0.230.0 !<=dev-perl/MooseX-Role-WithOverloading-0.070 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.472 !<=dev-perl/MooseX-Singleton-0.250 !<=dev-perl/MooseX-StrictConstructor-0.120 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Signal-1.101930 !<=dev-perl/MooseX-Types-0.190 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/namespace-autoclean-0.08 !dev-perl/Class-MOP >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Dist-CheckConflicts-0.20 >=dev-perl/Data-OptList-0.107.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/List-MoreUtils-0.280.0 >=dev-perl/MRO-Compat-0.05 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1 >=virtual/perl-Scalar-List-Utils-1.19 >=dev-perl/Sub-Exporter-0.980 >=dev-perl/Sub-Name-0.05 >=dev-perl/Try-Tiny-0.20 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DO/DOY/Moose-2.0603.tar.gz
+
+http://search.cpan.org/dist/Moose/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+A postmodern object system for Perl 5
+~amd64 ~x86 ~x64-macos
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Mouse-0.990.0 b/metadata/cache/dev-perl/Mouse-0.990.0
new file mode 100644
index 000000000000..ab37f04d65d0
--- /dev/null
+++ b/metadata/cache/dev-perl/Mouse-0.990.0
@@ -0,0 +1,22 @@
+>=virtual/perl-ExtUtils-ParseXS-2.21 test? ( dev-perl/Sub-Uplevel >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
+virtual/perl-XSLoader dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.99.tar.gz mirror://gentoo/Mouse-0.64-ppport.h.bz2
+
+http://search.cpan.org/dist/Mouse/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Moose minus the antlers
+~amd64 ~hppa ~ppc ~x86 ~ppc-macos
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0 b/metadata/cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0
new file mode 100644
index 000000000000..73af51e2c703
--- /dev/null
+++ b/metadata/cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0
@@ -0,0 +1,22 @@
+virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl[-build]
+virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.20.tar.gz
+
+http://search.cpan.org/dist/Net-SMTP-TLS-ButMaintained/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+An SMTP client supporting TLS and AUTH
+~amd64 ~x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/SQL-Translator-0.110.120 b/metadata/cache/dev-perl/SQL-Translator-0.110.120
new file mode 100644
index 000000000000..ae67c0243346
--- /dev/null
+++ b/metadata/cache/dev-perl/SQL-Translator-0.110.120
@@ -0,0 +1,22 @@
+>=dev-perl/yaml-0.68 >=dev-perl/IO-stringy-2.110 dev-perl/Class-Base >=dev-perl/Digest-SHA1-2.12 dev-perl/Class-Accessor >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/File-ShareDir-1.00 dev-perl/Class-MakeMethods >=dev-perl/XML-Writer-0.606 dev-perl/Carp-Clan dev-perl/Class-Data-Inheritable dev-perl/DBI dev-perl/Moo test? ( dev-perl/HTML-Parser >=dev-perl/XML-LibXML-1.69 dev-perl/Spreadsheet-ParseExcel >=dev-perl/Template-Toolkit-2.2 dev-perl/Test-Exception dev-perl/Test-Differences dev-perl/Test-Pod ) dev-lang/perl[-build]
+>=dev-perl/yaml-0.68 >=dev-perl/IO-stringy-2.110 dev-perl/Class-Base >=dev-perl/Digest-SHA1-2.12 dev-perl/Class-Accessor >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/File-ShareDir-1.00 dev-perl/Class-MakeMethods >=dev-perl/XML-Writer-0.606 dev-perl/Carp-Clan dev-perl/Class-Data-Inheritable dev-perl/DBI dev-perl/Moo dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/F/FR/FREW/SQL-Translator-0.11012.tar.gz
+
+http://search.cpan.org/dist/SQL-Translator/
+GPL-2
+Convert RDBMS SQL CREATE syntax
+~amd64 ~x86 ~x86-solaris
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Sys-Virt-0.9.13 b/metadata/cache/dev-perl/Sys-Virt-0.9.13
new file mode 100644
index 000000000000..170b22275306
--- /dev/null
+++ b/metadata/cache/dev-perl/Sys-Virt-0.9.13
@@ -0,0 +1,22 @@
+>=app-emulation/libvirt-0.9.13 virtual/pkgconfig test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/XML-XPath virtual/perl-Time-HiRes ) dev-lang/perl[-build]
+>=app-emulation/libvirt-0.9.13 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-0.9.13.tar.gz
+
+http://search.cpan.org/dist/Sys-Virt/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Sys::Virt provides an API for using the libvirt library from Perl
+~amd64 ~x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Term-ANSIScreen-1.500.0 b/metadata/cache/dev-perl/Term-ANSIScreen-1.500.0
index f7df8e9760a9..72737dfc16f5 100644
--- a/metadata/cache/dev-perl/Term-ANSIScreen-1.500.0
+++ b/metadata/cache/dev-perl/Term-ANSIScreen-1.500.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AU/AUDREYT/Term-ANSIScreen-1.50.tar.gz
 http://search.cpan.org/dist/Term-ANSIScreen/
 CC0-1.0-Universal
 Terminal control using ANSI escape sequences
-amd64 ~hppa ~ia64 ~ppc ~sparc x86
+amd64 hppa ~ia64 ~ppc ~sparc x86
 base eutils multilib multiprocessing perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Test-TCP-1.160.0 b/metadata/cache/dev-perl/Test-TCP-1.160.0
new file mode 100644
index 000000000000..6e70eb3a705a
--- /dev/null
+++ b/metadata/cache/dev-perl/Test-TCP-1.160.0
@@ -0,0 +1,22 @@
+>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl[-build]
+>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-1.16.tar.gz
+
+http://search.cpan.org/dist/Test-TCP/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Testing TCP program
+~amd64 ~x86
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/perltidy-20120701.0.0 b/metadata/cache/dev-perl/perltidy-20120701.0.0
new file mode 100644
index 000000000000..b39fb4989349
--- /dev/null
+++ b/metadata/cache/dev-perl/perltidy-20120701.0.0
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20120701.tar.gz
+
+http://perltidy.sourceforge.net/ http://search.cpan.org/dist/Perl-Tidy/
+GPL-2
+Perl script indenter and beautifier
+~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+base eutils multilib multiprocessing perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/SchemaObject-0.5.3 b/metadata/cache/dev-python/SchemaObject-0.5.3
index cee62ed55cd5..1daa9cea89bc 100644
--- a/metadata/cache/dev-python/SchemaObject-0.5.3
+++ b/metadata/cache/dev-python/SchemaObject-0.5.3
@@ -1,5 +1,5 @@
-|| ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
-|| ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://www.matuson.com/code/schemaobject/downloads/SchemaObject-0.5.3.tar.gz
 
diff --git a/metadata/cache/dev-python/pygame-1.9.2_pre20120101-r1 b/metadata/cache/dev-python/pygame-1.9.2_pre20120101-r1
index b1c76b6a3509..29e532138aae 100644
--- a/metadata/cache/dev-python/pygame-1.9.2_pre20120101-r1
+++ b/metadata/cache/dev-python/pygame-1.9.2_pre20120101-r1
@@ -6,7 +6,7 @@ http://people.apache.org/~Arfrever/gentoo/pygame-1.9.2_pre20120101.tar.xz
 http://www.pygame.org/
 LGPL-2.1
 Python bindings for SDL multimedia library
-alpha amd64 ~arm ~hppa ia64 ~ppc sparc x86 ~x86-fbsd
+alpha amd64 ~arm hppa ia64 ~ppc sparc x86 ~x86-fbsd
 distutils multilib python toolchain-funcs virtualx
 doc examples X test
 
diff --git a/metadata/cache/dev-python/rsa-3.1.1 b/metadata/cache/dev-python/rsa-3.1.1
index 4088930cb822..9ff3a8ceaa0c 100644
--- a/metadata/cache/dev-python/rsa-3.1.1
+++ b/metadata/cache/dev-python/rsa-3.1.1
@@ -1,4 +1,4 @@
->=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
+>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
 >=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://pypi/r/rsa/rsa-3.1.1.tar.gz
diff --git a/metadata/cache/dev-ruby/nokogiri-1.5.5 b/metadata/cache/dev-ruby/nokogiri-1.5.5
new file mode 100644
index 000000000000..19f031582000
--- /dev/null
+++ b/metadata/cache/dev-ruby/nokogiri-1.5.5
@@ -0,0 +1,22 @@
+dev-libs/libxml2 dev-libs/libxslt ruby_targets_ruby18? ( dev-ruby/rake-compiler[ruby_targets_ruby18] dev-ruby/rexical[ruby_targets_ruby18] dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/rdoc[ruby_targets_ruby18] dev-ruby/racc[ruby_targets_ruby18] test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] dev-ruby/rexical[ruby_targets_ruby19] dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] dev-ruby/racc[ruby_targets_ruby19] test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( dev-ruby/rake-compiler[ruby_targets_ree18] dev-ruby/rexical[ruby_targets_ree18] dev-ruby/hoe[ruby_targets_ree18] dev-ruby/rdoc[ruby_targets_ree18] dev-ruby/racc[ruby_targets_ree18] test? ( dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( dev-ruby/rake-compiler[ruby_targets_jruby] dev-ruby/rexical[ruby_targets_jruby] dev-ruby/hoe[ruby_targets_jruby] dev-ruby/rdoc[ruby_targets_jruby] dev-ruby/racc[ruby_targets_jruby] test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) 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_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_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] ) 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] ) )
+dev-libs/libxml2 dev-libs/libxslt 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_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] )
+0
+https://github.com/sparklemotion/nokogiri/tarball/v1.5.5 -> nokogiri-1.5.5.tgz
+
+http://nokogiri.rubyforge.org/
+MIT
+Nokogiri is an HTML, XML, SAX, and Reader parser.
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/lockrun-20120508 b/metadata/cache/dev-util/lockrun-20120508
index c44ff388ecfc..34b875821f75 100644
--- a/metadata/cache/dev-util/lockrun-20120508
+++ b/metadata/cache/dev-util/lockrun-20120508
@@ -6,7 +6,7 @@
 http://www.unixwiz.net/tools/lockrun.html
 public-domain
 Lockrun - runs cronjobs with overrun protection
-amd64 ~hppa x86
+amd64 hppa x86
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/dev-util/monkeystudio-1.9.0.2 b/metadata/cache/dev-util/monkeystudio-1.9.0.2
new file mode 100644
index 000000000000..1cb78bfd2765
--- /dev/null
+++ b/metadata/cache/dev-util/monkeystudio-1.9.0.2
@@ -0,0 +1,22 @@
+plugins? ( >=x11-libs/qt-webkit-4.7.0:4 ) >=x11-libs/qt-assistant-4.7.0:4 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4 x11-libs/qscintilla doc? ( >=app-doc/doxygen-1.5.8 )
+plugins? ( >=x11-libs/qt-webkit-4.7.0:4 ) >=x11-libs/qt-assistant-4.7.0:4 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4 x11-libs/qscintilla
+0
+http://monkeystudio.googlecode.com/files/mks_1.9.0.2-src.tar.gz
+
+http://www.monkeystudio.org
+GPL-2 LGPL-3
+A cross platform Qt 4 IDE
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+doc plugins linguas_be linguas_es linguas_fr linguas_ru
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.8.6 b/metadata/cache/dev-vcs/git-1.7.8.6
index 0de2fd48885b..892ad5b8ee14 100644
--- a/metadata/cache/dev-vcs/git-1.7.8.6
+++ b/metadata/cache/dev-vcs/git-1.7.8.6
@@ -6,7 +6,7 @@ http://git-core.googlecode.com/files/git-1.7.8.6.tar.gz mirror://kernel/software
 http://www.git-scm.com/
 GPL-2
 GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base bash-completion-r1 elisp-common eutils multilib multiprocessing perl-module python toolchain-funcs user
 +blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
 cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
diff --git a/metadata/cache/games-fps/openarena-0.8.8 b/metadata/cache/games-fps/openarena-0.8.8
index cf35ec0201de..41c188772da0 100644
--- a/metadata/cache/games-fps/openarena-0.8.8
+++ b/metadata/cache/games-fps/openarena-0.8.8
@@ -6,7 +6,7 @@ mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/
 http://openarena.ws/
 GPL-2
 Open-source replacement for Quake 3 Arena
-amd64 ~x86
+amd64 x86
 base eutils flag-o-matic games multilib toolchain-funcs user versionator
 +curl +openal +vorbis
 
diff --git a/metadata/cache/games-strategy/lgeneral-1.2.2 b/metadata/cache/games-strategy/lgeneral-1.2.2
deleted file mode 100644
index 6f6d64636961..000000000000
--- a/metadata/cache/games-strategy/lgeneral-1.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl )
-0
-mirror://sourceforge/lgeneral/lgeneral-1.2.2.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-
-http://lgames.sourceforge.net/index.php?project=LGeneral
-GPL-2
-A Panzer General clone written in SDL
-amd64 x86
-autotools base eutils games libtool multilib multiprocessing toolchain-funcs user
-nls
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-strategy/lgeneral-1.2.3 b/metadata/cache/games-strategy/lgeneral-1.2.3
index 06e5306c8ba6..d8435f5f97e9 100644
--- a/metadata/cache/games-strategy/lgeneral-1.2.3
+++ b/metadata/cache/games-strategy/lgeneral-1.2.3
@@ -6,7 +6,7 @@ mirror://sourceforge/lgeneral/lgeneral-1.2.3.tar.gz mirror://sourceforge/lgenera
 http://lgames.sourceforge.net/index.php?project=LGeneral
 GPL-2
 A Panzer General clone written in SDL
-amd64 ~x86
+amd64 x86
 autotools base eutils games libtool multilib multiprocessing toolchain-funcs user
 nls
 
diff --git a/metadata/cache/gnustep-apps/cenon-3.8.2 b/metadata/cache/gnustep-apps/cenon-3.8.2
deleted file mode 100644
index 0d92eb615e3a..000000000000
--- a/metadata/cache/gnustep-apps/cenon-3.8.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-libs/cenonlibrary-3.8.2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
-0
-http://www.vhf-group.com/vhfInterservice/download/source/Cenon-3.82.tar.bz2
-
-http://www.cenon.info/
-Cenon
-Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
-amd64 ppc x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-debug doc
-
-
-
-
-
-compile install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/gnustep-apps/cenon-3.9.4 b/metadata/cache/gnustep-apps/cenon-3.9.6
similarity index 86%
rename from metadata/cache/gnustep-apps/cenon-3.9.4
rename to metadata/cache/gnustep-apps/cenon-3.9.6
index 0c7d266c8c15..935b30f85bde 100644
--- a/metadata/cache/gnustep-apps/cenon-3.9.4
+++ b/metadata/cache/gnustep-apps/cenon-3.9.6
@@ -1,7 +1,7 @@
 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 0
-http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.4.tar.bz2
+http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.6.tar.bz2
 
 http://www.cenon.info/
 Cenon
diff --git a/metadata/cache/gnustep-base/gnustep-make-2.6.0 b/metadata/cache/gnustep-base/gnustep-make-2.6.0
deleted file mode 100644
index fb2d146faf4f..000000000000
--- a/metadata/cache/gnustep-base/gnustep-make-2.6.0
+++ /dev/null
@@ -1,22 +0,0 @@
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-0
-ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.0.tar.gz
-
-http://www.gnustep.org
-GPL-2
-GNUstep Makefile Package
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-eutils flag-o-matic gnustep-base multilib prefix toolchain-funcs user
-native-exceptions debug doc
-
-
-
-3
-
-compile configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/gnustep-base/gnustep-make-2.6.1-r1 b/metadata/cache/gnustep-base/gnustep-make-2.6.1-r1
deleted file mode 100644
index b2628f4f826f..000000000000
--- a/metadata/cache/gnustep-base/gnustep-make-2.6.1-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-0
-ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.1.tar.gz
-
-http://www.gnustep.org
-GPL-2
-GNUstep Makefile Package
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-eutils flag-o-matic gnustep-base multilib prefix toolchain-funcs user
-native-exceptions debug doc
-
-
-
-3
-
-compile configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/gnustep-base/gnustep-make-2.6.2 b/metadata/cache/gnustep-base/gnustep-make-2.6.2
index a14aceb25c72..74b3d56dc9f4 100644
--- a/metadata/cache/gnustep-base/gnustep-make-2.6.2
+++ b/metadata/cache/gnustep-base/gnustep-make-2.6.2
@@ -1,5 +1,5 @@
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
+doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2
+doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2
 0
 ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 
diff --git a/metadata/cache/gnustep-base/gnustep-make-2.6.2-r1 b/metadata/cache/gnustep-base/gnustep-make-2.6.2-r2
similarity index 79%
rename from metadata/cache/gnustep-base/gnustep-make-2.6.2-r1
rename to metadata/cache/gnustep-base/gnustep-make-2.6.2-r2
index b4974150818f..3a0d98d71a87 100644
--- a/metadata/cache/gnustep-base/gnustep-make-2.6.2-r1
+++ b/metadata/cache/gnustep-base/gnustep-make-2.6.2-r2
@@ -1,5 +1,5 @@
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] )
-doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] )
+doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2 )
+doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2 )
 0
 ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 
diff --git a/metadata/cache/gnustep-base/gnustep-updater-0.3 b/metadata/cache/gnustep-base/gnustep-updater-0.3
new file mode 100644
index 000000000000..1766285de7bf
--- /dev/null
+++ b/metadata/cache/gnustep-base/gnustep-updater-0.3
@@ -0,0 +1,22 @@
+app-shells/bash
+app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+0
+http://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
+
+http://www.gentoo.org
+GPL-2
+Helper tool to upgrade Gentoo GNUstep installations
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/mail-client/mailx-8.1.2.20050715-r5 b/metadata/cache/mail-client/mailx-8.1.2.20050715-r5
index 5143cdea27b7..38d47c5cedc0 100644
--- a/metadata/cache/mail-client/mailx-8.1.2.20050715-r5
+++ b/metadata/cache/mail-client/mailx-8.1.2.20050715-r5
@@ -6,7 +6,7 @@ mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.
 http://www.debian.org/
 BSD
 The /bin/mail program, which is used to send mail via shell scripts
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils flag-o-matic multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/mail-client/sylpheed-3.1.4 b/metadata/cache/mail-client/sylpheed-3.1.4
index 4e3e4c4ff1c1..1173d8dfb30d 100644
--- a/metadata/cache/mail-client/sylpheed-3.1.4
+++ b/metadata/cache/mail-client/sylpheed-3.1.4
@@ -6,7 +6,7 @@ http://sylpheed.sraoss.jp/sylpheed/v3.1/sylpheed-3.1.4.tar.bz2
 http://sylpheed.sraoss.jp/
 GPL-2 LGPL-2.1
 A lightweight email client and newsreader
-~alpha amd64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 crypt ipv6 ldap nls oniguruma pda spell ssl xface
 
diff --git a/metadata/cache/mail-filter/amavisd-new-2.7.1 b/metadata/cache/mail-filter/amavisd-new-2.7.1
index 2be6bf3d0c50..4c89e8b4b451 100644
--- a/metadata/cache/mail-filter/amavisd-new-2.7.1
+++ b/metadata/cache/mail-filter/amavisd-new-2.7.1
@@ -6,7 +6,7 @@ http://www.ijs.si/software/amavisd/amavisd-new-2.7.1.tar.gz
 http://www.ijs.si/software/amavisd/
 GPL-2
 High-performance interface between the MTA and content checkers.
-~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
 eutils multilib toolchain-funcs user
 courier dkim ldap mysql postgres qmail razor snmp spamassassin
 
diff --git a/metadata/cache/mail-filter/assp-1.9.3.7 b/metadata/cache/mail-filter/assp-1.9.3.7
new file mode 100644
index 000000000000..9ca525034c82
--- /dev/null
+++ b/metadata/cache/mail-filter/assp-1.9.3.7
@@ -0,0 +1,22 @@
+app-arch/unzip
+dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
+0
+mirror://sourceforge/assp/ASSP_1.9.3.7-Install.zip
+
+http://assp.sourceforge.net/
+GPL-2
+Anti-Spam SMTP Proxy written in Perl.
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+ipv6 ldap sasl spf srs ssl syslog
+
+
+
+
+
+install postinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/inkscape-0.48.3.1 b/metadata/cache/media-gfx/inkscape-0.48.3.1
index 713290c3e844..d968a38fe08a 100644
--- a/metadata/cache/media-gfx/inkscape-0.48.3.1
+++ b/metadata/cache/media-gfx/inkscape-0.48.3.1
@@ -6,7 +6,7 @@ test
 http://www.inkscape.org/
 GPL-2 LGPL-2.1
 A SVG based generic vector-drawing program
-amd64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 autotools eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib multiprocessing python toolchain-funcs user versionator
 dia gnome postscript inkjar lcms nls spell wmf
 
diff --git a/metadata/cache/media-libs/libdvbpsi-0.2.2 b/metadata/cache/media-libs/libdvbpsi-0.2.2
index 2b1f56c2c7b3..3f7e75612ef5 100644
--- a/metadata/cache/media-libs/libdvbpsi-0.2.2
+++ b/metadata/cache/media-libs/libdvbpsi-0.2.2
@@ -6,7 +6,7 @@ http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2
 http://www.videolan.org/libdvbpsi
 LGPL-2.1
 library for MPEG TS/DVB PSI tables decoding and generation
-~alpha amd64 arm ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 
 doc static-libs
 
diff --git a/metadata/cache/media-libs/libdvdcss-1.2.12 b/metadata/cache/media-libs/libdvdcss-1.2.12
index 17d9e943c8c0..24ef2aff397c 100644
--- a/metadata/cache/media-libs/libdvdcss-1.2.12
+++ b/metadata/cache/media-libs/libdvdcss-1.2.12
@@ -6,7 +6,7 @@ http://www.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2
 http://www.videolan.org/developers/libdvdcss.html
 GPL-2
 A portable abstraction library for DVD decryption
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools libtool multilib multiprocessing toolchain-funcs
 doc static-libs
 
diff --git a/metadata/cache/media-libs/sdl-mixer-1.2.12-r1 b/metadata/cache/media-libs/sdl-mixer-1.2.12-r1
index d8a881cbe4f5..2b3d847d8a3d 100644
--- a/metadata/cache/media-libs/sdl-mixer-1.2.12-r1
+++ b/metadata/cache/media-libs/sdl-mixer-1.2.12-r1
@@ -6,7 +6,7 @@ http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 http://www.libsdl.org/projects/SDL_mixer/
 ZLIB
 Simple Direct Media Layer Mixer Library
-~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 eutils multilib toolchain-funcs user
 flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav
 midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
diff --git a/metadata/cache/media-sound/mpg123-1.14.2 b/metadata/cache/media-sound/mpg123-1.14.2
index a969ee1bd097..803d8b501393 100644
--- a/metadata/cache/media-sound/mpg123-1.14.2
+++ b/metadata/cache/media-sound/mpg123-1.14.2
@@ -6,7 +6,7 @@ http://www.mpg123.org/download/mpg123-1.14.2.tar.bz2
 http://www.mpg123.org/
 GPL-2 LGPL-2.1
 a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 libtool multilib toolchain-funcs
 3dnow 3dnowext alsa altivec coreaudio ipv6 jack mmx nas oss portaudio pulseaudio sdl sse
 
diff --git a/metadata/cache/media-video/ushare-1.1a-r3 b/metadata/cache/media-video/ushare-1.1a-r3
index ffe62674ed0e..af31d58f4ed8 100644
--- a/metadata/cache/media-video/ushare-1.1a-r3
+++ b/metadata/cache/media-video/ushare-1.1a-r3
@@ -6,7 +6,7 @@ http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
 http://ushare.geexbox.org/
 GPL-2
 uShare is a UPnP (TM) A/V & DLNA Media Server
-amd64 ~x86
+amd64 x86
 eutils multilib toolchain-funcs user
 dlna nls
 
diff --git a/metadata/cache/net-analyzer/nagios-check_ipmi_sensor-3.1 b/metadata/cache/net-analyzer/nagios-check_ipmi_sensor-3.1
new file mode 100644
index 000000000000..9ccd149973a2
--- /dev/null
+++ b/metadata/cache/net-analyzer/nagios-check_ipmi_sensor-3.1
@@ -0,0 +1,22 @@
+
+dev-lang/perl dev-perl/IPC-Run sys-libs/freeipmi
+0
+http://www.thomas-krenn.com/en/oss/ipmi-plugin/check_ipmi_sensor_v3.1.tar.gz
+
+http://www.thomas-krenn.com/en/oss/ipmi-plugin/
+GPL-3
+IPMI Sensor Monitoring Plugin for Nagios/Icinga
+~amd64 ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/netperf-2.5.0-r1 b/metadata/cache/net-analyzer/netperf-2.5.0-r1
index 7d0914cbaeed..c5db0224fcd8 100644
--- a/metadata/cache/net-analyzer/netperf-2.5.0-r1
+++ b/metadata/cache/net-analyzer/netperf-2.5.0-r1
@@ -6,7 +6,7 @@ ftp://ftp.netperf.org/netperf/netperf-2.5.0.tar.bz2
 http://www.netperf.org/
 netperf
 Network performance benchmark including tests for TCP, UDP, sockets, ATM and more.
-~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-dns/libidn-1.25 b/metadata/cache/net-dns/libidn-1.25
index 2aa3e6249c49..9133715f8b6c 100644
--- a/metadata/cache/net-dns/libidn-1.25
+++ b/metadata/cache/net-dns/libidn-1.25
@@ -6,7 +6,7 @@ mirror://gnu/libidn/libidn-1.25.tar.gz
 http://www.gnu.org/software/libidn/
 GPL-2 GPL-3 LGPL-3
 Internationalized Domain Names (IDN) implementation
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 elisp-common eutils java-pkg-opt-2 java-utils-2 mono multilib toolchain-funcs user versionator
 doc emacs java mono nls static-libs elibc_FreeBSD java
 
diff --git a/metadata/cache/net-ftp/pure-ftpd-1.0.36 b/metadata/cache/net-ftp/pure-ftpd-1.0.36
index 17dadf995975..cba8a894e84a 100644
--- a/metadata/cache/net-ftp/pure-ftpd-1.0.36
+++ b/metadata/cache/net-ftp/pure-ftpd-1.0.36
@@ -6,7 +6,7 @@ ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.36.tar.bz2 http://do
 http://www.pureftpd.org/
 BSD
 Fast, production-quality, standard-conformant FTP server.
-~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86
 confutils eutils flag-o-matic multilib toolchain-funcs user
 anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
 
diff --git a/metadata/cache/net-libs/gupnp-0.18.3 b/metadata/cache/net-libs/gupnp-0.18.3
index 21cbfccfe41c..af3ab530820b 100644
--- a/metadata/cache/net-libs/gupnp-0.18.3
+++ b/metadata/cache/net-libs/gupnp-0.18.3
@@ -6,7 +6,7 @@ mirror://gnome/sources/gupnp/0.18/gupnp-0.18.3.tar.xz
 http://gupnp.org/
 LGPL-2
 An object-oriented framework for creating UPnP devs and control points
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 eutils gnome.org multilib toolchain-funcs user versionator
 connman +introspection kernel_linux networkmanager
 
diff --git a/metadata/cache/net-libs/liblockfile-1.09 b/metadata/cache/net-libs/liblockfile-1.09
index 31964a34dcc6..e4eb90ae372d 100644
--- a/metadata/cache/net-libs/liblockfile-1.09
+++ b/metadata/cache/net-libs/liblockfile-1.09
@@ -6,7 +6,7 @@ mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
 http://www.debian.org/
 LGPL-2
 Implements functions designed to lock the standard mailboxes
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 
 
diff --git a/metadata/cache/net-libs/libupnp-1.6.14 b/metadata/cache/net-libs/libupnp-1.6.14
index 09224168f6ed..626626bb6bf4 100644
--- a/metadata/cache/net-libs/libupnp-1.6.14
+++ b/metadata/cache/net-libs/libupnp-1.6.14
@@ -6,7 +6,7 @@ mirror://sourceforge/pupnp/libupnp-1.6.14.tar.bz2
 http://pupnp.sourceforge.net/
 BSD
 An Portable Open Source UPnP Development Kit
-~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
 debug doc ipv6 static-libs
 
diff --git a/metadata/cache/net-libs/nodejs-0.8.1 b/metadata/cache/net-libs/nodejs-0.8.1
new file mode 100644
index 000000000000..706e169d0fcb
--- /dev/null
+++ b/metadata/cache/net-libs/nodejs-0.8.1
@@ -0,0 +1,22 @@
+>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+0
+http://nodejs.org/dist/v0.8.1/node-v0.8.1.tar.gz
+test
+http://nodejs.org/
+GPL-2
+Evented IO for V8 Javascript
+~amd64 ~x86 ~x64-macos
+eutils multilib pax-utils python toolchain-funcs user
+
+
+
+
+3
+
+compile configure install prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/net-libs/wvstreams-4.6.1-r2 b/metadata/cache/net-libs/wvstreams-4.6.1-r2
index 46ca7a76fecc..fa68bcf20a82 100644
--- a/metadata/cache/net-libs/wvstreams-4.6.1-r2
+++ b/metadata/cache/net-libs/wvstreams-4.6.1-r2
@@ -6,7 +6,7 @@ test
 http://alumnit.ca/wiki/?WvStreams
 GPL-2
 A network programming library in C++
-~alpha amd64 ~hppa ~ppc ~sparc x86
+~alpha amd64 hppa ~ppc ~sparc x86
 autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
 pam doc +ssl +dbus debug
 
diff --git a/metadata/cache/net-p2p/tribler-5.9.19 b/metadata/cache/net-p2p/tribler-5.9.19
new file mode 100644
index 000000000000..9b7449f88292
--- /dev/null
+++ b/metadata/cache/net-p2p/tribler-5.9.19
@@ -0,0 +1,22 @@
+>=dev-python/apsw-3.6 >=dev-python/m2crypto-0.16 dev-python/netifaces >=dev-libs/openssl-0.9.8 >=dev-python/wxpython-2.8 vlc? ( >=media-video/vlc-1.1.0 ) app-arch/unzip =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+>=dev-python/apsw-3.6 >=dev-python/m2crypto-0.16 dev-python/netifaces >=dev-libs/openssl-0.9.8 >=dev-python/wxpython-2.8 vlc? ( >=media-video/vlc-1.1.0 ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+0
+http://dl.tribler.org/tribler_5.9.19-1ubuntu1_all.deb
+
+http://www.tribler.org/
+LGPL-2.1
+Bittorrent client that does not require a website to discover content
+~amd64 ~x86
+eutils multilib python toolchain-funcs user
+vlc
+
+
+
+4
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-wireless/kismet-2011.03.2-r3 b/metadata/cache/net-wireless/kismet-2011.03.2-r3
index cecd56278f68..97571d41dc8c 100644
--- a/metadata/cache/net-wireless/kismet-2011.03.2-r3
+++ b/metadata/cache/net-wireless/kismet-2011.03.2-r3
@@ -6,7 +6,7 @@ http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz
 http://www.kismetwireless.net/
 GPL-2
 IEEE 802.11 wireless LAN sniffer
-amd64 ~arm ~ppc x86
+amd64 ~arm ppc x86
 eutils multilib toolchain-funcs user
 +client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby +suid
 
diff --git a/metadata/cache/net-wireless/kismet-9999 b/metadata/cache/net-wireless/kismet-9999
index 72b81a3c43c6..45ca7c4dd88c 100644
--- a/metadata/cache/net-wireless/kismet-9999
+++ b/metadata/cache/net-wireless/kismet-9999
@@ -1,5 +1,5 @@
-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 )
+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 ) 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 ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )
 0
 
 
@@ -8,7 +8,7 @@ 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
++client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby +suid
 
 
 
diff --git a/metadata/cache/net-wireless/spectools-2011.08.1-r1 b/metadata/cache/net-wireless/spectools-2011.08.1-r1
index 04425aaaf7ad..da07c318c6d5 100644
--- a/metadata/cache/net-wireless/spectools-2011.08.1-r1
+++ b/metadata/cache/net-wireless/spectools-2011.08.1-r1
@@ -6,7 +6,7 @@ http://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
 http://www.kismetwireless.net/spectools/
 GPL-2
 Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
-amd64 ~arm ~ppc x86
+amd64 ~arm ppc x86
 
 ncurses gtk
 
diff --git a/metadata/cache/sci-astronomy/idlastro-20120206 b/metadata/cache/sci-astronomy/idlastro-20120206
deleted file mode 100644
index be031e1c9ff2..000000000000
--- a/metadata/cache/sci-astronomy/idlastro-20120206
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=dev-lang/gdl-0.9.2-r1
-0
-http://idlastro.gsfc.nasa.gov//ftp/astron.tar.gz -> idlastro-20120206.tar.gz
-
-http://idlastro.gsfc.nasa.gov/
-public-domain
-Astronomical user routines for IDL
-~amd64 ~x86
-
-
-
-
-
-4
-
-install
-
-
-
-
-
diff --git a/metadata/cache/sci-astronomy/idlastro-20120502 b/metadata/cache/sci-astronomy/idlastro-20120502
index e2edffa5752a..e3feb25f5006 100644
--- a/metadata/cache/sci-astronomy/idlastro-20120502
+++ b/metadata/cache/sci-astronomy/idlastro-20120502
@@ -6,7 +6,7 @@ http://idlastro.gsfc.nasa.gov//ftp/astron.tar.gz -> idlastro-20120502.tar.gz
 http://idlastro.gsfc.nasa.gov/
 public-domain
 Astronomical user routines for IDL
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sci-libs/idlmarkwardt-20111221 b/metadata/cache/sci-libs/idlmarkwardt-20120524
similarity index 77%
rename from metadata/cache/sci-libs/idlmarkwardt-20111221
rename to metadata/cache/sci-libs/idlmarkwardt-20120524
index f793a88170a2..e75e9f00a258 100644
--- a/metadata/cache/sci-libs/idlmarkwardt-20111221
+++ b/metadata/cache/sci-libs/idlmarkwardt-20120524
@@ -1,12 +1,12 @@
 
 >=dev-lang/gdl-0.9.2-r1
 0
-http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> idlmarkwardt-20111221.tar.gz
+http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> idlmarkwardt-20120524.tar.gz
 
 http://cow.physics.wisc.edu/~craigm/idl/idl.html
 as-is
 Craig Marqwardt IDL procedures (MPFIT, CMSVLIB, etc)
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sys-apps/moreutils-0.46 b/metadata/cache/sys-apps/moreutils-0.46
index cdbb7f9e7cd8..ff158992bf50 100644
--- a/metadata/cache/sys-apps/moreutils-0.46
+++ b/metadata/cache/sys-apps/moreutils-0.46
@@ -6,7 +6,7 @@ mirror://debian/pool/main/m/moreutils/moreutils_0.46.tar.gz
 http://kitenet.net/~joey/code/moreutils/
 GPL-2
 a growing collection of the unix tools that nobody thought to write thirty years ago
-amd64 ~hppa ~ppc ~ppc64 x86 ~x86-linux
+amd64 hppa ~ppc ~ppc64 x86 ~x86-linux
 eutils multilib prefix toolchain-funcs user
 +doc +perl
 
diff --git a/metadata/cache/sys-apps/renameutils-0.12.0 b/metadata/cache/sys-apps/renameutils-0.12.0
index 5439b58c9678..f5f1d70318c4 100644
--- a/metadata/cache/sys-apps/renameutils-0.12.0
+++ b/metadata/cache/sys-apps/renameutils-0.12.0
@@ -6,7 +6,7 @@ http://savannah.nongnu.org/download/renameutils/renameutils-0.12.0.tar.gz
 http://www.nongnu.org/renameutils/
 GPL-3
 Use your favorite text editor to rename files
-amd64 ~ppc x86
+amd64 ppc x86
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 nls
 
diff --git a/metadata/cache/sys-apps/sandbox-2.6 b/metadata/cache/sys-apps/sandbox-2.6
new file mode 100644
index 000000000000..8d966d8ac514
--- /dev/null
+++ b/metadata/cache/sys-apps/sandbox-2.6
@@ -0,0 +1,22 @@
+app-arch/xz-utils >=app-misc/pax-utils-0.1.19
+
+0
+mirror://gentoo/sandbox-2.6.tar.xz http://dev.gentoo.org/~vapier/dist/sandbox-2.6.tar.xz
+
+http://www.gentoo.org/
+GPL-2
+sandbox'd LD_PRELOAD hack
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd -x86-fbsd
+eutils flag-o-matic multilib multiprocessing toolchain-funcs unpacker user
+multilib
+
+
+
+
+
+compile install postinst preinst test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-auth/consolekit-0.4.5_p20120320 b/metadata/cache/sys-auth/consolekit-0.4.5_p20120320
index cc28717d8b86..d7d2ec1843b4 100644
--- a/metadata/cache/sys-auth/consolekit-0.4.5_p20120320
+++ b/metadata/cache/sys-auth/consolekit-0.4.5_p20120320
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~ssuominen/ConsoleKit-0.4.5_p20120320.tar.xz
 http://www.freedesktop.org/wiki/Software/ConsoleKit
 GPL-2
 Framework for defining and tracking users, login sessions and seats.
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 autotools eutils flag-o-matic libtool linux-info multilib multiprocessing pam systemd toolchain-funcs user versionator
 acl debug doc kernel_linux pam policykit selinux test
 
diff --git a/metadata/cache/sys-devel/dragonegg-3.1 b/metadata/cache/sys-devel/dragonegg-3.1
index 50291e0c001e..50754398f6df 100644
--- a/metadata/cache/sys-devel/dragonegg-3.1
+++ b/metadata/cache/sys-devel/dragonegg-3.1
@@ -8,7 +8,7 @@ GPL-2
 GCC plugin that uses LLVM for optimization and code generation
 ~amd64 ~x86 ~amd64-linux
 multilib toolchain-funcs
-
+test
 
 
 
diff --git a/metadata/cache/sys-fs/btrfs-progs-0.19.11 b/metadata/cache/sys-fs/btrfs-progs-0.19.11
new file mode 100644
index 000000000000..642a84c47ea9
--- /dev/null
+++ b/metadata/cache/sys-fs/btrfs-progs-0.19.11
@@ -0,0 +1,22 @@
+sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs dev-vcs/git
+sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
+0
+
+
+https://btrfs.wiki.kernel.org
+GPL-2
+Btrfs filesystem utilities
+~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+git-2 multilib toolchain-funcs
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/libfat-0.3a b/metadata/cache/sys-fs/libfat-0.3a
new file mode 100644
index 000000000000..2012b57c84af
--- /dev/null
+++ b/metadata/cache/sys-fs/libfat-0.3a
@@ -0,0 +1,22 @@
+dev-libs/glib:2 sys-fs/fuse virtual/pkgconfig
+dev-libs/glib:2 sys-fs/fuse
+0
+mirror://sourceforge/libfat/libfat-0.3a.tar.gz
+
+http://libfat.sourceforge.net
+GPL-2
+Support library to access and manipulate FAT12 / FAT16 / FAT32 file systems
+~amd64 ~arm ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/udev-171-r6 b/metadata/cache/sys-fs/udev-171-r6
index 623669a373cc..7b3089b82a84 100644
--- a/metadata/cache/sys-fs/udev-171-r6
+++ b/metadata/cache/sys-fs/udev-171-r6
@@ -6,7 +6,7 @@ mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gen
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev/udev.html http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary
 GPL-2
 Linux dynamic and persistent device naming support (aka userspace devfs)
-~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
 eutils flag-o-matic libtool linux-info multilib systemd toolchain-funcs user versionator
 build selinux test debug +rule_generator hwdb gudev introspection keymap floppy edd action_modeswitch extras
 
diff --git a/metadata/cache/sys-libs/glibc-2.16.0 b/metadata/cache/sys-libs/glibc-2.16.0
new file mode 100644
index 000000000000..3afe74def3aa
--- /dev/null
+++ b/metadata/cache/sys-libs/glibc-2.16.0
@@ -0,0 +1,22 @@
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+2.2
+mirror://gnu/glibc/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0.tar.xz mirror://gnu/glibc/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0-patches-1.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.16.0-patches-1.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.16.0-patches-1.tar.bz2
+strip
+http://www.gnu.org/software/libc/libc.html
+LGPL-2
+GNU libc6 (also called glibc2) C library
+
+eutils flag-o-matic gnuconfig libtool multilib multiprocessing toolchain-funcs unpacker user versionator
+debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only
+
+
+
+
+
+compile install test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/glibc-9999 b/metadata/cache/sys-libs/glibc-9999
index 6cbfe27cab26..23815b549f5f 100644
--- a/metadata/cache/sys-libs/glibc-9999
+++ b/metadata/cache/sys-libs/glibc-9999
@@ -1,4 +1,4 @@
->=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
+>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
 !sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 2.2
 
@@ -7,8 +7,8 @@ http://www.gnu.org/software/libc/libc.html
 LGPL-2
 GNU libc6 (also called glibc2) C library
 
-eutils flag-o-matic git-2 gnuconfig libtool multilib multiprocessing toolchain-funcs user versionator
-debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only
+eutils flag-o-matic git-2 gnuconfig libtool multilib multiprocessing toolchain-funcs unpacker user versionator
+debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only
 
 
 
diff --git a/metadata/cache/sys-libs/ldb-1.1.4 b/metadata/cache/sys-libs/ldb-1.1.4
index 3a98d813b850..0caab13d82db 100644
--- a/metadata/cache/sys-libs/ldb-1.1.4
+++ b/metadata/cache/sys-libs/ldb-1.1.4
@@ -1,5 +1,5 @@
-dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
-dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
+dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
+dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
 0
 http://www.samba.org/ftp/pub/ldb/ldb-1.1.4.tar.gz
 
diff --git a/metadata/cache/sys-process/audit-2.1.3-r1 b/metadata/cache/sys-process/audit-2.1.3-r1
index c60dcd4e6eed..f3fc028f3a42 100644
--- a/metadata/cache/sys-process/audit-2.1.3-r1
+++ b/metadata/cache/sys-process/audit-2.1.3-r1
@@ -6,7 +6,7 @@ test
 http://people.redhat.com/sgrubb/audit/
 GPL-2
 Userspace utilities for storing and processing auditing records
-~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 autotools eutils libtool linux-info multilib multiprocessing python toolchain-funcs user versionator
 ldap prelude python
 
diff --git a/metadata/cache/x11-libs/fltk-1.3.0-r1 b/metadata/cache/x11-libs/fltk-1.3.0-r1
index 20786fc9a878..f8815be39fa7 100644
--- a/metadata/cache/x11-libs/fltk-1.3.0-r1
+++ b/metadata/cache/x11-libs/fltk-1.3.0-r1
@@ -6,7 +6,7 @@ mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
 http://www.fltk.org/
 FLTK LGPL-2
 C++ user interface toolkit for X and OpenGL
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 autotools eutils fdo-mime flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
 cairo debug doc examples games opengl pdf static-libs threads xft xinerama
 
diff --git a/metadata/cache/x11-libs/libxklavier-5.2.1 b/metadata/cache/x11-libs/libxklavier-5.2.1
index 59e4e092b687..c589d078b01c 100644
--- a/metadata/cache/x11-libs/libxklavier-5.2.1
+++ b/metadata/cache/x11-libs/libxklavier-5.2.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/libxklavier/5.2/libxklavier-5.2.1.tar.xz
 http://www.freedesktop.org/wiki/Software/LibXklavier
 LGPL-2
 A library for the X Keyboard Extension (high-level API)
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 eutils gnome.org libtool multilib toolchain-funcs user versionator
 doc +introspection
 
diff --git a/metadata/cache/x11-misc/revelation-0.4.14 b/metadata/cache/x11-misc/revelation-0.4.14
index f8a3c7cc7638..9ea404a105a9 100644
--- a/metadata/cache/x11-misc/revelation-0.4.14
+++ b/metadata/cache/x11-misc/revelation-0.4.14
@@ -6,7 +6,7 @@ test
 http://revelation.olasagasti.info/
 GPL-2
 A password manager for GNOME
-amd64 ~ppc ~x86
+amd64 ppc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 applet
 
diff --git a/metadata/cache/x11-misc/xosview-1.9.3 b/metadata/cache/x11-misc/xosview-1.9.3
index 5404b25b8c20..633729c56d21 100644
--- a/metadata/cache/x11-misc/xosview-1.9.3
+++ b/metadata/cache/x11-misc/xosview-1.9.3
@@ -6,7 +6,7 @@ http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.3.tar.gz
 http://www.pogo.org.uk/~mark/xosview/
 GPL-2 BSD
 X11 operating system viewer
-~alpha amd64 ~ppc ~ppc64 ~sparc x86
+~alpha amd64 ppc ~ppc64 ~sparc x86
 eutils multilib toolchain-funcs user
 suid
 
diff --git a/metadata/cache/x11-misc/xplanet-1.3.0 b/metadata/cache/x11-misc/xplanet-1.3.0
index 2a29b901ac91..17c94b99905a 100644
--- a/metadata/cache/x11-misc/xplanet-1.3.0
+++ b/metadata/cache/x11-misc/xplanet-1.3.0
@@ -6,7 +6,7 @@ mirror://sourceforge/xplanet/xplanet-1.3.0.tar.gz
 http://xplanet.sourceforge.net/
 GPL-2
 Render images of the earth into the X root window
-~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86
+~alpha amd64 ~hppa ppc ppc64 ~sparc x86
 eutils flag-o-matic multilib toolchain-funcs user
 gif jpeg png tiff truetype X
 
diff --git a/metadata/cache/x11-plugins/wmfire-1.2.4-r2 b/metadata/cache/x11-plugins/wmfire-1.2.4-r2
index b6fd552a655e..796a8937722d 100644
--- a/metadata/cache/x11-plugins/wmfire-1.2.4-r2
+++ b/metadata/cache/x11-plugins/wmfire-1.2.4-r2
@@ -6,7 +6,7 @@ http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
 http://www.swanson.ukfsn.org/#wmfire
 GPL-2
 Load monitoring dockapp displaying dancing flame.
-amd64 ~ppc ~sparc x86
+amd64 ppc ~sparc x86
 autotools eutils libtool multilib multiprocessing toolchain-funcs user
 session
 
diff --git a/metadata/cache/x11-plugins/wmnd-0.4.16 b/metadata/cache/x11-plugins/wmnd-0.4.16
index 5ab4a873aa68..42bf1779a1bf 100644
--- a/metadata/cache/x11-plugins/wmnd-0.4.16
+++ b/metadata/cache/x11-plugins/wmnd-0.4.16
@@ -6,7 +6,7 @@ http://www.thregr.org/~wavexx/software/wmnd/releases/wmnd-0.4.16.tar.gz
 http://www.thregr.org/~wavexx/software/wmnd/
 GPL-2
 WindowMaker Network Devices (dockapp)
-amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 
 snmp
 
diff --git a/metadata/cache/x11-plugins/wmtop-0.9.0-r1 b/metadata/cache/x11-plugins/wmtop-0.9.0-r1
index 87627c44d680..39b249b09898 100644
--- a/metadata/cache/x11-plugins/wmtop-0.9.0-r1
+++ b/metadata/cache/x11-plugins/wmtop-0.9.0-r1
@@ -6,7 +6,7 @@ http://www.swanson.ukfsn.org/wmdock/wmtop-0.9.0.tar.gz
 http://www.swanson.ukfsn.org/#wmtop
 GPL-2
 dockapp for monitoring the top three processes using cpu or memory.
-amd64 ~ppc ~sparc x86
+amd64 ppc ~sparc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/x11-plugins/wmweather+-2.13 b/metadata/cache/x11-plugins/wmweather+-2.13
index 396225183b29..38e71bf657bd 100644
--- a/metadata/cache/x11-plugins/wmweather+-2.13
+++ b/metadata/cache/x11-plugins/wmweather+-2.13
@@ -6,7 +6,7 @@ mirror://sourceforge/wmweatherplus/wmweather+-2.13.tar.gz
 http://www.sourceforge.net/projects/wmweatherplus/
 GPL-2
 A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts
-amd64 ~mips ~ppc ~ppc64 ~sparc x86
+amd64 ~mips ppc ~ppc64 ~sparc x86
 eutils flag-o-matic multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/x11-terms/roxterm-2.6.3 b/metadata/cache/x11-terms/roxterm-2.6.3
index 2cf3f5c272ea..17c4d834d59e 100644
--- a/metadata/cache/x11-terms/roxterm-2.6.3
+++ b/metadata/cache/x11-terms/roxterm-2.6.3
@@ -6,7 +6,7 @@ mirror://sourceforge/roxterm/roxterm-2.6.3.tar.bz2
 http://roxterm.sourceforge.net/
 GPL-2 LGPL-3
 A terminal emulator designed to integrate with the ROX environment
-amd64 ~ppc x86
+amd64 ppc x86
 gnome2-utils multilib python toolchain-funcs
 nls
 
diff --git a/metadata/cache/x11-themes/bespin-0_p20120703 b/metadata/cache/x11-themes/bespin-0_p20120703
new file mode 100644
index 000000000000..f8fe7188f347
--- /dev/null
+++ b/metadata/cache/x11-themes/bespin-0_p20120703
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+http://dev.gentoo.org/~creffett/distfiles/bespin-0_p20120703.tar.xz
+
+http://cloudcity.sourceforge.net/
+GPL-2
+A KDE4 follow-up to Baghira KDE Theme Engine, which resembles Mac OS X
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+debug aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-wm/jwm-2.1.0 b/metadata/cache/x11-wm/jwm-2.1.0
index 07df0a563caa..07ff3a76e97b 100644
--- a/metadata/cache/x11-wm/jwm-2.1.0
+++ b/metadata/cache/x11-wm/jwm-2.1.0
@@ -6,7 +6,7 @@ http://joewing.net/programs/jwm/releases/jwm-2.1.0.tar.bz2
 http://joewing.net/programs/jwm/
 GPL-2
 Very fast and lightweight still powerful window manager for X
-amd64 hppa ~ppc x86
+amd64 hppa ppc x86
 eutils multilib toolchain-funcs user
 bidi debug jpeg png truetype xinerama xpm
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index eeac649f776e..14e8be935883 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jul 2012 16:37:31 +0000
+Wed, 04 Jul 2012 03:37:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fab8c4355518..bf754ac0a14d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jul 2012 16:37:32 +0000
+Wed, 04 Jul 2012 03:37:53 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-pinentry-0.3 b/metadata/md5-cache/app-admin/eselect-pinentry-0.3
index ad562b7e2207..3513ed6cbfcf 100644
--- a/metadata/md5-cache/app-admin/eselect-pinentry-0.3
+++ b/metadata/md5-cache/app-admin/eselect-pinentry-0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DEPEND=app-admin/eselect !<app-crypt/pinentry-0.8.0-r1
 DESCRIPTION=Manage /usr/bin/pinentry symlink
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect !<app-crypt/pinentry-0.8.0-r1
 SLOT=0
-_md5_=614260db1529fb3733ff91c112f67264
+_md5_=6ed640d018a92f3d4e89456eb0991150
diff --git a/metadata/md5-cache/app-arch/alien-8.86 b/metadata/md5-cache/app-arch/alien-8.86
index 7c8cb72bd2d3..92fbb9bbe7d4 100644
--- a/metadata/md5-cache/app-arch/alien-8.86
+++ b/metadata/md5-cache/app-arch/alien-8.86
@@ -4,10 +4,10 @@ DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file
 EAPI=1
 HOMEPAGE=http://kitenet.net/programs/alien
 IUSE=+bzip2
-KEYWORDS=~alpha amd64 ~hppa ~ppc x86
+KEYWORDS=~alpha amd64 hppa ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/rpm app-arch/dpkg bzip2? ( app-arch/bzip2 ) dev-util/debhelper >=app-arch/tar-1.14.91
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/alien/alien_8.86.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a803cbd82542459c837ccc6442a212a1
+_md5_=bec2c32756e7d3ac260078616386031e
diff --git a/metadata/md5-cache/app-arch/innoextract-1.3 b/metadata/md5-cache/app-arch/innoextract-1.3
new file mode 100644
index 000000000000..6e910a98de39
--- /dev/null
+++ b/metadata/md5-cache/app-arch/innoextract-1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/boost-1.37 lzma? ( app-arch/xz-utils ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A tool to unpack installers created by Inno Setup
+EAPI=4
+HOMEPAGE=http://innoextract.constexpr.org/
+IUSE=debug doc +lzma
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=dev-libs/boost-1.37 lzma? ( app-arch/xz-utils )
+SLOT=0
+SRC_URI=mirror://github/dscharrer/InnoExtract/innoextract-1.3.tar.gz mirror://sourceforge/innoextract/innoextract-1.3.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=eb87e2fb4dd01978cc20f4d4fb2502ae
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20120601 b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20120601
index 631f9b474073..ca967a413a0a 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20120601
+++ b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20120601
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based CD and DVD burning application
 EAPI=4
 HOMEPAGE=http://goodies.xfce.org/projects/applications/xfburn
 IUSE=debug gstreamer udev
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/xfburn-0.4.3_p20120601.tar.xz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	880b0e8f23147d868b73f420e84bc1ba
-_md5_=166a3dc8caa484a657bdc41ab9e84e95
+_md5_=6fbfdb9badaa0502a9984c5a3ed8ff57
diff --git a/metadata/md5-cache/app-crypt/hashcat-bin-0.39 b/metadata/md5-cache/app-crypt/hashcat-bin-0.39
index a77932d3fc5d..e3fc634b34f2 100644
--- a/metadata/md5-cache/app-crypt/hashcat-bin-0.39
+++ b/metadata/md5-cache/app-crypt/hashcat-bin-0.39
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://hashcat.net/files/hashcat-0.39.7z
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=989e040ec81e799ead33c7a67032a81a
+_md5_=3bfe36fbf54cd129854ca34a7ffcecd3
diff --git a/metadata/md5-cache/app-crypt/hashcat-gui-0.5.1 b/metadata/md5-cache/app-crypt/hashcat-gui-0.5.1
index 27d68c442160..b20d11f958ec 100644
--- a/metadata/md5-cache/app-crypt/hashcat-gui-0.5.1
+++ b/metadata/md5-cache/app-crypt/hashcat-gui-0.5.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-crypt/hashcat-bin app-crypt/oclhashcat-plus-bin app-crypt/oclhashcat-lite-bin x11-libs/qt-gui x11-libs/qt-core
 SLOT=0
-SRC_URI=https://github.com/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> hashcat-gui-0.5.1.zip
+SRC_URI=mirror://github/scandium/hashcat-gui/zipball/b6b01be723742ad89ba31fdb2c30b35306318f8b -> hashcat-gui-0.5.1.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c5804564c33faf5bb1f3986ba20f894b
+_md5_=83b7db9c82ae80863c2cfe9ad75e5671
diff --git a/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.10 b/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.10
index 129dcce705d0..5a9961f876c5 100644
--- a/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.10
+++ b/metadata/md5-cache/app-crypt/oclhashcat-lite-bin-0.10
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://hashcat.net/files/oclHashcat-lite-0.10.7z
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f057549b8dc52834b7c5c6ea8aba7562
+_md5_=b9286b163b615b9ac0ede3479b1c17b4
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.8.1 b/metadata/md5-cache/app-crypt/pinentry-0.8.1
index 52a413df93b7..a07dc920b2cb 100644
--- a/metadata/md5-cache/app-crypt/pinentry-0.8.1
+++ b/metadata/md5-cache/app-crypt/pinentry-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize t
 EAPI=3
 HOMEPAGE=http://gnupg.org/aegypten2/index.html
 IUSE=gtk ncurses qt4 caps static
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect-pinentry static? ( >=sys-libs/ncurses-5.7-r5[static-libs] ) !static? ( gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=x11-libs/qt-gui-4.4.1 ) !gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) ) ) caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-0.8.1.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3c49ce04d1581cc1f0d0fd37e83825cf
+_md5_=515f02e0de89cbff1a2be361a92aec04
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r3 b/metadata/md5-cache/app-editors/emacs-23.4-r3
index 953de1f2d4c4..7d847f0cb158 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r3
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/emacs/
 IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) !<app-editors/emacs-vcs-23.4
 REQUIRED_USE=aqua? ( !X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 mirror://gentoo/emacs-23.4-patches-4.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9e83d49720a99720fd471d47d2bae1ba
+_md5_=be94363884eee3e4e8990fdb64149119
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r3 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r3
index 1ff31106aaf0..9f431bce024c 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r3
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Common files needed by all GNU Emacs versions
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
 IUSE=games X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=virtual/emacs
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-common-gentoo-1.3.tar.gz
 _eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1649065b08dae4744f9065fcce243281
+_md5_=d2826b8242488171ba5f6b7628ade10d
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-3.2.1 b/metadata/md5-cache/app-forensics/sleuthkit-3.2.1
deleted file mode 100644
index 7905db811323..000000000000
--- a/metadata/md5-cache/app-forensics/sleuthkit-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib )
-DESCRIPTION=A collection of file system and media management forensic analysis tools
-EAPI=4
-HOMEPAGE=http://www.sleuthkit.org/sleuthkit/
-IUSE=aff ewf
-KEYWORDS=amd64 hppa ppc x86
-LICENSE=GPL-2 IBM
-RDEPEND=ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) dev-perl/DateManip
-SLOT=0
-SRC_URI=mirror://sourceforge/sleuthkit/sleuthkit-3.2.1.tar.gz
-_md5_=7959d52103db342a93c383680e10362c
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-3.2.3 b/metadata/md5-cache/app-forensics/sleuthkit-3.2.3
index 8a831e50f43e..adeaad5122e1 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-3.2.3
+++ b/metadata/md5-cache/app-forensics/sleuthkit-3.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of file system and media management forensic analysis t
 EAPI=4
 HOMEPAGE=http://www.sleuthkit.org/sleuthkit/
 IUSE=aff ewf static-libs
-KEYWORDS=amd64 ~hppa ppc x86
+KEYWORDS=amd64 hppa ppc x86
 LICENSE=GPL-2 IBM
 RDEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) dev-perl/DateManip
 SLOT=0
 SRC_URI=mirror://sourceforge/sleuthkit/sleuthkit-3.2.3.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2670be1510d8ce27b99b093119de3293
+_md5_=99b9276e0df18f37730a34939298bc2b
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.11-r1 b/metadata/md5-cache/app-i18n/scim-1.4.11-r1
index 49694c4012cf..8e449db75202 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.11-r1
+++ b/metadata/md5-cache/app-i18n/scim-1.4.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
 EAPI=3
 HOMEPAGE=http://www.scim-im.org/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-1.4.11.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=375ffb436e1dc617b5eefaaa68deca2b
+_md5_=39fe7e2361e00541a60531fc67db323c
diff --git a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1 b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1-r1
similarity index 92%
rename from metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1
rename to metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1-r1
index 707aec4c0e7a..5cf597224470 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1
+++ b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.77.1-r1
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( || ( dev-lang/ruby dev-lang
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.77.1.tar.bz2
-_md5_=303e1f6a4b9662aada106ab0aa541511
+_md5_=c43a643a1fd09a410ff60ccdf8f0dfa3
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1-r1
similarity index 94%
rename from metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1
rename to metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1-r1
index 69001c144563..ab635d6ec597 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.77.1-r1
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby dev-lang
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.77.1.tar.bz2
-_md5_=1841eee7143a8838ddc937f5bdacc8c5
+_md5_=2f735898b7d3eef0c68b0619105d7ecd
diff --git a/metadata/md5-cache/app-text/dos2unix-6.0 b/metadata/md5-cache/app-text/dos2unix-6.0
index d15a60b2ddcd..83666f7ad73c 100644
--- a/metadata/md5-cache/app-text/dos2unix-6.0
+++ b/metadata/md5-cache/app-text/dos2unix-6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=4
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/
 IUSE=debug nls
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u !app-text/unix2dos virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-6.0.tar.gz mirror://sourceforge/dos2unix/dos2unix-6.0.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d4e42ece27d2da19c33a10d3fae795e
+_md5_=90b131830ee726dd58bbe99ba9a086ad
diff --git a/metadata/md5-cache/app-text/noweb-2.11b-r3 b/metadata/md5-cache/app-text/noweb-2.11b-r3
index b2ef3e621f14..3471c2afca4f 100644
--- a/metadata/md5-cache/app-text/noweb-2.11b-r3
+++ b/metadata/md5-cache/app-text/noweb-2.11b-r3
@@ -4,10 +4,10 @@ DESCRIPTION=a literate programming tool, lighter than web
 EAPI=3
 HOMEPAGE=http://www.eecs.harvard.edu/~nr/noweb/
 IUSE=emacs examples
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=noweb emacs? ( GPL-2 )
 RDEPEND=virtual/tex-base dev-lang/icon sys-apps/debianutils emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=http://www.eecs.harvard.edu/~nr/noweb/dist/noweb-2.11b.tgz
 _eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=305a7ea5c8ab53360559b82bcd100a8e
+_md5_=88fd436c4f0c31c4929861ebc15e54c5
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.3.1 b/metadata/md5-cache/app-text/xmlstarlet-1.3.1
index a8c4f31e78ee..ba3c6b03967b 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.3.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.3.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt vir
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
 EAPI=4
 HOMEPAGE=http://xmlstar.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.3.1.tar.gz
-_md5_=a68aae6ee2050bbab74d8c736eed9072
+_md5_=f8839766079560a88791c64e782842da
diff --git a/metadata/md5-cache/dev-db/SchemaSync-0.9.2 b/metadata/md5-cache/dev-db/SchemaSync-0.9.2
index a6ae7e91d116..9da535b5e683 100644
--- a/metadata/md5-cache/dev-db/SchemaSync-0.9.2
+++ b/metadata/md5-cache/dev-db/SchemaSync-0.9.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=MySQL Schema Versioning and Migration Utility
 EAPI=4
 HOMEPAGE=http://schemasync.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=dev-python/mysql-python dev-python/SchemaObject || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://www.schemasync.org/downloads/SchemaSync-0.9.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=4660a3116e77208e670a799805c46df1
+_md5_=7cc5c892ca0d292d37123c7788a4d451
diff --git a/metadata/md5-cache/dev-db/postgis-2.0.0 b/metadata/md5-cache/dev-db/postgis-2.0.0
index b7a450c8d459..bf28051fdc08 100644
--- a/metadata/md5-cache/dev-db/postgis-2.0.0
+++ b/metadata/md5-cache/dev-db/postgis-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=4
 HOMEPAGE=http://postgis.refractions.net
 IUSE=doc gtk
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 ) dev-libs/libxml2:2 >=sci-libs/geos-3.3.2 >=sci-libs/proj-4.6.0 sci-libs/gdal gtk? ( x11-libs/gtk+:2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://postgis.refractions.net/download/postgis-2.0.0.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=28df32d901e8794062ab07da1be53484
+_md5_=61a661fe26793158705f6608229045b2
diff --git a/metadata/md5-cache/dev-lang/php-5.3.14 b/metadata/md5-cache/dev-lang/php-5.3.14
index 49449c113da0..ee2fc17d6a63 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.14
+++ b/metadata/md5-cache/dev-lang/php-5.3.14
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=4
 HOMEPAGE=http://php.net/
 IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) apache2? ( =www-servers/apache-2* )
@@ -13,4 +13,4 @@ RESTRICT=mirror
 SLOT=5.3
 SRC_URI=http://www.php.net/distributions/php-5.3.14.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.14-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	9d170f07df0e48055093b8c6a60d0fba	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2e78b7bf89f4bb1ea9a367a50774c523
+_md5_=5e1c0658ca6c768b83f00c3a87bc9785
diff --git a/metadata/md5-cache/dev-libs/Ice-3.4.2 b/metadata/md5-cache/dev-libs/Ice-3.4.2
index ded7cea64275..bfd83c69881d 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.4.2
+++ b/metadata/md5-cache/dev-libs/Ice-3.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=ICE middleware C++ library and generator tools
 EAPI=2
 HOMEPAGE=http://www.zeroc.com/
 IUSE=doc examples +ncurses mono python ruby test debug elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 >=dev-libs/openssl-0.9.8o >=sys-libs/db-4.8.30[cxx] ~dev-cpp/libmcpp-2.7.2 ruby? ( dev-lang/ruby:1.8 ) mono? ( dev-lang/mono ) !dev-python/IcePy !dev-ruby/IceRuby python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.4/Ice-3.4.2.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.4/Ice-3.4.2.pdf.gz )
 _eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	327b713e2d6949c42cd96bc4898fd280	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e8bfb2a08d15ce4d3b5ee402df904427
+_md5_=0520276202df842470f686ef6327d260
diff --git a/metadata/md5-cache/dev-libs/eb-4.4.1 b/metadata/md5-cache/dev-libs/eb-4.4.1
index f37e8c6aac4a..0667f15f0b86 100644
--- a/metadata/md5-cache/dev-libs/eb-4.4.1
+++ b/metadata/md5-cache/dev-libs/eb-4.4.1
@@ -3,9 +3,9 @@ DEPEND=sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
 DESCRIPTION=EB is a C library and utilities for accessing CD-ROM books
 HOMEPAGE=http://www.sra.co.jp/people/m-kasahr/eb/
 IUSE=nls ipv6 threads
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.1.tar.lzma
-_md5_=09deb2549b9e9337e3952ff0848abadf
+_md5_=019b7bc8acf7500750a0819c83b51b49
diff --git a/metadata/md5-cache/dev-libs/libatasmart-0.19 b/metadata/md5-cache/dev-libs/libatasmart-0.19
index 5ec3451dbd9e..2590900d4d01 100644
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19
@@ -4,9 +4,9 @@ DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
 EAPI=4
 HOMEPAGE=http://0pointer.de/blog/projects/being-smart.html
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-fs/udev-143
 SLOT=0
 SRC_URI=http://0pointer.de/public/libatasmart-0.19.tar.xz
-_md5_=b415a1a94c796435e18628b18599d55a
+_md5_=2acd8e9347c4269e59b4802849582268
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r1 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
index e70c6c147a02..68e3bc06624e 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A ELF object file access library
 EAPI=3
 HOMEPAGE=http://www.mr511.de/software/
 IUSE=debug nls elibc_FreeBSD
-KEYWORDS=alpha amd64 hppa ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=38da43b422958e445499c0cf3dfb79ff
+_md5_=b464dc9b682b476145bb88cd9ef251ca
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.7.7 b/metadata/md5-cache/dev-libs/uriparser-0.7.7
index e3cfecb31dd5..fce8561e6c05 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.7.7
+++ b/metadata/md5-cache/dev-libs/uriparser-0.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
 EAPI=4
 HOMEPAGE=http://uriparser.sourceforge.net/
 IUSE=doc qt4 test unicode
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=test? ( unicode )
 SLOT=0
 SRC_URI=mirror://sourceforge/uriparser/uriparser-0.7.7.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ac06428236318d871917b2ad93a73b0a
+_md5_=839b264427b41dd72c609fbb18a644a4
diff --git a/metadata/md5-cache/dev-ml/core_extended-108.00.01 b/metadata/md5-cache/dev-ml/core_extended-108.00.01
index c7e0c0848687..ff0ec91f85c5 100644
--- a/metadata/md5-cache/dev-ml/core_extended-108.00.01
+++ b/metadata/md5-cache/dev-ml/core_extended-108.00.01
@@ -3,11 +3,11 @@ DEPEND=dev-ml/pcre-ocaml >=dev-ml/sexplib-108.00.01 >=dev-ml/bin-prot-108.00.01
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=3
 HOMEPAGE=http://www.janestreet.com/ocaml
-IUSE=+ocamlopt debug doc
+IUSE=test +ocamlopt debug doc
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-linking-exception
 RDEPEND=dev-ml/pcre-ocaml >=dev-ml/sexplib-108.00.01 >=dev-ml/bin-prot-108.00.01 >=dev-ml/fieldslib-108.00.01 >=dev-ml/pa_ounit-108.00.01 >=dev-ml/variantslib-108.00.01 >=dev-ml/pipebang-108.00.01 >=dev-lang/ocaml-3.12[ocamlopt?]
 SLOT=0
 SRC_URI=http://bitbucket.org/yminsky/ocaml-core/downloads/core_extended-108.00.01.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5782800349f728f725f9378105c6a2ab	oasis	b06dffa6b9fecb81ede1ade7fead8438	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e27f39034b0ea663c3fb791a3230d7b
+_md5_=feeaf6eb5d867e6517ab8b7dba3f5205
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-1.290.0 b/metadata/md5-cache/dev-perl/Cache-Memcached-1.290.0
index 847cde279b4e..c62a8941bab7 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-1.290.0
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-1.290.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/string-crc32 dev-lang/perl[-build]
 DESCRIPTION=Perl API for memcached
 EAPI=4
 HOMEPAGE=http://www.danga.com/memcached/ http://search.cpan.org/dist/Cache-Memcached/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/string-crc32 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.29.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e56a5466330ce860fce83799d07e50d2
+_md5_=27a98e1cf74db924c1b7e600ba78a196
diff --git a/metadata/md5-cache/dev-perl/DateTime-0.760.0 b/metadata/md5-cache/dev-perl/DateTime-0.760.0
new file mode 100644
index 000000000000..46768d12def2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-0.760.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Params-Validate-0.76 >=dev-perl/DateTime-TimeZone-1.09 >=dev-perl/DateTime-Locale-0.44 dev-perl/Math-Round virtual/perl-Module-Build test? ( dev-perl/Test-Fatal ) dev-lang/perl[-build]
+DESCRIPTION=A date and time object
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/DateTime/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/Params-Validate-0.76 >=dev-perl/DateTime-TimeZone-1.09 >=dev-perl/DateTime-Locale-0.44 dev-perl/Math-Round dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-0.76.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=29de2879416113e88ec78b369838478f
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.520.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.520.0
new file mode 100644
index 000000000000..aa7716e64e9d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.520.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 >=virtual/perl-ExtUtils-MakeMaker-6.31 dev-lang/perl[-build]
+DESCRIPTION=Parse and Format DateTimes using Strptime
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Strptime/
+KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.52.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4a96f5328acd4bf150af02ded1a6e879
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0
index 21a2bfb5f7cb..4f5823c1031d 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0
@@ -3,10 +3,10 @@ DEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev
 DESCRIPTION=Base class for simple HTTP servers
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Daemon/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf6f4b8bd0f97ecc683ee1c78561554a
+_md5_=5ce2cd41b579ccb94db3d9986bbbde21
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.30.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.30.0
index 6988fb587902..25d9765b7068 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.30.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.30.0
@@ -3,10 +3,10 @@ DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.
 DESCRIPTION=Base class for Request/Response
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Message/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.10 >=virtual/perl-Encode-2.12 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=dev-perl/HTML-Parser-3.33 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.1 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Message-6.03.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=85e3067dd7af6e56936a85d683506f1d
+_md5_=40e850d51ccd5fa5f45a5cca6bd88622
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0
index 648af9d87db2..a624471808c3 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0
@@ -3,10 +3,10 @@ DEPEND=!<dev-perl/libwww-perl-6 dev-lang/perl[-build]
 DESCRIPTION=Media types and mailcap processing
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/LWP-MediaTypes/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=!<dev-perl/libwww-perl-6 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5123855ae38152a67a357fef023231f3
+_md5_=5ee88740c63fc8224091a770eb4b409c
diff --git a/metadata/md5-cache/dev-perl/Moose-2.60.300 b/metadata/md5-cache/dev-perl/Moose-2.60.300
new file mode 100644
index 000000000000..f395dd12fd14
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Moose-2.60.300
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!<=dev-perl/Catalyst-5.800.280 !<=dev-perl/Devel-REPL-1.003008 !<=dev-perl/Fey-0.360 !<=dev-perl/Fey-ORM-0.420 !<=dev-perl/File-ChangeNotify-0.150 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160 !<=dev-perl/Mason-2.180.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100 !<=dev-perl/MooseX-AttributeHelpers-0.22 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.250.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.12 !<=dev-perl/MooseX-FollowPBP-0.20 !<=dev-perl/MooseX-HasDefaults-0.20 !<=dev-perl/MooseX-InstanceTracking-0.40 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-NonMoose-0.170.0 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60 !<=dev-perl/MooseX-Role-Parameterized-0.230.0 !<=dev-perl/MooseX-Role-WithOverloading-0.070 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.472 !<=dev-perl/MooseX-Singleton-0.250 !<=dev-perl/MooseX-StrictConstructor-0.120 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Signal-1.101930 !<=dev-perl/MooseX-Types-0.190 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/namespace-autoclean-0.08 !dev-perl/Class-MOP >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Dist-CheckConflicts-0.20 >=dev-perl/Data-OptList-0.107.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/List-MoreUtils-0.280.0 >=dev-perl/MRO-Compat-0.05 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1 >=virtual/perl-Scalar-List-Utils-1.19 >=dev-perl/Sub-Exporter-0.980 >=dev-perl/Sub-Name-0.05 >=dev-perl/Try-Tiny-0.20 >=virtual/perl-ExtUtils-MakeMaker-6.56 test? ( dev-perl/PadWalker dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.88 dev-perl/Test-Requires >=dev-perl/Test-Output-0.09 >=dev-perl/Test-Warn-0.11 dev-perl/Test-Deep dev-perl/Module-Refresh ) dev-lang/perl[-build]
+DESCRIPTION=A postmodern object system for Perl 5
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Moose/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=!<=dev-perl/Catalyst-5.800.280 !<=dev-perl/Devel-REPL-1.003008 !<=dev-perl/Fey-0.360 !<=dev-perl/Fey-ORM-0.420 !<=dev-perl/File-ChangeNotify-0.150 !<=dev-perl/KiokuDB-0.510.0 !<=dev-perl/Markdent-0.160 !<=dev-perl/Mason-2.180.0 !<=dev-perl/MooseX-ABC-0.50.0 !<=dev-perl/MooseX-Aliases-0.80 !<=dev-perl/MooseX-AlwaysCoerce-0.130.0 !<=dev-perl/MooseX-Attribute-Deflator-2.1.7 !<=dev-perl/MooseX-Attribute-Dependent-1.1.0 !<=dev-perl/MooseX-Attribute-Prototype-0.100 !<=dev-perl/MooseX-AttributeHelpers-0.22 !<=dev-perl/MooseX-AttributeIndexes-1.0.0 !<=dev-perl/MooseX-AttributeInflate-0.20 !<=dev-perl/MooseX-CascadeClearing-0.30.0 !<=dev-perl/MooseX-ClassAttribute-0.250.0 !<=dev-perl/MooseX-Meta-Attribute-Index-0.40.0 !<=dev-perl/MooseX-Meta-Attribute-Lvalue-0.50.0 !<=dev-perl/MooseX-Constructor-AllErrors-0.12 !<=dev-perl/MooseX-FollowPBP-0.20 !<=dev-perl/MooseX-HasDefaults-0.20 !<=dev-perl/MooseX-InstanceTracking-0.40 !<=dev-perl/MooseX-LazyRequire-0.60.0 !<=dev-perl/MooseX-NonMoose-0.170.0 !<=dev-perl/MooseX-POE-0.214.0 !<=dev-perl/MooseX-Params-Validate-0.50 !<=dev-perl/MooseX-PrivateSetters-0.30.0 !<=dev-perl/MooseX-Role-Cmd-0.60 !<=dev-perl/MooseX-Role-Parameterized-0.230.0 !<=dev-perl/MooseX-Role-WithOverloading-0.070 !<=dev-perl/MooseX-Scaffold-0.50.0 !<=dev-perl/MooseX-SemiAffordanceAccessor-0.50 !<=dev-perl/MooseX-SetOnce-0.100.472 !<=dev-perl/MooseX-Singleton-0.250 !<=dev-perl/MooseX-StrictConstructor-0.120 !<=dev-perl/MooseX-Types-Parameterizable-0.50.0 !<=dev-perl/MooseX-Types-Signal-1.101930 !<=dev-perl/MooseX-Types-0.190 !<=dev-perl/MooseX-UndefTolerant-0.110.0 !<=dev-perl/PRANG-0.140.0 !<=dev-perl/Pod-Elemental-0.93.280 !<=dev-perl/Reaction-0.2.3 !<=dev-perl/Test-Able-0.100.0 !<=dev-perl/namespace-autoclean-0.08 !dev-perl/Class-MOP >=dev-perl/Class-Load-0.90.0 >=dev-perl/Class-Load-XS-0.10.0 >=dev-perl/Dist-CheckConflicts-0.20 >=dev-perl/Data-OptList-0.107.0 dev-perl/Devel-GlobalDestruction >=dev-perl/Eval-Closure-0.40.0 >=dev-perl/List-MoreUtils-0.280.0 >=dev-perl/MRO-Compat-0.05 >=dev-perl/Package-DeprecationManager-0.110.0 >=dev-perl/Package-Stash-0.320.0 >=dev-perl/Package-Stash-XS-0.240.0 >=dev-perl/Params-Util-1 >=virtual/perl-Scalar-List-Utils-1.19 >=dev-perl/Sub-Exporter-0.980 >=dev-perl/Sub-Name-0.05 >=dev-perl/Try-Tiny-0.20 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Moose-2.0603.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fb5c186e7ec9cb666e93c292c43cc4cd
diff --git a/metadata/md5-cache/dev-perl/Mouse-0.990.0 b/metadata/md5-cache/dev-perl/Mouse-0.990.0
new file mode 100644
index 000000000000..2f20bf965ed9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Mouse-0.990.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-ExtUtils-ParseXS-2.21 test? ( dev-perl/Sub-Uplevel >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl[-build]
+DESCRIPTION=Moose minus the antlers
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Mouse/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=virtual/perl-XSLoader dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-0.99.tar.gz mirror://gentoo/Mouse-0.64-ppport.h.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=40ee1bf0a2517448f831277b51c51585
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0
new file mode 100644
index 000000000000..ce1238449763
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.200.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/perl[-build]
+DESCRIPTION=An SMTP client supporting TLS and AUTH
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Net-SMTP-TLS-ButMaintained/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.20.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c273b0c957bea39f1c179c6637b33988
diff --git a/metadata/md5-cache/dev-perl/SQL-Translator-0.110.120 b/metadata/md5-cache/dev-perl/SQL-Translator-0.110.120
new file mode 100644
index 000000000000..21578a49248f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/SQL-Translator-0.110.120
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/yaml-0.68 >=dev-perl/IO-stringy-2.110 dev-perl/Class-Base >=dev-perl/Digest-SHA1-2.12 dev-perl/Class-Accessor >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/File-ShareDir-1.00 dev-perl/Class-MakeMethods >=dev-perl/XML-Writer-0.606 dev-perl/Carp-Clan dev-perl/Class-Data-Inheritable dev-perl/DBI dev-perl/Moo test? ( dev-perl/HTML-Parser >=dev-perl/XML-LibXML-1.69 dev-perl/Spreadsheet-ParseExcel >=dev-perl/Template-Toolkit-2.2 dev-perl/Test-Exception dev-perl/Test-Differences dev-perl/Test-Pod ) dev-lang/perl[-build]
+DESCRIPTION=Convert RDBMS SQL CREATE syntax
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/SQL-Translator/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-perl/yaml-0.68 >=dev-perl/IO-stringy-2.110 dev-perl/Class-Base >=dev-perl/Digest-SHA1-2.12 dev-perl/Class-Accessor >=dev-perl/Parse-RecDescent-1.967.9 >=dev-perl/File-ShareDir-1.00 dev-perl/Class-MakeMethods >=dev-perl/XML-Writer-0.606 dev-perl/Carp-Clan dev-perl/Class-Data-Inheritable dev-perl/DBI dev-perl/Moo dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FR/FREW/SQL-Translator-0.11012.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7231b811db37d80cbb05b2b4732d3924
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-0.9.13 b/metadata/md5-cache/dev-perl/Sys-Virt-0.9.13
new file mode 100644
index 000000000000..a1e365ed0eca
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-0.9.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-emulation/libvirt-0.9.13 virtual/pkgconfig test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/XML-XPath virtual/perl-Time-HiRes ) dev-lang/perl[-build]
+DESCRIPTION=Sys::Virt provides an API for using the libvirt library from Perl
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Sys-Virt/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=app-emulation/libvirt-0.9.13 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-0.9.13.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4b7a75b09c4e66f97f5ee7fe2884d728
diff --git a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0 b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0
index 09a16149acf4..89e3744106f7 100644
--- a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0
+++ b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Terminal control using ANSI escape sequences
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Term-ANSIScreen/
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 hppa ~ia64 ~ppc ~sparc x86
 LICENSE=CC0-1.0-Universal
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Term-ANSIScreen-1.50.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d398a00d743c4123c898e6d3dd12ece
+_md5_=d4e8ac7dd5af0cc3198ab0ec98ad41da
diff --git a/metadata/md5-cache/dev-perl/Test-TCP-1.160.0 b/metadata/md5-cache/dev-perl/Test-TCP-1.160.0
new file mode 100644
index 000000000000..9835c05ffe51
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-TCP-1.160.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl[-build]
+DESCRIPTION=Testing TCP program
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Test-TCP/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-1.16.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e6fc022a5eaa25af0c2a66c6eda69f8e
diff --git a/metadata/md5-cache/dev-perl/perltidy-20120701.0.0 b/metadata/md5-cache/dev-perl/perltidy-20120701.0.0
new file mode 100644
index 000000000000..e1d289c8ab71
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/perltidy-20120701.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl[-build]
+DESCRIPTION=Perl script indenter and beautifier
+EAPI=4
+HOMEPAGE=http://perltidy.sourceforge.net/ http://search.cpan.org/dist/Perl-Tidy/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20120701.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e484d977087854632112c4e514a16b3f
diff --git a/metadata/md5-cache/dev-python/SchemaObject-0.5.3 b/metadata/md5-cache/dev-python/SchemaObject-0.5.3
index 04cb187fc984..b0f3e757a55e 100644
--- a/metadata/md5-cache/dev-python/SchemaObject-0.5.3
+++ b/metadata/md5-cache/dev-python/SchemaObject-0.5.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=A simple Python object interface to a MySQL database schema
 EAPI=4
 HOMEPAGE=http://matuson.com/code/schemaobject/
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=|| ( =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://www.matuson.com/code/schemaobject/downloads/SchemaObject-0.5.3.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=8a4a5c80276077b08bff0ecf1e16002d
+_md5_=f862ea193decca80d45b1e806874b64f
diff --git a/metadata/md5-cache/dev-python/foolscap-0.6.4 b/metadata/md5-cache/dev-python/foolscap-0.6.4
index 56903d668b81..c40618e3225b 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.6.4
+++ b/metadata/md5-cache/dev-python/foolscap-0.6.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/twisted-2.4.0 dev-python/twisted-web ssl? ( dev-python/pyop
 SLOT=0
 SRC_URI=http://foolscap.lothar.com/releases/foolscap-0.6.4.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=a3f4062af766c75d5979d044c5a61e0f
+_md5_=a9a6898797dbf3c1e9f19f7635fdab0e
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r1 b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r1
index 9fda1e471070..98b31f44f8e2 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r1
+++ b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for SDL multimedia library
 EAPI=4
 HOMEPAGE=http://www.pygame.org/
 IUSE=doc examples X test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy >=media-libs/libsdl-1.2.5[X?] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 dev-lang/python
 SLOT=0
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/pygame-1.9.2_pre20120101.tar.xz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=677dd87e1247e6a568cb1bbb920cc219
+_md5_=61964123cd41d428e68f8fd573b1378f
diff --git a/metadata/md5-cache/dev-python/rsa-3.1.1 b/metadata/md5-cache/dev-python/rsa-3.1.1
index cc09201568a0..a68fc7d9d44e 100644
--- a/metadata/md5-cache/dev-python/rsa-3.1.1
+++ b/metadata/md5-cache/dev-python/rsa-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
+DEPEND=>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
 DESCRIPTION=Pure-Python RSA implementation
 EAPI=4
 HOMEPAGE=http://stuvel.eu/rsa http://pypi.python.org/pypi/rsa
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.1.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=0201fab7045b853dd4dc4d318c4d0043
+_md5_=20318c926a9b9158ca7520802ab3367f
diff --git a/metadata/md5-cache/dev-python/whoosh-2.4.1 b/metadata/md5-cache/dev-python/whoosh-2.4.1
index 6cd381a7f649..d3c4bca11e08 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.4.1
+++ b/metadata/md5-cache/dev-python/whoosh-2.4.1
@@ -10,4 +10,4 @@ RDEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.4.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=d27f3981b7a9a989ce87371f0b155985
+_md5_=9aa228f5c964b11c13f4a7faa07a508b
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.5.5 b/metadata/md5-cache/dev-ruby/nokogiri-1.5.5
new file mode 100644
index 000000000000..65a0c28a8e31
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt ruby_targets_ruby18? ( dev-ruby/rake-compiler[ruby_targets_ruby18] dev-ruby/rexical[ruby_targets_ruby18] dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/rdoc[ruby_targets_ruby18] dev-ruby/racc[ruby_targets_ruby18] test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] dev-ruby/rexical[ruby_targets_ruby19] dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] dev-ruby/racc[ruby_targets_ruby19] test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( dev-ruby/rake-compiler[ruby_targets_ree18] dev-ruby/rexical[ruby_targets_ree18] dev-ruby/hoe[ruby_targets_ree18] dev-ruby/rdoc[ruby_targets_ree18] dev-ruby/racc[ruby_targets_ree18] test? ( dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( dev-ruby/rake-compiler[ruby_targets_jruby] dev-ruby/rexical[ruby_targets_jruby] dev-ruby/hoe[ruby_targets_jruby] dev-ruby/rdoc[ruby_targets_jruby] dev-ruby/racc[ruby_targets_jruby] test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) 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_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_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] ) 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] ) )
+DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser.
+EAPI=4
+HOMEPAGE=http://nokogiri.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt 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_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] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+SLOT=0
+SRC_URI=https://github.com/sparklemotion/nokogiri/tarball/v1.5.5 -> nokogiri-1.5.5.tgz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5782800349f728f725f9378105c6a2ab	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	7bfb9d5afe376884a98c3f3b40cf673a	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ace43656744df25da01ac105ff009b40
diff --git a/metadata/md5-cache/dev-util/lockrun-20120508 b/metadata/md5-cache/dev-util/lockrun-20120508
index 57b83a22bffc..ab80f7d4e573 100644
--- a/metadata/md5-cache/dev-util/lockrun-20120508
+++ b/metadata/md5-cache/dev-util/lockrun-20120508
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Lockrun - runs cronjobs with overrun protection
 EAPI=4
 HOMEPAGE=http://www.unixwiz.net/tools/lockrun.html
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=public-domain
 SLOT=0
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=a949b168e668e38cbe46dc160d78fd61
+_md5_=0d4500b12c7e8834adc5e5d4ac19f0ec
diff --git a/metadata/md5-cache/dev-util/monkeystudio-1.9.0.2 b/metadata/md5-cache/dev-util/monkeystudio-1.9.0.2
new file mode 100644
index 000000000000..62fcdd0df016
--- /dev/null
+++ b/metadata/md5-cache/dev-util/monkeystudio-1.9.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=plugins? ( >=x11-libs/qt-webkit-4.7.0:4 ) >=x11-libs/qt-assistant-4.7.0:4 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4 x11-libs/qscintilla doc? ( >=app-doc/doxygen-1.5.8 )
+DESCRIPTION=A cross platform Qt 4 IDE
+EAPI=4
+HOMEPAGE=http://www.monkeystudio.org
+IUSE=doc plugins linguas_be linguas_es linguas_fr linguas_ru
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-3
+RDEPEND=plugins? ( >=x11-libs/qt-webkit-4.7.0:4 ) >=x11-libs/qt-assistant-4.7.0:4 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4 x11-libs/qscintilla
+SLOT=0
+SRC_URI=http://monkeystudio.googlecode.com/files/mks_1.9.0.2-src.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f2f39c5c8877ef9b8ce81389b4f8bd46
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.8.6 b/metadata/md5-cache/dev-vcs/git-1.7.8.6
index d455eb0d169c..fb385a2bd3c0 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.8.6
+++ b/metadata/md5-cache/dev-vcs/git-1.7.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.8.6.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.8.6.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.8.6.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.8.6.tar.gz )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	perl-module	1c5ba5b92574108992a6758f863da534	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7634779ffe37f5076838d1fa0aec7f13
+_md5_=238a2abba1f2dfba2b6ae58b6846c353
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8 b/metadata/md5-cache/games-fps/openarena-0.8.8
index 78fe9ee67b5b..e4ceac647047 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source replacement for Quake 3 Arena
 EAPI=2
 HOMEPAGE=http://openarena.ws/
 IUSE=+curl +openal +vorbis
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	208d30509b917ca42d728b7d106acb73	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ff95bea76835abc7c9772a0e88fea2d8
+_md5_=345d5f5c43bdc94327b2894b2ed77087
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.2.2 b/metadata/md5-cache/games-strategy/lgeneral-1.2.2
deleted file mode 100644
index df42729b6751..000000000000
--- a/metadata/md5-cache/games-strategy/lgeneral-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=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 Panzer General clone written in SDL
-EAPI=2
-HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.2.2.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c089fa2c2ca666eef9eaf38648c20cc5
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.2.3 b/metadata/md5-cache/games-strategy/lgeneral-1.2.3
index 7ce7474e6db2..28c66fe9f055 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.2.3
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=A Panzer General clone written in SDL
 EAPI=2
 HOMEPAGE=http://lgames.sourceforge.net/index.php?project=LGeneral
 IUSE=nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.2.3.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	games	208d30509b917ca42d728b7d106acb73	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=998c0062c8aae726fcd4e0392b7af1c5
+_md5_=0b73f56bba524a5e863ba5f5dceaa089
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.8.2 b/metadata/md5-cache/gnustep-apps/cenon-3.8.2
deleted file mode 100644
index 5a8ed903d3f5..000000000000
--- a/metadata/md5-cache/gnustep-apps/cenon-3.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
-HOMEPAGE=http://www.cenon.info/
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=Cenon
-RDEPEND=>=gnustep-libs/cenonlibrary-3.8.2 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=http://www.vhf-group.com/vhfInterservice/download/source/Cenon-3.82.tar.bz2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=25ce12a68cea518e73aeb9942ad8ba37
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.9.4 b/metadata/md5-cache/gnustep-apps/cenon-3.9.6
similarity index 92%
rename from metadata/md5-cache/gnustep-apps/cenon-3.9.4
rename to metadata/md5-cache/gnustep-apps/cenon-3.9.6
index 8b777f301a37..35bced174963 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-3.9.4
+++ b/metadata/md5-cache/gnustep-apps/cenon-3.9.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
-SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.4.tar.bz2
+SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.6.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66b82d663b42073ad0f87f2314882b1a
+_md5_=63483520700ecb9e369c6f5620e1fd81
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0
deleted file mode 100644
index 04ddd168a028..000000000000
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-DESCRIPTION=GNUstep Makefile Package
-EAPI=3
-HOMEPAGE=http://www.gnustep.org
-IUSE=native-exceptions debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-SLOT=0
-SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.0.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c7ee89988ce99d6849853df35e127bb
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1
deleted file mode 100644
index a542c2e2f8fc..000000000000
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-DESCRIPTION=GNUstep Makefile Package
-EAPI=3
-HOMEPAGE=http://www.gnustep.org
-IUSE=native-exceptions debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/gcc-3.3[objc] >=sys-devel/make-3.75 !gnustep-base/libobjc2
-SLOT=0
-SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.1.tar.gz
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=25210804882c6c7fa00a76a136412cd1
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
index 4a00f6eb1c15..33148c83e947 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2
 DESCRIPTION=GNUstep Makefile Package
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=native-exceptions debug doc
 KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2048639e88fca8caf1786d85b8f384b8
+_md5_=e4b502f3fac9731290e427cfdc4e8c09
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r2
similarity index 81%
rename from metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1
rename to metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r2
index 350bf1488508..801f206edc33 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] )
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2 )
 DESCRIPTION=GNUstep Makefile Package
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=libobjc2 native-exceptions debug doc
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] )
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) !libobjc2? ( >=sys-devel/gcc-3.3[objc] !!gnustep-base/libobjc2 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=77cb868d6b7d22ad8747a3d553f791b0
+_md5_=eb606786766148f436ac1889e3261280
diff --git a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3 b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3
new file mode 100644
index 000000000000..878c64e7db57
--- /dev/null
+++ b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash
+DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
+_md5_=6ce8d803ba7da1ac5b46e9dd34b80431
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
index 126a3421b987..4c3c26a5e840 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r5
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support
 DESCRIPTION=The /bin/mail program, which is used to send mail via shell scripts
 HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 SLOT=0
 SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9d017cc637a57cde0e872f51d7697a0e
+_md5_=887002ac6f4d8c9ad4500213c571e3cb
diff --git a/metadata/md5-cache/mail-client/sylpheed-3.1.4 b/metadata/md5-cache/mail-client/sylpheed-3.1.4
index b62ce57cad02..a33feef5978a 100644
--- a/metadata/md5-cache/mail-client/sylpheed-3.1.4
+++ b/metadata/md5-cache/mail-client/sylpheed-3.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight email client and newsreader
 EAPI=4
 HOMEPAGE=http://sylpheed.sraoss.jp/
 IUSE=crypt ipv6 ldap nls oniguruma pda spell ssl xface
-KEYWORDS=~alpha amd64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) app-misc/mime-types net-misc/curl
 SLOT=0
 SRC_URI=http://sylpheed.sraoss.jp/sylpheed/v3.1/sylpheed-3.1.4.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=28972a6be9233d1be0d6ad23b1d9e6aa
+_md5_=0c5989258ffebe6874e3cfc23022510a
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.7.1 b/metadata/md5-cache/mail-filter/amavisd-new-2.7.1
index c8c0486400ce..c38305cf9418 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.7.1
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers.
 EAPI=4
 HOMEPAGE=http://www.ijs.si/software/amavisd/
 IUSE=courier dkim ldap mysql postgres qmail razor snmp spamassassin
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/ncompress app-arch/pax app-arch/unarj app-arch/xz-utils || ( app-arch/unrar app-arch/rar ) app-arch/zoo >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.7.1.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d82e376d71f361d0c2daba6cea731bd
+_md5_=a4a86551a90cf1c09652210ad949595c
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.3.7 b/metadata/md5-cache/mail-filter/assp-1.9.3.7
new file mode 100644
index 000000000000..52f0b7d5923c
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/assp-1.9.3.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Anti-Spam SMTP Proxy written in Perl.
+HOMEPAGE=http://assp.sourceforge.net/
+IUSE=ipv6 ldap sasl spf srs ssl syslog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
+SLOT=0
+SRC_URI=mirror://sourceforge/assp/ASSP_1.9.3.7-Install.zip
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=98066b131472657d41d7e3d1cba2615b
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.48.3.1 b/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
index 2cd5504498a3..2c005622514c 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.48.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A SVG based generic vector-drawing program
 EAPI=4
 HOMEPAGE=http://www.inkscape.org/
 IUSE=dia gnome postscript inkjar lcms nls spell wmf
-KEYWORDS=amd64 hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-python/numpy media-gfx/uniconvertor dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl ) wmf? ( media-libs/libwmf ) dev-lang/python dev-lang/python[xml]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/inkscape/inkscape-0.48.3.1.tar.bz2 http://dev.gentoo.org/~radhermit/dist/inkscape-0.48.3.1-poppler-0.20.patch.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8428667945d01bebdd3adff7c16709d5
+_md5_=9b5ec19f722dd1025e234f6d4a005fe6
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-0.2.2 b/metadata/md5-cache/media-libs/libdvbpsi-0.2.2
index 27104f485494..b3fd6276a89f 100644
--- a/metadata/md5-cache/media-libs/libdvbpsi-0.2.2
+++ b/metadata/md5-cache/media-libs/libdvbpsi-0.2.2
@@ -4,8 +4,8 @@ DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
 EAPI=4
 HOMEPAGE=http://www.videolan.org/libdvbpsi
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2
-_md5_=c76318b863bd353107035e04da17b264
+_md5_=29676a7b84b37d902504a7251209da04
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.12 b/metadata/md5-cache/media-libs/libdvdcss-1.2.12
index 4767a8429111..401383614596 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.12
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.2.12
@@ -4,9 +4,9 @@ DESCRIPTION=A portable abstraction library for DVD decryption
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/libdvdcss.html
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=efda5495015f47791de1b623802e440b
+_md5_=102d64a3f35c8b17d1b9d3ffd9263de2
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
index 536dd97dd0e2..f9e89bb659fd 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer Mixer Library
 EAPI=4
 HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav
-KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) midi? ( fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad ) smpeg? ( >=media-libs/smpeg-0.4.4-r1 ) ) mod? ( modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4ea5a35cc27a869ae40f6c49e228091b
+_md5_=1dba6fa309715d22b145c9ecbbd548ae
diff --git a/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3 b/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
index 7b2892d60300..50ea84292e2d 100644
--- a/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-autosort-0.1.3
@@ -9,4 +9,4 @@ RDEPEND=>=media-video/vdr-1.3.32 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin
 SLOT=0
 SRC_URI=http://www.copypointburscheid.de/linux/vdr-autosort-0.1.3.tgz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	c864d3fddbd622c432ea9463b6e63c10
-_md5_=5a4b0688ed9920d82f517f64f8629b28
+_md5_=4ed42f66b634ff619918d000ebb878ef
diff --git a/metadata/md5-cache/media-sound/mpg123-1.14.2 b/metadata/md5-cache/media-sound/mpg123-1.14.2
index 01f3a779a1d0..d7392a1ee626 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.14.2
+++ b/metadata/md5-cache/media-sound/mpg123-1.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=4
 HOMEPAGE=http://www.mpg123.org/
 IUSE=3dnow 3dnowext alsa altivec coreaudio ipv6 jack mmx nas oss portaudio pulseaudio sdl sse
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) sys-devel/libtool
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.14.2.tar.bz2
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=cda69b9be718073789b196c21cbf58df
+_md5_=a4a2b06bd60b3ceea7702d2189d769ad
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r3 b/metadata/md5-cache/media-video/ushare-1.1a-r3
index bd98186caa13..a0253784ca10 100644
--- a/metadata/md5-cache/media-video/ushare-1.1a-r3
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r3
@@ -4,10 +4,10 @@ DESCRIPTION=uShare is a UPnP (TM) A/V & DLNA Media Server
 EAPI=4
 HOMEPAGE=http://ushare.geexbox.org/
 IUSE=dlna nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libupnp-1.6.14 dlna? ( >=media-libs/libdlna-0.2.4 )
 SLOT=0
 SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=99729b3e074a3bddaef7211ffb2c281d
+_md5_=536908215f718daee51f3a90d6f0fd61
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.1 b/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.1
new file mode 100644
index 000000000000..ad286de084d4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=IPMI Sensor Monitoring Plugin for Nagios/Icinga
+EAPI=4
+HOMEPAGE=http://www.thomas-krenn.com/en/oss/ipmi-plugin/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/IPC-Run sys-libs/freeipmi
+SLOT=0
+SRC_URI=http://www.thomas-krenn.com/en/oss/ipmi-plugin/check_ipmi_sensor_v3.1.tar.gz
+_eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=c5434465b48c2513cd2542df03349adc
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1 b/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1
index 8cb805520f18..765cbfcc7889 100644
--- a/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1
+++ b/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets, ATM and more.
 EAPI=4
 HOMEPAGE=http://www.netperf.org/
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=netperf
 SLOT=0
 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.5.0.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed18f45a7a0b90d70f1e6499c4e5c32f
+_md5_=6703f784240c11493059f83d44c10fe7
diff --git a/metadata/md5-cache/net-dns/libidn-1.25 b/metadata/md5-cache/net-dns/libidn-1.25
index dd026498de3f..7059202d02a5 100644
--- a/metadata/md5-cache/net-dns/libidn-1.25
+++ b/metadata/md5-cache/net-dns/libidn-1.25
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2 GPL-3 LGPL-3
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( virtual/libintl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.25.tar.gz
 _eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9e9b08d4a1636eec65680c65090e3fc0
+_md5_=83bfb784bd3f9cc39458da574bdafdda
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
index 949d66efe707..412ad0a5f653 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.36
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, production-quality, standard-conformant FTP server.
 EAPI=2
 HOMEPAGE=http://www.pureftpd.org/
 IUSE=anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.36.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.36.tar.bz2
 _eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3134b6aaa64a0340b5b6e3c856ae17d4
+_md5_=f4445e08586bdff18c5e27d5ce2926d1
diff --git a/metadata/md5-cache/net-libs/gupnp-0.18.3 b/metadata/md5-cache/net-libs/gupnp-0.18.3
index 04cedaea1f1c..82b6b93db6aa 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.18.3
+++ b/metadata/md5-cache/net-libs/gupnp-0.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=An object-oriented framework for creating UPnP devs and control poin
 EAPI=4
 HOMEPAGE=http://gupnp.org/
 IUSE=connman +introspection kernel_linux networkmanager
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=>=net-libs/gssdp-0.11.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) connman? ( >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp/0.18/gupnp-0.18.3.tar.xz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f43d91011842825118e3cb57d41703cb
+_md5_=b964f00d5929c56d8e653774c1ca7baf
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.09 b/metadata/md5-cache/net-libs/liblockfile-1.09
index 686fc8c60d61..85fe5237d113 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.09
+++ b/metadata/md5-cache/net-libs/liblockfile-1.09
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=4
 HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c30378e2bbc59e1d913a5e032415ebd
+_md5_=30695eed470abb856d35b745293ab5df
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.14 b/metadata/md5-cache/net-libs/libupnp-1.6.14
index 7f62edcd6ba4..5e3e7ef4f976 100644
--- a/metadata/md5-cache/net-libs/libupnp-1.6.14
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.14
@@ -4,9 +4,9 @@ DESCRIPTION=An Portable Open Source UPnP Development Kit
 EAPI=4
 HOMEPAGE=http://pupnp.sourceforge.net/
 IUSE=debug doc ipv6 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.14.tar.bz2
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=926913f11f7ff20ae83512465b8e1e76
+_md5_=8e7de1130542e53bbcad197da673b67f
diff --git a/metadata/md5-cache/net-libs/nodejs-0.8.1 b/metadata/md5-cache/net-libs/nodejs-0.8.1
new file mode 100644
index 000000000000..273787fd874c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+DESCRIPTION=Evented IO for V8 Javascript
+EAPI=3
+HOMEPAGE=http://nodejs.org/
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=http://nodejs.org/dist/v0.8.1/node-v0.8.1.tar.gz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=55c023d6910e65626fdc6a9fc2d1bc60
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2 b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
index 0590bd52ec1e..605c4b33d8dc 100644
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A network programming library in C++
 EAPI=4
 HOMEPAGE=http://alumnit.ca/wiki/?WvStreams
 IUSE=pam doc +ssl +dbus debug
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) dev-libs/openssl:0 pam? ( sys-libs/pam ) virtual/c++-tr1-functional
 RESTRICT=test
 SLOT=0
 SRC_URI=http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=57598ac52513b97c1e02d06e5fb48ef7
+_md5_=2b8c0814679f8af741ba4c5229be0e04
diff --git a/metadata/md5-cache/net-p2p/tribler-5.9.19 b/metadata/md5-cache/net-p2p/tribler-5.9.19
new file mode 100644
index 000000000000..380d64275f34
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/tribler-5.9.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup unpack
+DEPEND=>=dev-python/apsw-3.6 >=dev-python/m2crypto-0.16 dev-python/netifaces >=dev-libs/openssl-0.9.8 >=dev-python/wxpython-2.8 vlc? ( >=media-video/vlc-1.1.0 ) app-arch/unzip =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+DESCRIPTION=Bittorrent client that does not require a website to discover content
+EAPI=4
+HOMEPAGE=http://www.tribler.org/
+IUSE=vlc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/apsw-3.6 >=dev-python/m2crypto-0.16 dev-python/netifaces >=dev-libs/openssl-0.9.8 >=dev-python/wxpython-2.8 vlc? ( >=media-video/vlc-1.1.0 ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+SLOT=0
+SRC_URI=http://dl.tribler.org/tribler_5.9.19-1ubuntu1_all.deb
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1531a78cbf8c552e45e29f65d6055745
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 fe3a946ce474..c10a95ab93c3 100644
--- a/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3
+++ b/metadata/md5-cache/net-wireless/kismet-2011.03.2-r3
@@ -4,10 +4,10 @@ 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 +ruby +suid
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 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
 SRC_URI=http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=041b7c567f85b19fcbd5a6d3bbaa0656
+_md5_=7273a2c977d950bf33f287e2cb6afb27
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index c39cc53aa4bb..874b9cb164eb 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,11 +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
+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 ) 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
+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 )
+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 ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )
 SLOT=0
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	subversion	0dcbf97982a8420280528c5c94e13a13	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=215ebccc37cb43638b563b1d3b7ad710
+_md5_=6d4a75b764a863666ab99923179b6f06
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 f5c4eab03a0c..5622e18bebd5 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r1
@@ -3,9 +3,9 @@ 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
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-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
-_md5_=fd12b230e628f4e031087723a21220a4
+_md5_=9e61a49319327094abafb22f21da867f
diff --git a/metadata/md5-cache/sci-astronomy/idlastro-20120206 b/metadata/md5-cache/sci-astronomy/idlastro-20120206
deleted file mode 100644
index b84733722416..000000000000
--- a/metadata/md5-cache/sci-astronomy/idlastro-20120206
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Astronomical user routines for IDL
-EAPI=4
-HOMEPAGE=http://idlastro.gsfc.nasa.gov/
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=dev-lang/gdl-0.9.2-r1
-SLOT=0
-SRC_URI=http://idlastro.gsfc.nasa.gov//ftp/astron.tar.gz -> idlastro-20120206.tar.gz
-_md5_=4fc96bfad41e1b4d6d2cda2a35f862c9
diff --git a/metadata/md5-cache/sci-astronomy/idlastro-20120502 b/metadata/md5-cache/sci-astronomy/idlastro-20120502
index 430d5f944fe6..c0af3471fc33 100644
--- a/metadata/md5-cache/sci-astronomy/idlastro-20120502
+++ b/metadata/md5-cache/sci-astronomy/idlastro-20120502
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Astronomical user routines for IDL
 EAPI=4
 HOMEPAGE=http://idlastro.gsfc.nasa.gov/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=>=dev-lang/gdl-0.9.2-r1
 SLOT=0
 SRC_URI=http://idlastro.gsfc.nasa.gov//ftp/astron.tar.gz -> idlastro-20120502.tar.gz
-_md5_=bd02f729973667b764f2ea8c1496eabd
+_md5_=846850f9ea1fb5771b70a0e441241f96
diff --git a/metadata/md5-cache/sci-libs/idlmarkwardt-20111221 b/metadata/md5-cache/sci-libs/idlmarkwardt-20120524
similarity index 69%
rename from metadata/md5-cache/sci-libs/idlmarkwardt-20111221
rename to metadata/md5-cache/sci-libs/idlmarkwardt-20120524
index 0c0c3365af38..0cd4f5f5e7d2 100644
--- a/metadata/md5-cache/sci-libs/idlmarkwardt-20111221
+++ b/metadata/md5-cache/sci-libs/idlmarkwardt-20120524
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Craig Marqwardt IDL procedures (MPFIT, CMSVLIB, etc)
 EAPI=4
 HOMEPAGE=http://cow.physics.wisc.edu/~craigm/idl/idl.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 RDEPEND=>=dev-lang/gdl-0.9.2-r1
 SLOT=0
-SRC_URI=http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> idlmarkwardt-20111221.tar.gz
-_md5_=c3bb4fe618b6a700626dc34189273363
+SRC_URI=http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> idlmarkwardt-20120524.tar.gz
+_md5_=f3254ccc66ad1fb9080d17486d4ba6a8
diff --git a/metadata/md5-cache/sci-physics/root-5.34.00 b/metadata/md5-cache/sci-physics/root-5.34.00
index 57edfe70010b..4fe0f9695b05 100644
--- a/metadata/md5-cache/sci-physics/root-5.34.00
+++ b/metadata/md5-cache/sci-physics/root-5.34.00
@@ -12,4 +12,4 @@ REQUIRED_USE=!X? ( !opengl !qt4 !xft ) mpi? ( math !openmp ) openmp? ( math !mpi
 SLOT=0
 SRC_URI=ftp://root.cern.ch/root/root_v5.34.00.source.tar.gz doc? ( ftp://root.cern.ch/root/doc/ROOTUsersGuide.pdf math? ( ftp://root.cern.ch/root/doc/RooFit_Users_Manual_2.91-33.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.03.pdf ) htmldoc? ( http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )
 _eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3baf061f2c362aea4d8618c503d3621a
+_md5_=127ffcd7f495d8ad35940ce56b6f65f8
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.46 b/metadata/md5-cache/sys-apps/moreutils-0.46
index 5ccbdc630878..ccac884c966b 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.46
+++ b/metadata/md5-cache/sys-apps/moreutils-0.46
@@ -4,10 +4,10 @@ DESCRIPTION=a growing collection of the unix tools that nobody thought to write
 EAPI=4
 HOMEPAGE=http://kitenet.net/~joey/code/moreutils/
 IUSE=+doc +perl
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86 ~x86-linux
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/moreutils/moreutils_0.46.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f89a820da41ad037436c2a21fe69aa20
+_md5_=d41430e6fb36db5f2587b9555498b6b1
diff --git a/metadata/md5-cache/sys-apps/renameutils-0.12.0 b/metadata/md5-cache/sys-apps/renameutils-0.12.0
index 6d4d24e87fd5..b56aad194661 100644
--- a/metadata/md5-cache/sys-apps/renameutils-0.12.0
+++ b/metadata/md5-cache/sys-apps/renameutils-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use your favorite text editor to rename files
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/renameutils/
 IUSE=nls
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/readline-5.0-r2
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/renameutils/renameutils-0.12.0.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae26ce5fa26f41f40ec04ade84292220
+_md5_=e4006fb076ab3fc0f7b1d8a14f3f9142
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.6 b/metadata/md5-cache/sys-apps/sandbox-2.6
new file mode 100644
index 000000000000..f5333556988b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sandbox-2.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst preinst test unpack
+DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
+DESCRIPTION=sandbox'd LD_PRELOAD hack
+HOMEPAGE=http://www.gentoo.org/
+IUSE=multilib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd -x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/sandbox-2.6.tar.xz http://dev.gentoo.org/~vapier/dist/sandbox-2.6.tar.xz
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3f19540105396b6a45b0f71e42dd7910
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
index 558958c92ced..860204d64a30 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl debug doc kernel_linux pam policykit selinux test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl sys-apps/coreutils[acl] >=sys-fs/udev-171-r6 !<sys-fs/udev-171-r6[acl] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/ConsoleKit-0.4.5_p20120320.tar.xz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	pam	3f746974e1cc47cabe3bd488c08cdc8e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a963e2fd6a1bf4cd3e2c86be7605a526
+_md5_=8ca0ad685c10250394a59b878102acd9
diff --git a/metadata/md5-cache/sys-devel/dragonegg-3.1 b/metadata/md5-cache/sys-devel/dragonegg-3.1
index 2b98e1680d32..521b1228d817 100644
--- a/metadata/md5-cache/sys-devel/dragonegg-3.1
+++ b/metadata/md5-cache/sys-devel/dragonegg-3.1
@@ -3,10 +3,11 @@ DEPEND=|| ( sys-devel/gcc:4.5[lto] >=sys-devel/gcc-4.6 ) ~sys-devel/llvm-3.1
 DESCRIPTION=GCC plugin that uses LLVM for optimization and code generation
 EAPI=4
 HOMEPAGE=http://dragonegg.llvm.org/
+IUSE=test
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=|| ( sys-devel/gcc:4.5[lto] >=sys-devel/gcc-4.6 ) ~sys-devel/llvm-3.1
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.1/dragonegg-3.1.src.tar.gz test? ( http://llvm.org/releases/3.1/llvm-3.1.src.tar.gz )
 _eclasses_=multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=292284c645bbdea5cb6c3120e1d6b3c0
+_md5_=af98936fe5993e3a6843104221c446bc
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-0.19.11 b/metadata/md5-cache/sys-fs/btrfs-progs-0.19.11
new file mode 100644
index 000000000000..821ac547de65
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-0.19.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs dev-vcs/git
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=4
+HOMEPAGE=https://btrfs.wiki.kernel.org
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
+SLOT=0
+_eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
+_md5_=77505761834b1cd701ceb3c8cb428488
diff --git a/metadata/md5-cache/sys-fs/libfat-0.3a b/metadata/md5-cache/sys-fs/libfat-0.3a
new file mode 100644
index 000000000000..a4e8c2225c5f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/libfat-0.3a
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 sys-fs/fuse virtual/pkgconfig
+DESCRIPTION=Support library to access and manipulate FAT12 / FAT16 / FAT32 file systems
+EAPI=4
+HOMEPAGE=http://libfat.sourceforge.net
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sys-fs/fuse
+SLOT=0
+SRC_URI=mirror://sourceforge/libfat/libfat-0.3a.tar.gz
+_md5_=2a0ec0b09bd0f30883e7caa781b4934f
diff --git a/metadata/md5-cache/sys-fs/udev-171-r6 b/metadata/md5-cache/sys-fs/udev-171-r6
index b38616aa4a70..754c4bd73c87 100644
--- a/metadata/md5-cache/sys-fs/udev-171-r6
+++ b/metadata/md5-cache/sys-fs/udev-171-r6
@@ -4,10 +4,10 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev/udev.html http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary
 IUSE=build selinux test debug +rule_generator hwdb gudev introspection keymap floppy edd action_modeswitch extras
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) extras? ( dev-libs/glib:2 dev-libs/gobject-introspection virtual/libusb:0 ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) action_modeswitch? ( virtual/libusb:0 ) >=sys-apps/util-linux-2.16 !<sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 || ( ( sys-apps/hwids >=sys-apps/pciutils-3.1.9-r2 ) >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] ) ) extras? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper >=sys-apps/baselayout-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/hotplug/udev-171.tar.bz2 test? ( mirror://gentoo/udev-171-testsys.tar.bz2 ) mirror://gentoo/udev-171-gentoo-patchset-v1.tar.bz2 mirror://gentoo/udev-gentoo-scripts-7.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	5782800349f728f725f9378105c6a2ab	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=16c7fcd87f9db2f62cd55df192c55ed5
+_md5_=871080b23c11fe8eb3d8e33e8267b363
diff --git a/metadata/md5-cache/sys-libs/glibc-2.16.0 b/metadata/md5-cache/sys-libs/glibc-2.16.0
new file mode 100644
index 000000000000..421242dddd15
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.16.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig
+DESCRIPTION=GNU libc6 (also called glibc2) C library
+HOMEPAGE=http://www.gnu.org/software/libc/libc.html
+IUSE=debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only
+LICENSE=LGPL-2
+RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0.tar.xz mirror://gnu/glibc/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0-patches-1.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.16.0-patches-1.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.16.0-patches-1.tar.bz2
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1876a7a67d627bd3e9b693312d7ad484
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 53d6502d09f0..364a953fdf52 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=sys-kernel/linux-headers-2.6.9 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
+DEPEND=>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) x86? ( >=sys-devel/gcc-4.3 ) amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) ppc? ( >=sys-devel/gcc-4.1.0 ) ppc64? ( >=sys-devel/gcc-4.1.0 ) >=sys-devel/binutils-2.15.94 >=app-misc/pax-utils-0.1.10 virtual/os-headers !<sys-apps/sandbox-1.2.18.1-r2 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) !vanilla? ( >=sys-libs/timezone-data-2007c ) sys-devel/gnuconfig dev-vcs/git
 DESCRIPTION=GNU libc6 (also called glibc2) C library
 HOMEPAGE=http://www.gnu.org/software/libc/libc.html
-IUSE=debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only
+IUSE=debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only
 LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=953bbd4e1ce8b5e3a7765cd7b1de3a8d
+_eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	unpacker	e1b907c6a72dc4c9025109f3e84129c7	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0e08b073392e5807074850a9f0eba8dd
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.4 b/metadata/md5-cache/sys-libs/ldb-1.1.4
index 819fc7e55b42..6556c91c104a 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.4
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=An LDAP-like embedded database
 EAPI=3
 HOMEPAGE=http://ldb.samba.org
 IUSE=doc
 KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-3
-RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
+RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.4.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	c8866e3643d3746e746026c4b2c3f953
-_md5_=7416b4d8e4e7d2ca9785c976e077988b
+_md5_=e10e905afbbd249b73c52e40058609a8
diff --git a/metadata/md5-cache/sys-process/audit-2.1.3-r1 b/metadata/md5-cache/sys-process/audit-2.1.3-r1
index 983b9f2f39df..df14bf7f082d 100644
--- a/metadata/md5-cache/sys-process/audit-2.1.3-r1
+++ b/metadata/md5-cache/sys-process/audit-2.1.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=3
 HOMEPAGE=http://people.redhat.com/sgrubb/audit/
 IUSE=ldap prelude python
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a8ed266d1c0261dbf71db256dd8dd105
+_md5_=31e17132e1e7ccd3f5a4bc40983b5dec
diff --git a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1 b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
index 07db292d2a3d..77b82276f272 100644
--- a/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
+++ b/metadata/md5-cache/x11-libs/fltk-1.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ user interface toolkit for X and OpenGL
 EAPI=3
 HOMEPAGE=http://www.fltk.org/
 IUSE=cairo debug doc examples games opengl pdf static-libs threads xft xinerama
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=FLTK LGPL-2
 RDEPEND=>=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft )
 SLOT=1
 SRC_URI=mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=06bcf7819bbe0158dc939752c04b6070
+_md5_=1c7a4bb6648fcf7c2bd00c25e67d1a6d
diff --git a/metadata/md5-cache/x11-libs/libxklavier-5.2.1 b/metadata/md5-cache/x11-libs/libxklavier-5.2.1
index 2f2bc5dd858b..9c83ee5729ee 100644
--- a/metadata/md5-cache/x11-libs/libxklavier-5.2.1
+++ b/metadata/md5-cache/x11-libs/libxklavier-5.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for the X Keyboard Extension (high-level API)
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/LibXklavier
 IUSE=doc +introspection
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16 dev-libs/libxml2 x11-apps/xkbcomp x11-libs/libX11 >=x11-libs/libXi-1.1.3 x11-libs/libxkbfile >=x11-misc/xkeyboard-config-2.4.1-r3 introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libxklavier/5.2/libxklavier-5.2.1.tar.xz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a3257f907c10e2a9b34284a467d8965e
+_md5_=e5ac7427a201384c239afc0f48567233
diff --git a/metadata/md5-cache/x11-misc/revelation-0.4.14 b/metadata/md5-cache/x11-misc/revelation-0.4.14
index aa99374e36ec..75f6a9456b94 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.4.14
+++ b/metadata/md5-cache/x11-misc/revelation-0.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=A password manager for GNOME
 EAPI=4
 HOMEPAGE=http://revelation.olasagasti.info/
 IUSE=applet
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk dev-python/pycrypto dev-python/gconf-python dev-python/libgnome-python sys-libs/cracklib[python] applet? ( dev-python/gnome-applets-python dev-python/libbonobo-python ) =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/erikg/revelation/downloads/revelation-0.4.14.tar.xz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=917652acb47b8f74cc6c5fc884ecce30
+_md5_=e5ec1f862b56edd44c9f54517a9d833b
diff --git a/metadata/md5-cache/x11-misc/xosview-1.9.3 b/metadata/md5-cache/x11-misc/xosview-1.9.3
index c0b2fbf98e6b..6485e39ee57b 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.9.3
+++ b/metadata/md5-cache/x11-misc/xosview-1.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=X11 operating system viewer
 EAPI=4
 HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
 IUSE=suid
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.3.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=52707e2c6fdd9eb95529bf0d281065fd
+_md5_=19621349bc4ae5bb559fac0e4346cc3a
diff --git a/metadata/md5-cache/x11-misc/xplanet-1.3.0 b/metadata/md5-cache/x11-misc/xplanet-1.3.0
index a6fed30eca53..fc657015c70c 100644
--- a/metadata/md5-cache/x11-misc/xplanet-1.3.0
+++ b/metadata/md5-cache/x11-misc/xplanet-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Render images of the earth into the X root window
 EAPI=4
 HOMEPAGE=http://xplanet.sourceforge.net/
 IUSE=gif jpeg png tiff truetype X
-KEYWORDS=~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 media-libs/netpbm ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 x11-libs/pango ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://sourceforge/xplanet/xplanet-1.3.0.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e8c0b7cb97efc3a37c0bc79861ecc245
+_md5_=146961bddda8449a61e7129cf6f290bb
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
index 0749d23ee4ff..ac54cd3718b8 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Load monitoring dockapp displaying dancing flame.
 EAPI=4
 HOMEPAGE=http://www.swanson.ukfsn.org/#wmfire
 IUSE=session
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
 _eclasses_=autotools	9d170f07df0e48055093b8c6a60d0fba	eutils	327b713e2d6949c42cd96bc4898fd280	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5782800349f728f725f9378105c6a2ab	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fd6c117d628c45c8c457ad1a6a2173d7
+_md5_=fb48707dde438b5c58c67d79a3e8665b
diff --git a/metadata/md5-cache/x11-plugins/wmnd-0.4.16 b/metadata/md5-cache/x11-plugins/wmnd-0.4.16
index 9dd59ddd38d1..b9610ee828c1 100644
--- a/metadata/md5-cache/x11-plugins/wmnd-0.4.16
+++ b/metadata/md5-cache/x11-plugins/wmnd-0.4.16
@@ -4,9 +4,9 @@ DESCRIPTION=WindowMaker Network Devices (dockapp)
 EAPI=4
 HOMEPAGE=http://www.thregr.org/~wavexx/software/wmnd/
 IUSE=snmp
-KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm snmp? ( >=net-analyzer/net-snmp-5.2.1 )
 SLOT=0
 SRC_URI=http://www.thregr.org/~wavexx/software/wmnd/releases/wmnd-0.4.16.tar.gz
-_md5_=138f720b3ed2a5020007b51b5996beff
+_md5_=441c9ed5a926e69ff4701bc17cb445a9
diff --git a/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1 b/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
index ee14ccd2e60f..2bf1dd7a2c48 100644
--- a/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmtop-0.9.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-proto/xproto x11-pro
 DESCRIPTION=dockapp for monitoring the top three processes using cpu or memory.
 EAPI=4
 HOMEPAGE=http://www.swanson.ukfsn.org/#wmtop
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.swanson.ukfsn.org/wmdock/wmtop-0.9.0.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ac2b1ebc914363394d6fdb6a4283b9f
+_md5_=d2abce6c807ca196b16229691f51c819
diff --git a/metadata/md5-cache/x11-plugins/wmweather+-2.13 b/metadata/md5-cache/x11-plugins/wmweather+-2.13
index 2c7b9ea7b6af..3fd221ebd3b7 100644
--- a/metadata/md5-cache/x11-plugins/wmweather+-2.13
+++ b/metadata/md5-cache/x11-plugins/wmweather+-2.13
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext
 DESCRIPTION=A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts
 EAPI=4
 HOMEPAGE=http://www.sourceforge.net/projects/wmweatherplus/
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~mips ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-wm/windowmaker
 SLOT=0
 SRC_URI=mirror://sourceforge/wmweatherplus/wmweather+-2.13.tar.gz
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=95f394cb1a971df99723571af658d469
+_md5_=a7aaa12fb8fd454015aa0f27d6ea466c
diff --git a/metadata/md5-cache/x11-terms/roxterm-2.6.3 b/metadata/md5-cache/x11-terms/roxterm-2.6.3
index ddea14880953..8171b7b8e0d4 100644
--- a/metadata/md5-cache/x11-terms/roxterm-2.6.3
+++ b/metadata/md5-cache/x11-terms/roxterm-2.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=A terminal emulator designed to integrate with the ROX environment
 EAPI=4
 HOMEPAGE=http://roxterm.sourceforge.net/
 IUSE=nls
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90
 SLOT=0
 SRC_URI=mirror://sourceforge/roxterm/roxterm-2.6.3.tar.bz2
 _eclasses_=gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	5782800349f728f725f9378105c6a2ab	python	4152846e243ec207de8a1b02a36f1461	toolchain-funcs	e575dd4d4682fc3539829c52d8382856
-_md5_=009ce4277eb9c0c615aa154f8e17ad87
+_md5_=365d9b27fcb1584a761520c582cedd8b
diff --git a/metadata/md5-cache/x11-themes/bespin-0_p20120703 b/metadata/md5-cache/x11-themes/bespin-0_p20120703
new file mode 100644
index 000000000000..4a26b29968ee
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/bespin-0_p20120703
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A KDE4 follow-up to Baghira KDE Theme Engine, which resembles Mac OS X
+EAPI=4
+HOMEPAGE=http://cloudcity.sourceforge.net/
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://dev.gentoo.org/~creffett/distfiles/bespin-0_p20120703.tar.xz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	327b713e2d6949c42cd96bc4898fd280	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	e196990f8d775154a1f64d9f9f4d9d28	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=3a504799c3a196fe9b54faf2ec85d29e
diff --git a/metadata/md5-cache/x11-wm/jwm-2.1.0 b/metadata/md5-cache/x11-wm/jwm-2.1.0
index cdecbedb1521..76ec71bd9edc 100644
--- a/metadata/md5-cache/x11-wm/jwm-2.1.0
+++ b/metadata/md5-cache/x11-wm/jwm-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Very fast and lightweight still powerful window manager for X
 EAPI=4
 HOMEPAGE=http://joewing.net/programs/jwm/
 IUSE=bidi debug jpeg png truetype xinerama xpm
-KEYWORDS=amd64 hppa ~ppc x86
+KEYWORDS=amd64 hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=xpm? ( x11-libs/libXpm ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXext x11-libs/libXrender x11-libs/libXau x11-libs/libXdmcp truetype? ( x11-libs/libXft ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) bidi? ( dev-libs/fribidi ) dev-libs/expat
 SLOT=0
 SRC_URI=http://joewing.net/programs/jwm/releases/jwm-2.1.0.tar.bz2
 _eclasses_=eutils	327b713e2d6949c42cd96bc4898fd280	multilib	5782800349f728f725f9378105c6a2ab	toolchain-funcs	e575dd4d4682fc3539829c52d8382856	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=904cda631b64645c9f8715321c3b8c47
+_md5_=7670522546be15219f47317f68039438
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9965ec07ed0b..a4355e4b435c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jul 2012 16:37:33 +0000
+Wed, 04 Jul 2012 03:37:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 38aade6651e0..eca68a24cf10 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul  3 16:37:31 UTC 2012
+Wed Jul  4 03:37:52 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f401bb5deb7c..237e3ae4aa0f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jul 2012 17:00:01 +0000
+Wed, 04 Jul 2012 04:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b4c06d01a2cd..e2fe126cc934 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1341333301 Tue Jul  3 16:35:01 2012 UTC
+1341372901 Wed Jul  4 03:35:01 2012 UTC
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index 7225a2c42cf1..5904949fbea9 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,3 +1,4 @@
 DIST check_ipmi_sensor_v1.3.tar.gz 19009 RMD160 f928fbe867855892b854db11f128ef11ed006528 SHA1 7414aae19f6f597599d0612363f310dcfc48f0a7 SHA256 934e7df23d0e6a0e3916a9b328b39c6d382c16798627fd334e48c08fa77de01e
 DIST check_ipmi_sensor_v2.2.tar.gz 17266 RMD160 0cd2fa0b19f9332ae659829435d26158af75545c SHA1 37abf1af3caaf877577b721a43ff2b22a56b7c72 SHA256 0d32da4910ffe2475136a19b5536cf699c0840bde1c9b48005ab1c157aefcd03
 DIST check_ipmi_sensor_v2.3.tar.gz 18378 RMD160 643c4633a44cb8701ad9df7fa63934ac2317399a SHA1 beee2b1df7cd4855aaa2ce4c91ddfe8e88d5b255 SHA256 b9a2d2a7a8e99f805d6449253bc20ff391357120d1ef69336c9e365455ec9f68
+DIST check_ipmi_sensor_v3.1.tar.gz 19135 RMD160 fe2c3406fac3bc370e88d086c2f9b445c7b01115 SHA1 a43d6beeb0eba500d2c59fcb04ac9fec6dc14f5d SHA256 ca029bc2be34fbe56c49c681dc8bef7bae02a7a2b38644cb909912f7256e1151
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
new file mode 100644
index 000000000000..137dff5e50b9
--- /dev/null
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild,v 1.1 2012/07/03 18:52:13 idl0r Exp $
+
+EAPI=4
+
+inherit multilib
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN#nagios-}_v${MY_PV}"
+
+DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
+HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
+SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/IPC-Run
+	sys-libs/freeipmi"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe check_ipmi_sensor
+
+	dodoc changelog.txt
+}
diff --git a/net-analyzer/netperf/netperf-2.5.0-r1.ebuild b/net-analyzer/netperf/netperf-2.5.0-r1.ebuild
index 4dfe2a6d8899..45fe99c765ff 100644
--- a/net-analyzer/netperf/netperf-2.5.0-r1.ebuild
+++ b/net-analyzer/netperf/netperf-2.5.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/net-analyzer/netperf/netperf-2.5.0-r1.ebuild,v 1.5 2012/06/13 06:09:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.5.0-r1.ebuild,v 1.6 2012/07/03 20:34:30 jer Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ inherit eutils
 
 DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-dns/libidn/libidn-1.25.ebuild b/net-dns/libidn/libidn-1.25.ebuild
index 696baba189a0..13768b0c62e0 100644
--- a/net-dns/libidn/libidn-1.25.ebuild
+++ b/net-dns/libidn/libidn-1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.25.ebuild,v 1.3 2012/06/30 21:58:56 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.25.ebuild,v 1.4 2012/07/03 20:02:18 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
index 7f636542007a..53fa4d196493 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.9 2012/07/03 16:22:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.10 2012/07/03 19:43:01 jer Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
 HOMEPAGE="http://www.pureftpd.org/"
diff --git a/net-libs/gupnp/gupnp-0.18.3.ebuild b/net-libs/gupnp/gupnp-0.18.3.ebuild
index 8dc9db1c56e5..fe8930dff9f1 100644
--- a/net-libs/gupnp/gupnp-0.18.3.ebuild
+++ b/net-libs/gupnp/gupnp-0.18.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.18.3.ebuild,v 1.1 2012/06/30 12:57:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.18.3.ebuild,v 1.2 2012/07/03 20:13:43 jer Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gupnp.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="connman +introspection kernel_linux networkmanager"
 
 RDEPEND=">=net-libs/gssdp-0.11.2[introspection?]
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index c46308bb16f7..8c107317b406 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.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/liblockfile/liblockfile-1.09.ebuild,v 1.12 2012/06/07 21:45:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/liblockfile-1.09.ebuild,v 1.13 2012/07/03 19:52:26 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/libupnp/libupnp-1.6.14.ebuild b/net-libs/libupnp/libupnp-1.6.14.ebuild
index fd150f9482a0..6f3821d507d8 100644
--- a/net-libs/libupnp/libupnp-1.6.14.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.14.ebuild,v 1.2 2012/05/29 15:14:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.14.ebuild,v 1.3 2012/07/04 03:18:16 jdhore Exp $
 
 EAPI="4"
 WANT_AUTOMAKE=1.9
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc ipv6 static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index dea73c4ca05c..35f21ffe62ff 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1 +1,2 @@
 DIST node-v0.8.0.tar.gz 11829547 RMD160 acf06bbaa5fe6e707e60c719f27a7a4f9f041172 SHA1 5171fb46fbfee5ac7129c4b17207a3f35a1f57e8 SHA256 ecafca018b5109a28537633d0433d513f68b1bae7191a1821e8eaa84ccf128ee
+DIST node-v0.8.1.tar.gz 11806425 RMD160 56fa65d05ef01b7d290345b4f0bd85ffc960b497 SHA1 892790553b8121ba8624d8293d0cb7d8b01094d7 SHA256 0cda1325a010ce18f68501ae68e0ce97f0094e7a282c34a451f552621643a884
diff --git a/net-libs/nodejs/nodejs-0.8.1.ebuild b/net-libs/nodejs/nodejs-0.8.1.ebuild
new file mode 100644
index 000000000000..61350cbcc787
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.8.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.1.ebuild,v 1.1 2012/07/04 02:22:57 patrick Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python eutils pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.11.10
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# fix compilation on Darwin
+	# http://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+	# Hardcoded braindamage extraction helper
+	sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+}
+
+src_configure() {
+	# this is an autotools lookalike confuserator
+	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	# there are no words to describe the epic idiocy of ...
+	# NOT using make but a JavaScript thingy to try to install things ... to the wrong place
+	# WHY U NO MAEK SENSE?!
+	#emake DESTDIR="${D}" install || die
+
+	mkdir -p "${ED}"/usr/include/node
+	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/lib/node_modules/npm
+	mkdir -p "${ED}"/lib/node
+	cp 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp 'deps/uv/include/ares.h' 'deps/uv/include/ares_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+	cp -R deps/npm/* "${ED}"/lib/node_modules/npm || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/lib/node/ || die "Failed to copy stuff"
+	cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
+
+	# now add some extra stupid just because we can
+	# needs to be a symlink because of hardcoded paths ... no es bueno!
+	dosym /lib/node_modules/npm/bin/npm-cli.js /bin/npm
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	emake test || die
+}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
index fa1bda875c31..30d604981e69 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-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-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.5 2012/06/21 02:03:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.6 2012/07/03 19:34:06 jer Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic toolchain-funcs versionator
@@ -11,7 +11,7 @@ SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~sparc x86"
 IUSE="pam doc +ssl +dbus debug"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index 074b0826c10f..7387d81a97e3 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -4,3 +4,4 @@ DIST tribler_5.9.14-1ubuntu1_all.deb 2795918 RMD160 30dc964aed51e62ba901050085cb
 DIST tribler_5.9.15-1ubuntu1_all.deb 2796398 RMD160 785a8973c136d2a2c96b02e890510a632fa98750 SHA1 18163b98ea32c56af5a96b8dfb325065062d2605 SHA256 d1f58f0bfc58ca97f5ebb770b831185653591197fb083c63434a4e5723f656ff
 DIST tribler_5.9.17-1ubuntu1_all.deb 5879150 RMD160 15e9fda75a13b670ef4a49ef824fdf67ab125f15 SHA1 c219c0efb253b12b81a59ce8cf2a10533724555e SHA256 b287c011e76fffb54fbd9230efff64202c1fc803ade9173ed9a9634d675bbd70
 DIST tribler_5.9.18-1ubuntu1_all.deb 5879216 RMD160 ca98d1da35732e478d2ed30aa028656a679bc32d SHA1 8555a2df3e64fe778cf9877ba6595cf6f5d68bdf SHA256 0b91e2348ff02e8a2bc5e32ea19b64287b37559fd740f12ea5a9b07e5064a0f5
+DIST tribler_5.9.19-1ubuntu1_all.deb 5879404 RMD160 f779707c05743db7c12b8a305a9631242819608b SHA1 0aad65d2c3b9af78380cf8dbdf5ddb64a5bf999f SHA256 7c6c0e167ada3fc45402ab8989d21b7d12e36c0c6f240d725a752927d7436893
diff --git a/net-p2p/tribler/tribler-5.9.19.ebuild b/net-p2p/tribler/tribler-5.9.19.ebuild
new file mode 100644
index 000000000000..044e80c19c2d
--- /dev/null
+++ b/net-p2p/tribler/tribler-5.9.19.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.19.ebuild,v 1.1 2012/07/03 21:19:02 blueness Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python
+
+MY_PV="${PN}_${PV}-1ubuntu1_all"
+
+DESCRIPTION="Bittorrent client that does not require a website to discover content"
+HOMEPAGE="http://www.tribler.org/"
+SRC_URI="http://dl.tribler.org/${MY_PV}.deb"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vlc"
+
+RDEPEND="
+	>=dev-python/apsw-3.6
+	>=dev-python/m2crypto-0.16
+	dev-python/netifaces
+	>=dev-libs/openssl-0.9.8
+	>=dev-python/wxpython-2.8
+	vlc? ( >=media-video/vlc-1.1.0 )"
+
+# Skipping for now:
+# xulrunner-sdk >= 1.9.1.5 < 1.9.2 (optional, to run SwarmTransport)
+# 7-Zip >= 4.6.5 (optional, to build SwarmTransport)
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./data.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
+	epatch "${FILESDIR}/${PN}-log2homedir.patch"
+
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() { :; }
+
+src_install() {
+	#Rename the doc dir properly
+	mv usr/share/doc/${PN} usr/share/doc/${P}
+
+	#Move the readme to the doc dir
+	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
+
+	#Remove the licenses scattered throughout
+	rm usr/share/doc/${P}/copyright
+	rm usr/share/${PN}/Tribler/*.txt
+	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
+
+	#Copy the rest over
+	cp -pPR usr/ "${ED}"/
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"usr/share/${PN}
+}
diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
index 4ba2a50e3962..ec8df438a06c 100644
--- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
+++ b/net-wireless/kismet/kismet-2011.03.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/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.4 2012/06/13 08:07:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.5 2012/07/03 16:37:15 ranger Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc x86"
+	KEYWORDS="amd64 ~arm ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index fefc897dfa51..a2bd2843723b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-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/net-wireless/kismet/kismet-9999.ebuild,v 1.2 2012/06/13 00:51:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.3 2012/07/03 20:37:56 zerochaos Exp $
 
 EAPI=4
 
@@ -24,10 +24,8 @@ 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"
+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 )
@@ -37,10 +35,7 @@ RDEPEND="net-wireless/wireless-tools
 	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-btscan? ( net-wireless/bluez )
 	plugin-dot15d4? ( virtual/libusb:0 )
 	plugin-spectools? ( net-wireless/spectools )"
 
diff --git a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
index ebfc1b95f3ea..e713d9feca4d 100644
--- a/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.6 2012/06/13 07:51:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r1.ebuild,v 1.7 2012/07/03 16:33:32 ranger Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 		KEYWORDS=""
 else
 		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-		KEYWORDS="amd64 ~arm ~ppc x86"
+		KEYWORDS="amd64 ~arm ppc x86"
 fi
 
 DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
diff --git a/profiles/arch/amd64/x32/package.keywords b/profiles/arch/amd64/x32/package.keywords
index 37ea67eeef3a..a03dcf4332c9 100644
--- a/profiles/arch/amd64/x32/package.keywords
+++ b/profiles/arch/amd64/x32/package.keywords
@@ -1,11 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.keywords,v 1.2 2012/06/05 18:44:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.keywords,v 1.6 2012/07/03 20:08:44 vapier Exp $
 
 # We need newer versions of toolchain packages.
+~sys-apps/sandbox-2.6 amd64
 ~sys-devel/binutils-2.22 amd64
 ~sys-devel/gcc-4.7.0 amd64
 <sys-devel/gdb-7.8 amd64
-~sys-kernel/linux-headers-3.4 amd64
-~sys-libs/glibc-2.15 amd64
-~dev-util/strace-4.7 amd64
+~sys-libs/glibc-2.16.0 amd64
diff --git a/profiles/arch/amd64/x32/packages b/profiles/arch/amd64/x32/packages
index e563e5565f0b..937a9c67f869 100644
--- a/profiles/arch/amd64/x32/packages
+++ b/profiles/arch/amd64/x32/packages
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/packages,v 1.2 2012/05/25 17:31:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/packages,v 1.5 2012/07/03 20:07:20 vapier Exp $
 
 # Min versions that included x32 support
+>=sys-apps/sandbox-2.6
 >=sys-devel/binutils-2.22
 >=sys-kernel/linux-headers-3.4
->=sys-libs/glibc-2.15
+>=sys-libs/glibc-2.16.0
 >=sys-devel/gcc-4.7.0
+>=dev-util/strace-4.7
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 8b7f7b195e3e..ebaa4f86f38b 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.105 2012/06/29 16:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.106 2012/07/03 20:12:36 jer Exp $
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
+# Jeroen Roovers <jer@gentoo.org> (3 Jul 2012)
+# Mask USE=connman for net-libs/gupnp (bug #424225)
+net-libs/gupnp connman
+
 # Jeroen Roovers <jer@gentoo.org> (21 May 2012)
 # HPPA is an unsupported architecture
 dev-libs/libpcre jit
diff --git a/profiles/package.mask b/profiles/package.mask
index 2088cdc20f0e..9ef6248380a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13920 2012/07/03 15:29:06 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13922 2012/07/04 03:28:29 patrick 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,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrick Lauer <patrick@gentoo.org> (4 Jul 2012)
+# Dysfunctional version with no will to do anything useful
+=net-fs/cifs-utils-5.5
+
 # Ben de Groot <yngwin@gentoo.org> (3 Jul 2012)
 # Dead upstream. Doesn't compile with current kernels.
 # Removal in 30 days.
@@ -48,14 +52,6 @@ www-apps/zina
 # Removal in 30 days
 dev-python/sexy-python
 
-# Joe Peterson <lavajoe@gentoo.org> (02 Jul 2012)
-# This old version has become out of sync with kernel btrfs, so is dangerous
-# (except for those who have an older kernel and know what they are doing).
-# Use of the live build (btrfs-progs-9999) is recommended, since no upstream
-# versioning is available, and the live build keeps pace with new kernels.
-# See bug #420477
-=sys-fs/btrfs-progs-0.19*
-
 # Markos Chandras <hwoarang@gentoo.org> (02 Jul 2012)
 # Mask rc release for testing
 =net-p2p/qbittorrent-3.0.0_rc*
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c3c77bd612f1..6e5de4ad1d5a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1751,6 +1751,7 @@ dev-util/kdevplatform:reviewboard - Enable reviewboard support
 dev-util/metro:ccache - Enable support for ccache
 dev-util/metro:git - Enable support for git snapshots
 dev-util/metro:threads - Enable support for pbzip2 tarball packing/unpacking
+dev-util/monkeystudio:plugins - Build and install additional plugins
 dev-util/monodevelop:git - Enable Git version control support
 dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex.
 dev-util/nsis:config-log - Enable the logging facility (useful in debugging installers)
@@ -5367,6 +5368,7 @@ sys-kernel/zen-sources:tuxonice - Apply TuxOnIce kernel patches advanced hiberna
 sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
 sys-libs/gdbm:exporter - enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9
 sys-libs/glibc:linuxthreads - Build linuxthreads support (only for kernels older than linux-2.6)
+sys-libs/glibc:systemtap - enable systemtap static probe points
 sys-libs/gwenhywfar:fox - Use x11-libs/fox graphical toolkit
 sys-libs/libosinfo:introspection - Use dev-libs/gobject-introspection for introspection
 sys-libs/libosinfo:vala - Enable bindings for dev-lang/vala
diff --git a/sci-astronomy/idlastro/Manifest b/sci-astronomy/idlastro/Manifest
index 61ff5a36df82..f3399088383c 100644
--- a/sci-astronomy/idlastro/Manifest
+++ b/sci-astronomy/idlastro/Manifest
@@ -1,2 +1 @@
-DIST idlastro-20120206.tar.gz 1336433 RMD160 69d4d136122f337c503725368e3d3a9c7adae4da SHA1 1d107458299da4853a5b77bb5c6e29bf7bed269a SHA256 86f74f704e905a63f33987cd2dd0a58d115b70d820586513b251d3f88d5cd7cf
 DIST idlastro-20120502.tar.gz 1347123 RMD160 8cbe45e1a0d51cb5f428bd69ba0c47b0a0c943b8 SHA1 a5c28cac3da32bb44111dabd58e0ccc2aa4aa742 SHA256 7bc02523651c9744397d6c1a6f9a88a2913d88bb45f9af16e24a0ebe1e90ede0
diff --git a/sci-astronomy/idlastro/idlastro-20120206.ebuild b/sci-astronomy/idlastro/idlastro-20120206.ebuild
deleted file mode 100644
index 80ecf09ce09a..000000000000
--- a/sci-astronomy/idlastro/idlastro-20120206.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/idlastro/idlastro-20120206.ebuild,v 1.1 2012/02/15 16:58:40 bicatali Exp $
-
-EAPI=4
-
-DESCRIPTION="Astronomical user routines for IDL"
-HOMEPAGE="http://idlastro.gsfc.nasa.gov/"
-SRC_URI="${HOMEPAGE}/ftp/astron.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=">=dev-lang/gdl-0.9.2-r1"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/gnudatalanguage/${PN}
-	doins -r pro/*
-	dodoc *txt text/*
-}
diff --git a/sci-astronomy/idlastro/idlastro-20120502.ebuild b/sci-astronomy/idlastro/idlastro-20120502.ebuild
index 0acfe210e7fa..017546c9a99d 100644
--- a/sci-astronomy/idlastro/idlastro-20120502.ebuild
+++ b/sci-astronomy/idlastro/idlastro-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/sci-astronomy/idlastro/idlastro-20120502.ebuild,v 1.1 2012/05/11 17:12:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/idlastro/idlastro-20120502.ebuild,v 1.2 2012/07/03 22:19:06 bicatali Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/ftp/astron.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-lang/gdl-0.9.2-r1"
diff --git a/sci-libs/idlmarkwardt/Manifest b/sci-libs/idlmarkwardt/Manifest
index 56cda98e5efd..1b055e7addb1 100644
--- a/sci-libs/idlmarkwardt/Manifest
+++ b/sci-libs/idlmarkwardt/Manifest
@@ -1 +1 @@
-DIST idlmarkwardt-20111221.tar.gz 697197 RMD160 96a7709ff9e9700ff06e989a53d8668be4f05f6c SHA1 629e8858b54530f593a9a71d24c84e015fe1aa08 SHA256 2c44af0642e371f25d8108a22de81322bb0ff6079cc540f4197fd0d980b77c91
+DIST idlmarkwardt-20120524.tar.gz 698483 RMD160 f94c4101eaae0c8b70110d4167d255c2d9f0a38e SHA1 976c480bde65004a5247c6aa17131dd068c85d13 SHA256 9ed7303c61f78a1a02e508eff9bd841e20235681433d291a36737b918845fc62
diff --git a/sci-libs/idlmarkwardt/idlmarkwardt-20111221.ebuild b/sci-libs/idlmarkwardt/idlmarkwardt-20120524.ebuild
similarity index 83%
rename from sci-libs/idlmarkwardt/idlmarkwardt-20111221.ebuild
rename to sci-libs/idlmarkwardt/idlmarkwardt-20120524.ebuild
index 9435d17ee445..c1770ae0f553 100644
--- a/sci-libs/idlmarkwardt/idlmarkwardt-20111221.ebuild
+++ b/sci-libs/idlmarkwardt/idlmarkwardt-20120524.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/idlmarkwardt/idlmarkwardt-20111221.ebuild,v 1.1 2012/02/01 18:22:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/idlmarkwardt/idlmarkwardt-20120524.ebuild,v 1.1 2012/07/03 22:26:19 bicatali Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> ${P}.tar
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-lang/gdl-0.9.2-r1"
diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index 76e43de553ee..faff57df347e 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.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-physics/root/root-5.34.00.ebuild,v 1.2 2012/06/28 17:02:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.3 2012/07/03 18:58:04 jlec Exp $
 
 EAPI=4
 
@@ -116,6 +116,7 @@ S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	python_set_active_version 2
 	python_pkg_setup
 	echo
 	elog "There are extra options on packages not yet in Gentoo:"
diff --git a/sys-apps/moreutils/moreutils-0.46.ebuild b/sys-apps/moreutils/moreutils-0.46.ebuild
index 4fb277091df1..8e1002792285 100644
--- a/sys-apps/moreutils/moreutils-0.46.ebuild
+++ b/sys-apps/moreutils/moreutils-0.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.46.ebuild,v 1.3 2012/06/30 20:59:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.46.ebuild,v 1.4 2012/07/03 20:03:59 jer Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/renameutils/renameutils-0.12.0.ebuild b/sys-apps/renameutils/renameutils-0.12.0.ebuild
index c789d6ad1b4f..260591cc6c56 100644
--- a/sys-apps/renameutils/renameutils-0.12.0.ebuild
+++ b/sys-apps/renameutils/renameutils-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/renameutils-0.12.0.ebuild,v 1.4 2012/06/17 19:57:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/renameutils-0.12.0.ebuild,v 1.5 2012/07/03 16:43:49 ranger Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.nongnu.org/renameutils/"
 SRC_URI="http://savannah.nongnu.org/download/renameutils/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 DEPEND=">=sys-libs/readline-5.0-r2"
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 9d5ad49f19dd..ccf889a88871 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,3 +2,4 @@ DIST sandbox-1.6.tar.lzma 307014 RMD160 abdcfbbf137304f87c2cb184a4650bf652555ef6
 DIST sandbox-2.3.tar.xz 344260 RMD160 929485e4fb51737dc2fc1fe656efc505c3b78eec SHA1 c1eff87f4f608aa613a6905d2111790ac57fe091 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5
 DIST sandbox-2.4.tar.xz 344664 RMD160 43593c13c27881ebe17ae47c6ea0c40870f8351c SHA1 8d8b7ccc61baa881a90071c4cdc533f6918d21f4 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e
 DIST sandbox-2.5.tar.xz 355680 RMD160 f6eb0d681d5280c6ced5cd6bfd4da74e25ce129f SHA1 bfa2456d3a8b9f35b460f733b97a1fe7f00c5ca5 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a
+DIST sandbox-2.6.tar.xz 366356 RMD160 6e8040c95a74112759241c46bd112594996a28d3 SHA1 b795c68212d0d38f99b1ba26584b550755802319 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d
diff --git a/sys-apps/sandbox/sandbox-2.6.ebuild b/sys-apps/sandbox/sandbox-2.6.ebuild
new file mode 100644
index 000000000000..664545ff880c
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6.ebuild,v 1.1 2012/07/03 19:49:46 vapier Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd -x86-fbsd"
+IUSE="multilib"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+EMULTILIB_PKG="true"
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+}
+
+sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
+
+sb_foreach_abi() {
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Running $1 for ABI=${ABI}..."
+		"$@"
+	done
+	ABI=${OABI}
+}
+
+sb_configure() {
+	mkdir "${WORKDIR}/build-${ABI}"
+	cd "${WORKDIR}/build-${ABI}"
+
+	use multilib && multilib_toolchain_setup ${ABI}
+
+	einfo "Configuring sandbox for ABI=${ABI}..."
+	ECONF_SOURCE="../${P}/" \
+	econf ${myconf} || die
+}
+
+sb_compile() {
+	emake || die
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	# Run configures in parallel!
+	multijob_init
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		multijob_child_init sb_configure
+	done
+	ABI=${OABI}
+	multijob_finish
+
+	sb_foreach_abi sb_compile
+}
+
+sb_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+}
+
+src_test() {
+	sb_foreach_abi sb_test
+}
+
+sb_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /etc/sandbox.d #333131
+	doins etc/sandbox.d/00default || die
+}
+
+src_install() {
+	sb_foreach_abi sb_install
+
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${D}"/var/log/sandbox
+	chmod 0770 "${D}"/var/log/sandbox
+
+	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+	if [[ -n ${old} ]] ; then
+		elog "Removing old sandbox libraries for you:"
+		elog ${old//${ROOT}}
+		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
+	fi
+}
+
+pkg_postinst() {
+	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
+}
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
index 851b262971f7..b77054159f2a 100644
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild,v 1.10 2012/06/30 10:35:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild,v 1.11 2012/07/03 19:24:35 jer Exp $
 
 EAPI=4
 inherit autotools eutils linux-info pam systemd
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="acl debug doc kernel_linux pam policykit selinux test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/sys-devel/dragonegg/dragonegg-3.1.ebuild b/sys-devel/dragonegg/dragonegg-3.1.ebuild
index 52b4aa587028..7695c4146cf3 100644
--- a/sys-devel/dragonegg/dragonegg-3.1.ebuild
+++ b/sys-devel/dragonegg/dragonegg-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/dragonegg/dragonegg-3.1.ebuild,v 1.2 2012/07/03 13:57:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.1.ebuild,v 1.3 2012/07/04 00:32:46 mr_bones_ Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
+IUSE="test"
 
 DEPEND="|| ( sys-devel/gcc:4.5[lto]
 		>=sys-devel/gcc-4.6 )
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
new file mode 100644
index 000000000000..faceae1ed1c1
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.11.ebuild,v 1.1 2012/07/03 18:12:38 lavajoe Exp $
+
+EAPI=4
+
+inherit git-2 toolchain-funcs
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	sys-apps/acl
+	sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
+	https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
+EGIT_COMMIT="1957076ab4fefa47b6efed3da541bc974c83eed7"
+
+src_prepare() {
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile || die
+	sed -i -e 's:make:$(MAKE):' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix=/usr bindir=/sbin mandir=/usr/share/man install
+}
+
+pkg_postinst() {
+	ewarn "WARNING: This version of btrfs-progs corresponds to and should only"
+	ewarn "         be used with the version of btrfs included in the"
+	ewarn "         Linux kernel (2.6.31 and above)."
+	ewarn ""
+	ewarn "         This version should NOT be used with earlier versions"
+	ewarn "         of the standalone btrfs module!"
+}
diff --git a/sys-fs/libfat/Manifest b/sys-fs/libfat/Manifest
new file mode 100644
index 000000000000..964f155f4a20
--- /dev/null
+++ b/sys-fs/libfat/Manifest
@@ -0,0 +1 @@
+DIST libfat-0.3a.tar.gz 384923 RMD160 eb199c2202ebc70e44e1742a0fe367142c2c1d1c SHA1 a495c95fce50facf16919bf5729e4bfef98f8966 SHA256 42f7d74df7e516d602ae70576be9d829f2e217dd2245ac1ea7b26bb7b300734a
diff --git a/sys-fs/libfat/libfat-0.3a.ebuild b/sys-fs/libfat/libfat-0.3a.ebuild
new file mode 100644
index 000000000000..dc8a2e978c29
--- /dev/null
+++ b/sys-fs/libfat/libfat-0.3a.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/sys-fs/libfat/libfat-0.3a.ebuild,v 1.1 2012/07/03 21:24:11 vapier Exp $
+
+EAPI="4"
+
+DESCRIPTION="Support library to access and manipulate FAT12 / FAT16 / FAT32 file systems"
+HOMEPAGE="http://libfat.sourceforge.net"
+SRC_URI="mirror://sourceforge/libfat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/fuse-umfuse-fat-0.1
diff --git a/sys-fs/libfat/metadata.xml b/sys-fs/libfat/metadata.xml
new file mode 100644
index 000000000000..f9fc195403ed
--- /dev/null
+++ b/sys-fs/libfat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+ <description>make whatever changes you want</description>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-fs/udev/udev-171-r6.ebuild b/sys-fs/udev/udev-171-r6.ebuild
index 27c2e5958fcb..45e19e67ca89 100644
--- a/sys-fs/udev/udev-171-r6.ebuild
+++ b/sys-fs/udev/udev-171-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r6.ebuild,v 1.5 2012/05/28 18:11:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r6.ebuild,v 1.6 2012/07/03 19:23:42 jer Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd l
 
 if [[ ${PV} != "9999" ]]
 then
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
 			 test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 70fb1c948b1c..b4bebc56c670 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,6 +17,8 @@ DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc
 DIST glibc-2.15-patches-13.tar.bz2 154658 RMD160 bd1f45c349e4021ea00cd9de4c3f3212a50f01d9 SHA1 fbc45542d46790860d671497fec690c2c11578a9 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53
 DIST glibc-2.15-patches-18.tar.bz2 173777 RMD160 405ec8cfa29810800fbc2cd768586c177735edc6 SHA1 9534adcc57fe8f3298fdd4fadc213afa30a809af SHA256 1945d4dfbf3be4fc445391f6cedfca6e3f305e277493ddd0ccee020e37a05c28
 DIST glibc-2.15.tar.xz 10280176 RMD160 29afafcb61f5842b6b458e322a004aac06dbf6df SHA1 0a7936be3bd0562b076b95dacb7c9daa3dbc83fc SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50
+DIST glibc-2.16.0-patches-1.tar.bz2 88810 RMD160 2840da906c3136959f4ba9c338464b6f3a711054 SHA1 2adae9d9b66fe26cbe71b4182fc8f0b6d8580fa7 SHA256 420294dd335fe4a1b518c285f7034f4e154449fa41a7054377e23076c18e7dc6
+DIST glibc-2.16.0.tar.xz 9990512 RMD160 a45c308cd08f14904e7b7720c3e29ede38bf1a87 SHA1 9d4fffc9c4ac93e7919e124fa38bb51dcaff5216 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
 DIST glibc-2.9-ports-20081201.tar.bz2 487663 RMD160 80eb0035ed2e021e79755d4151ccd6d73cd78d8d SHA1 90a6ecbce37aabe6093c4dd0c8817cbf86321627 SHA256 19bb6e89855171d7ae01aef92054dfe4524521fbc13c67bfaa3ee81944210744
@@ -28,3 +30,4 @@ DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3
 DIST glibc-ports-2.14.1.tar.bz2 630641 RMD160 aebb9e53aaa98cd6a76b2a278685cda03049c7d3 SHA1 f649bd5c0191315c92f6a4f46aaf7aa1bf82445d SHA256 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9
 DIST glibc-ports-2.14.tar.bz2 631253 RMD160 e15f35b9e3bd6acb1a0608be15056bfe7a94c207 SHA1 47da0ab038ea7cc28bc82ff558ad2f6779c79995 SHA256 580a656a55a17ba3db80ab0a9321332cd1f0aaddd7fad76004b524303fb6632d
 DIST glibc-ports-2.15.tar.xz 421820 RMD160 0088edef892e53147940ecaa9694d0c4e266899b SHA1 65c4c239f703cc63a1fa65aa7b32ab13f833d99e SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9
+DIST glibc-ports-2.16.0.tar.xz 925916 RMD160 580436b097f35f981ae187491a57a999c67858b6 SHA1 429b979b697a97befb56cce49b96ee47d708f20a SHA256 93a10ac3b9ab70ccc59dfe50a4747d48a7e92f9481656f8a37558a2767ac02f3
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 13e7c1dd06da..cb4cc0b05eda 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.27 2012/05/10 05:24:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.28 2012/07/03 20:07:34 vapier Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -81,6 +81,8 @@ glibc_do_configure() {
 		--infodir=/usr/share/info
 		--libexecdir=/usr/$(get_libdir)/misc/glibc
 		$(use_multiarch || echo --disable-multi-arch)
+		--enable-obsolete-rpc
+		$(in_iuse systemtap && use_enable systemtap)
 		${EXTRA_ECONF}"
 
 	# There is no configure option for this and we need to export it
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 8044eefc1f9a..9e15b2f25204 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.21 2012/06/01 17:49:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.22 2012/07/03 20:07:34 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -155,7 +155,9 @@ toolchain-glibc_src_install() {
 	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
 	doenvd "${T}"/00glibc || die
 
-	dodoc BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README*
+	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
new file mode 100644
index 000000000000..b19a681e0782
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.16.0.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.1 2012/07/03 20:07:34 vapier Exp $
+
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
+
+DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+
+LICENSE="LGPL-2"
+#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="strip" # strip ourself #46186
+EMULTILIB_PKG="true"
+
+# Configuration variables
+RELEASE_VER=""
+BRANCH_UPDATE=""
+SNAP_VER=""
+case ${PV} in
+9999*)
+	EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" )
+	EGIT_SOURCEDIRS=( "${S}" "${S}/ports" )
+	inherit git-2
+	;;
+*_p*)
+	RELEASE_VER=${PV%_p*}
+	SNAP_VER=${PV#*_p}
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+MANPAGE_VER=""                                 # pregenerated manpages
+INFOPAGE_VER=""                                # pregenerated infopages
+LIBIDN_VER=""                                  # it's integrated into the main tarball now
+PATCH_VER="1"                                  # Gentoo patchset
+PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
+NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
+
+IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only"
+[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20}
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+# Why SLOT 2.2 you ask yourself while sippin your tea ?
+# Everyone knows 2.2 > 0, duh.
+SLOT="2.2"
+
+# General: We need a new-enough binutils for as-needed
+# arch: we need to make sure our binutils/gcc supports TLS
+DEPEND=">=sys-devel/gcc-3.4.4
+	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
+	x86? ( >=sys-devel/gcc-4.3 )
+	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
+	ppc? ( >=sys-devel/gcc-4.1.0 )
+	ppc64? ( >=sys-devel/gcc-4.1.0 )
+	>=sys-devel/binutils-2.15.94
+	>=app-misc/pax-utils-0.1.10
+	virtual/os-headers
+	!<sys-apps/sandbox-1.2.18.1-r2
+	!<sys-apps/portage-2.1.2
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-kernel/ps3-sources
+	selinux? ( sys-libs/libselinux )
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+else
+	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
+	RDEPEND="${RDEPEND}
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
+fi
+
+SRC_URI=$(
+	upstream_uris() {
+		echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+	}
+	gentoo_uris() {
+		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+		devspace=${devspace//HTTP/http://dev.gentoo.org/}
+		echo mirror://gentoo/$1 ${devspace//URI/$1}
+	}
+
+	TARNAME=${PN}
+	if [[ -n ${SNAP_VER} ]] ; then
+		TARNAME="${PN}-${RELEASE_VER}"
+		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
+		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
+	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
+	fi
+	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
+	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
+	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
+	[[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
+	[[ -n ${INFOPAGE_VER}  ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2
+)
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+src_unpack()  { eblit-run src_unpack  ; }
+src_compile() { eblit-run src_compile ; }
+src_test()    { eblit-run src_test    ; }
+src_install() { eblit-run src_install ; }
+
+# FILESDIR might not be available during binpkg install
+for x in setup {pre,post}inst ; do
+	e="${FILESDIR}/eblits/pkg_${x}.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} ; }"
+	fi
+done
+
+eblit-src_unpack-post() {
+	if use hardened ; then
+		cd "${S}"
+		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+		gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
+		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+
+		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
+		cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \
+			debug/stack_chk_fail.c || die
+		cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \
+			debug/chk_fail.c || die
+
+		if use debug ; then
+			# When using Hardened Gentoo stack handler, have smashes dump core for
+			# analysis - debug only, as core could be an information leak
+			# (paranoia).
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug stack handler"
+			sed -i \
+				-e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
+				debug/Makefile \
+				|| die "Failed to modify debug/Makefile for debug fortify handler"
+		fi
+
+		# Build nscd with ssp-all
+		sed -i \
+			-e 's:-fstack-protector$:-fstack-protector-all:' \
+			nscd/Makefile \
+			|| die "Failed to ensure nscd builds with ssp-all"
+	fi
+}
+
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
+maint_pkg_create() {
+	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
+	cd ${base}
+	local stamp=$(date +%Y%m%d)
+	local d
+	for d in libc ports ; do
+		#(cd ${d} && cvs up)
+		case ${d} in
+			libc)  tarball="${P}";;
+			ports) tarball="${PN}-ports-${PV}";;
+		esac
+		rm -f ${tarball}*
+		ln -sf ${d} ${tarball}
+		tar hcf - ${tarball} --exclude-vcs | lzma > "${T}"/${tarball}.tar.lzma
+		du -b "${T}"/${tarball}.tar.lzma
+	done
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 432cdf6ea848..982ecfef9d30 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.9 2012/06/08 22:06:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.10 2012/07/03 20:07:34 vapier Exp $
 
-inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib multiprocessing
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
@@ -35,11 +35,9 @@ INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
 PATCH_VER=""                                   # Gentoo patchset
 PORTS_VER=""                                   # version of glibc ports addon
-LT_VER=""                                      # version of linuxthreads addon
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
-#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
+NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
-IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}"
+IUSE="debug gd hardened multilib selinux systemtap profile vanilla crosscompile_opts_headers-only"
 [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
@@ -83,7 +81,6 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	ppc? ( >=sys-devel/gcc-4.1.0 )
 	ppc64? ( >=sys-devel/gcc-4.1.0 )
 	>=sys-devel/binutils-2.15.94
-	${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)}
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
 	!<sys-apps/sandbox-1.2.18.1-r2
@@ -119,11 +116,10 @@ SRC_URI=$(
 		[[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER}
 		upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2
 	elif [[ -z ${EGIT_REPO_URIS} ]] ; then
-		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.bz2
+		upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz
 	fi
 	[[ -n ${LIBIDN_VER}    ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2
-	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.bz2
-	[[ -n ${LT_VER}        ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2
+	[[ -n ${PORTS_VER}     ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz
 	[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
 	[[ -n ${PATCH_VER}     ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
 	[[ -n ${MANPAGE_VER}   ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2
@@ -215,6 +211,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index d480fe7ab567..e2eb91db0505 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -4,5 +4,6 @@
 <herd>toolchain</herd>
 <use>
  <flag name='linuxthreads'>Build linuxthreads support (only for kernels older than linux-2.6)</flag>
+ <flag name='systemtap'>enable systemtap static probe points</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-libs/ldb/ldb-1.1.4.ebuild b/sys-libs/ldb/ldb-1.1.4.ebuild
index b80e59c1ce94..d173662d4f71 100644
--- a/sys-libs/ldb/ldb-1.1.4.ebuild
+++ b/sys-libs/ldb/ldb-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/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.6 2012/06/19 14:03:31 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.4.ebuild,v 1.7 2012/07/03 19:52:52 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,7 +18,7 @@ IUSE="doc"
 
 RDEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.14
+	~sys-libs/tevent-0.9.14
 	~sys-libs/tdb-1.2.9[python]
 	net-nds/openldap
 	!!<net-fs/samba-3.6.0[ldb]
diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild
index e64600c4a009..70e9e4c95809 100644
--- a/sys-process/audit/audit-2.1.3-r1.ebuild
+++ b/sys-process/audit/audit-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.6 2012/06/28 07:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.1.3-r1.ebuild,v 1.8 2012/07/03 19:48:08 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,7 @@ SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="ldap prelude python"
 # Testcases are pretty useless as they are built for RedHat users/groups and
 # kernels.
diff --git a/x11-libs/fltk/fltk-1.3.0-r1.ebuild b/x11-libs/fltk/fltk-1.3.0-r1.ebuild
index 1f3ad9d5c019..581c783475ba 100644
--- a/x11-libs/fltk/fltk-1.3.0-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.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/x11-libs/fltk/fltk-1.3.0-r1.ebuild,v 1.11 2012/06/27 03:10:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0-r1.ebuild,v 1.12 2012/07/03 16:40:07 ranger Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://easysw/${PN}/${PV/_}/${P/_}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games opengl pdf static-libs threads xft xinerama"
 
 RDEPEND="
diff --git a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
index e1dbeb01af51..9a209f2d470f 100644
--- a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.1.ebuild,v 1.8 2012/06/29 12:42:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.1.ebuild,v 1.9 2012/07/03 20:16:30 jer Exp $
 
 EAPI=4
 inherit gnome.org libtool
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc +introspection"
 
 RDEPEND="app-text/iso-codes
diff --git a/x11-misc/revelation/revelation-0.4.14.ebuild b/x11-misc/revelation/revelation-0.4.14.ebuild
index 7706e4a329aa..3699e6b3e991 100644
--- a/x11-misc/revelation/revelation-0.4.14.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.14.ebuild,v 1.2 2012/07/03 11:13:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.14.ebuild,v 1.4 2012/07/03 23:30:11 jdhore Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="applet"
 RESTRICT="test"
 
diff --git a/x11-misc/xosview/xosview-1.9.3.ebuild b/x11-misc/xosview/xosview-1.9.3.ebuild
index bee6ee77c121..ec6400d007af 100644
--- a/x11-misc/xosview/xosview-1.9.3.ebuild
+++ b/x11-misc/xosview/xosview-1.9.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-misc/xosview/xosview-1.9.3.ebuild,v 1.4 2012/06/25 05:41:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.9.3.ebuild,v 1.5 2012/07/03 16:41:58 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-misc/xplanet/xplanet-1.3.0.ebuild b/x11-misc/xplanet/xplanet-1.3.0.ebuild
index b4bb4309a4e7..31db80efd9f9 100644
--- a/x11-misc/xplanet/xplanet-1.3.0.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild,v 1.4 2012/06/22 15:23:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild,v 1.5 2012/07/03 16:42:53 ranger Exp $
 
 EAPI=4
 inherit flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="gif jpeg png tiff truetype X"
 
 RDEPEND="gif? ( media-libs/giflib )
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
index 904b013842c2..e4c2271ca7f5 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-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-plugins/wmfire/wmfire-1.2.4-r2.ebuild,v 1.4 2012/06/26 07:06:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild,v 1.5 2012/07/03 16:36:18 ranger Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="session"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmnd/wmnd-0.4.16.ebuild b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
index 0e5882b2c5fb..6f3e4df97451 100644
--- a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.16.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-plugins/wmnd/wmnd-0.4.16.ebuild,v 1.3 2012/06/26 07:06:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmnd/wmnd-0.4.16.ebuild,v 1.4 2012/07/03 16:34:26 ranger Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="snmp"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild b/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild
index 9c007deb498a..1618bf18c2eb 100644
--- a/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.9.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/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild,v 1.3 2012/06/26 07:06:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild,v 1.4 2012/07/03 16:35:22 ranger Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.swanson.ukfsn.org/wmdock/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmweather+/wmweather+-2.13.ebuild b/x11-plugins/wmweather+/wmweather+-2.13.ebuild
index 07fb77c986f0..9a089489af9e 100644
--- a/x11-plugins/wmweather+/wmweather+-2.13.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.13.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-plugins/wmweather+/wmweather+-2.13.ebuild,v 1.3 2012/06/26 06:52:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/wmweather+-2.13.ebuild,v 1.4 2012/07/03 16:39:09 ranger Exp $
 
 EAPI=4
 inherit flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/libpcre
diff --git a/x11-themes/bespin/Manifest b/x11-themes/bespin/Manifest
new file mode 100644
index 000000000000..02577b539a94
--- /dev/null
+++ b/x11-themes/bespin/Manifest
@@ -0,0 +1 @@
+DIST bespin-0_p20120703.tar.xz 4054728 RMD160 c560ec13a67d4971970a97d9212fc857290b748d SHA1 bf187886dda4bf1d73b691cb4083ab05289df368 SHA256 7a326984e483cdb28983ff06ef06e0d426a8c9ee674b24d4c86d8023942995bd
diff --git a/x11-themes/bespin/bespin-0_p20120703.ebuild b/x11-themes/bespin/bespin-0_p20120703.ebuild
new file mode 100644
index 000000000000..c33b31c465ec
--- /dev/null
+++ b/x11-themes/bespin/bespin-0_p20120703.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/bespin-0_p20120703.ebuild,v 1.1 2012/07/04 02:20:21 creffett Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="A KDE4 follow-up to Baghira KDE Theme Engine, which resembles Mac OS X"
+HOMEPAGE="http://cloudcity.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+src_configure() {
+	# these two are no-deps options
+	# no need to have them useflaged
+	mycmakeargs=(
+		-DENABLE_XBAR=ON
+		-DENABLE_ARGB=ON
+	)
+
+	kde4-base_src_configure
+}
diff --git a/x11-themes/bespin/metadata.xml b/x11-themes/bespin/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/x11-themes/bespin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/x11-wm/jwm/jwm-2.1.0.ebuild b/x11-wm/jwm/jwm-2.1.0.ebuild
index 046aeb710141..b3a97b24fa28 100644
--- a/x11-wm/jwm/jwm-2.1.0.ebuild
+++ b/x11-wm/jwm/jwm-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.1.0.ebuild,v 1.4 2012/06/27 03:12:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.1.0.ebuild,v 1.5 2012/07/03 16:41:03 ranger Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE="bidi debug jpeg png truetype xinerama xpm"
 
 RDEPEND="xpm? ( x11-libs/libXpm )