diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index bafa94d80201..26dcb832aa09 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.2 2012/08/21 19:20:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.3 2012/08/23 20:13:25 ulm Exp $
 
 EAPI=4
 
@@ -238,10 +238,8 @@ src_compile() {
 }
 
 src_install () {
-	emake install DESTDIR="${D}"
+	emake install DESTDIR="${D}" NO_BIN_LINK=t
 
-	rm "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} \
-		|| die "Removing link to emacs executable failed"
 	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
 		|| die "Moving emacs executable failed"
 
diff --git a/app-editors/emacs/emacs-23.4-r4.ebuild b/app-editors/emacs/emacs-23.4-r4.ebuild
index 4b1287a8cd3c..3a4e2384bbcf 100644
--- a/app-editors/emacs/emacs-23.4-r4.ebuild
+++ b/app-editors/emacs/emacs-23.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.4 2012/08/21 10:00:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.5 2012/08/23 21:03:23 maekke 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-editors/emacs/emacs-24.1-r1.ebuild b/app-editors/emacs/emacs-24.1-r1.ebuild
index e26ebade905f..7e3a6b632809 100644
--- a/app-editors/emacs/emacs-24.1-r1.ebuild
+++ b/app-editors/emacs/emacs-24.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-editors/emacs/emacs-24.1-r1.ebuild,v 1.4 2012/08/21 10:00:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.5 2012/08/23 21:04:50 maekke Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
diff --git a/app-emacs/jde/files/70jde-gentoo.el b/app-emacs/jde/files/70jde-gentoo.el
index bff1c9d5b858..c7fff6a61b4d 100644
--- a/app-emacs/jde/files/70jde-gentoo.el
+++ b/app-emacs/jde/files/70jde-gentoo.el
@@ -7,3 +7,4 @@
 (setq jde-checkstyle-style "/usr/share/checkstyle/checks/sun_checks.xml")
 (setq jde-html-directory "/usr/share/doc/@PF@/html")
 (setq bsh-html-directory "/usr/share/doc/@PF@/html")
+(setq jde-check-version-flag nil)
diff --git a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
index 57996178bf47..ce42f466f926 100644
--- a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.9 2012/08/13 15:49:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.10 2012/08/23 21:47:42 scarabeus Exp $
 
 EAPI=4
 
@@ -445,7 +445,7 @@ src_configure() {
 		--with-system-dicts \
 		--enable-cairo-canvas \
 		--enable-largefile \
-		--enable-mergelibs \
+		--disable-mergelibs \
 		--enable-python=system \
 		--enable-randr \
 		--enable-randr-link \
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 2264690d7e6c..deb83438a33c 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.22 2012/08/13 18:33:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.23 2012/08/23 21:47:42 scarabeus Exp $
 
 EAPI=4
 
@@ -421,6 +421,7 @@ src_configure() {
 	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
 	# --disable-mozilla: disable mozilla build that is used for adresbook, not
 	#   affecting the nsplugin that is always ON
+	# --disable-mergelibs: cause build time failures
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
@@ -440,7 +441,7 @@ src_configure() {
 		--enable-graphite \
 		--enable-cairo-canvas \
 		--enable-largefile \
-		--enable-mergelibs \
+		--disable-mergelibs \
 		--enable-python=system \
 		--enable-randr \
 		--enable-randr-link \
diff --git a/app-shells/bash/bash-4.2_p37.ebuild b/app-shells/bash/bash-4.2_p37.ebuild
index 94e418d432a1..0fc9e7011e95 100644
--- a/app-shells/bash/bash-4.2_p37.ebuild
+++ b/app-shells/bash/bash-4.2_p37.ebuild
@@ -1,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-shells/bash/bash-4.2_p37.ebuild,v 1.6 2012/08/23 01:17:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.7 2012/08/23 21:10:23 maekke Exp $
 
 EAPI="1"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-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="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-text/acroread/acroread-9.5.1-r1.ebuild b/app-text/acroread/acroread-9.5.1-r1.ebuild
index c5d4362012e1..ee7d2e675ef1 100644
--- a/app-text/acroread/acroread-9.5.1-r1.ebuild
+++ b/app-text/acroread/acroread-9.5.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/acroread/acroread-9.5.1-r1.ebuild,v 1.3 2012/08/20 01:26:07 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1-r1.ebuild,v 1.4 2012/08/23 21:38:03 johu Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="Adobe"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="strip mirror"
 
 DEPEND="dev-util/bsdiff"
diff --git a/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
new file mode 100644
index 000000000000..729b8e7dd74f
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-6.0-r1.ebuild,v 1.1 2012/08/24 00:11:23 johu Exp $
+
+EAPI=4
+KDE_REQUIRED="never"
+KDE_LINGUAS_DIR="po"
+KDE_LINGUAS="cs fr hu it nl pt_BR ru sv tr zh_CN zh_TW"
+inherit fdo-mime qt4-r2 kde4-base
+
+DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug kde"
+
+RDEPEND="
+	dev-libs/chmlib
+	>=x11-libs/qt-dbus-4.5:4
+	>=x11-libs/qt-webkit-4.5:4
+	!kde? ( >=x11-libs/qt-gui-4.5:4 )
+	kde? (
+		$(add_kdebase_dep kdelibs)
+		!kde-base/okular[chm]
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" \
+		-e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
+			-i packages/CMakeLists.txt || die
+	sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
+			-i src/CMakeLists.txt || die
+	echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
+
+	sed -e "/Encoding=UTF-8/d" \
+		-i packages/kchmviewer.desktop || die "fixing .desktop file failed"
+
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm ${KDE_LINGUAS_DIR}/${PN}_${lang}.po
+		fi
+	done
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde; then
+		kde4-base_src_compile
+	else
+		emake || die
+	fi
+}
+
+src_test() {
+	einfo "No tests exist."
+}
+
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer || die "dobin kchmviewer failed"
+		domenu packages/kchmviewer.desktop || die
+		dodoc ChangeLog README || die
+	fi
+	insinto /usr/share/pixmaps/
+	doins packages/kchmviewer.png || die
+	dodoc DBUS-bindings FAQ || die
+}
+
+pkg_postinst() {
+	use kde && kde4-base_pkg_postinst
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use kde && kde4-base_pkg_postrm
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 448e8ab227ac..cf19f050c586 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,2 +1,2 @@
-DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 RMD160 2bec1bd147af6ff00cdb999a35800b95f986a518 SHA1 4ac4f15fb305ef243b88b17e405e9d451bd56de9 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86
-DIST phpMyAdmin-3.5.2.2-all-languages.tar.xz 3654332 RMD160 26e247336fa2876c939afa0fa842cc67ee7c38f3 SHA1 0772385c8133e7b0becaa6c81df7f76bdb9d3bf2 SHA256 d02de081c522d3026f4a8418538f7ff05adf280afa404851a5f7f4ef895b4a7d
+DIST phpMyAdmin-3.4.9-all-languages.tar.bz2 4666051 SHA256 5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86
+DIST phpMyAdmin-3.5.2.2-all-languages.tar.xz 3654332 SHA256 d02de081c522d3026f4a8418538f7ff05adf280afa404851a5f7f4ef895b4a7d SHA512 d505f56785e143c76953d37cdac449159c80d6f4035c67bddb957e02cdd1029d067522824344e72a1073022d00922cf7252eae4435d23357b892a9d4377340a6 WHIRLPOOL abd1b0edfcb8667810ce438c16af95fd809240ad1cd02f66e90de9ce70da8e107c4e2d61f974df56f73807dd39edf26fc6dc67f118b32a6df1817c4dad1d1c4c
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
index 25d64e920199..6fc43681d9d0 100644
--- a/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-3.5.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/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild,v 1.1 2012/08/22 15:15:53 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.5.2.2.ebuild,v 1.3 2012/08/23 21:15:08 johu Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index f0d9f6cf5a25..15e5256933e8 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -6,3 +6,4 @@ DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac9
 DIST jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip 60393207 SHA256 2220fbe8399f851672d37cf1451400db137d9c27a4a02976df625de21a13cc4e
 DIST jdk-7u2-apidocs.zip 60351373 SHA256 85960d0d70ebf981bdb6e8e19b462821120f7d6735975b102c5d5bf26a9b3124
 DIST jdk-7u4-apidocs.zip 60313792 SHA256 52db8b927396582319019e1c02b254ea5c3a113b17aca49f2fad286d64c35a0c SHA512 30b0d527faf9d27b2c10796b1c20a4612a3eef42f93e89cedfbe8b70d8aeb62886801de2313369fedd4a5858ff69978f33633a033fef80edc96b1acc35f0666b WHIRLPOOL 7f8a5ba2ea3b39a06790778e708df3c6f49983e7e44af2d230b173154df3f8c81f29dbb529801102bbe3cba66dc91a77ae8795a2c486bb46c691c41f7a5f7b41
+DIST jdk-7u6-apidocs.zip 60397544 SHA256 4484cf9c3a8a5ba72444e45918557dd0d88440e6b06501a7ef436d6c31b8c991 SHA512 0107a3b3ece7fb08a0bed9ca7cc21fd9a97e75a99670fce9610fdb4e08afc46b11cd3aae7af557311285dbe82e570353fa199528eb956be040241ad6ac6a9d63 WHIRLPOOL c17bec546e4e97bd5db6315cb3aa8eeb4123c5df8f0740d77f0c528e49d40187d0f6cd4006f39fcb9d988fa2776a6aab25fbe772a8e44a6a4549123f1cd9560b
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild
new file mode 100644
index 000000000000..987ec04eaf1c
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.6.ebuild,v 1.1 2012/08/23 20:31:41 caster Exp $
+
+ORIG_NAME="jdk-7u6-apidocs.zip"
+SRC_URI="${ORIG_NAME}"
+
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="http://download.oracle.com/javase/7/docs/"
+LICENSE="oracle-java-documentation-7"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+RESTRICT="fetch"
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+	einfo "Please download ${ORIG_NAME} from "
+	einfo "${DOWNLOAD_URL}"
+	einfo "(agree to the license) and place it in ${DISTDIR}"
+
+	einfo "If you find the file on the download page replaced with a higher"
+	einfo "version, please report to the bug 67266 (link below)."
+	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "the upstream release changed without renaming. Try downloading the file"
+	einfo "again (or a newer revision if available). Otherwise report this to"
+	einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install(){
+	insinto /usr/share/doc/${P}/html
+	doins index.html
+
+	for i in *; do
+		[[ -d $i ]] && doins -r $i
+	done
+}
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 0d2402019510..8c4dbe4cb463 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -12,3 +12,14 @@ DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 67965 SHA256 1e947ed5240f917c42aafb52d
 DIST jdk-6u33-solaris-sparcv9.sh 12775334 SHA256 811211905119ec6282e4e97e1451b5bfd2611babeb605dcbfbc50f46885bb7bf SHA512 72e8561f1156a866642b1baa42717b68884b244352073314a74d3bbc8f6e028a5bb2d8be96981e2666226d7111d11ef1d954fadf3f71667de4ca782eccef2354 WHIRLPOOL 2d4762e918e06ede0eab9cde7da021fe4194b0f84ebd124cbbb9e5fe6d65000e172da48be524c0ee2356855a85322479686b6dfd31e5eebed8b80ffa4802257c
 DIST jdk-6u33-solaris-x64-demos.tar.Z 72813 SHA256 162105f32471eb493a2b0124d45e9df1255002be57edb4cc9c39ae5469ceb261 SHA512 a8e7bcdab50a677868c74a97aa40d7ffc71754532da426f167a5d38920086c0d81eb8b830be52ad719413ad5f83a2baa8617c16dbcc959fcb6d688fe2914f38c WHIRLPOOL 152e6617388bb0283f9f19a1e1cb2cc78b3ce90a27e123549233a6b419481648709dc753541cefb85d3ddcafde1bea570bc09a9fd5e3d58f6ee7f02645b1a283
 DIST jdk-6u33-solaris-x64.sh 8853398 SHA256 de96b05ebd9bd0008ad57277e70323c00c354a43cf6ba50d67d91323e3ca0e55 SHA512 850511516e1aec4e7afdfbd4d211779b97b6fd2f4dcfb23be6e9ed5551015a222d04fcd0aa6418fe0f966ea56d40d83c7473c7dbf47478ed346985e9bd0cf02c WHIRLPOOL 540e4b53114efc9c58a524db5650b8e9ad699c2bb890eb30689d4c156e66703cfad5f514350ac3f066ff689f81a9c93ca0fc907b156120f9871a5263a9a9d266
+DIST jdk-6u34-linux-i586-demos.tar.gz 12074821 SHA256 4da9460638afb9cb6ae1e48417b36a297feb455a01b9baf839cd815bca6fc2e6 SHA512 001a3b3f2cfbb963979505f4842f7796d4a1f09e6b3b9fd637f449b8b959f0ffa14a95b42a1a879c573b825e3c2d8e4e62a13b8db8c6879d1eb51f6eafdb0dad WHIRLPOOL 24e460a863a0b599deef0e0e65fd9f4ce100e7a35df614521ea4e85cf2fdda04517571a119e0687fd3a04105e07361044a0ae925a89dbd20f276294cabed5afe
+DIST jdk-6u34-linux-i586.bin 71755291 SHA256 dbdcafbb008c6585dad2ad8cb82de8b8b9d65e1da7250f1b1efd7094190c81cf SHA512 87f0f2df826d26cdc6462b0769b334f2e0b62d9c69963f03c98e501add15b7a159948aa2c959dc728c9bcfcfc76934ec48e78e55a48fa61727fc398ffefd5073 WHIRLPOOL 76dee0ab4c29b4a7b74fcb7c693574ec33dddf610d41a245e35dcef10d6e51a1216394b4872dfe9c4fbb655bb24fa31744048a8b91ec164c9792248f99252d84
+DIST jdk-6u34-linux-x64.bin 72036348 SHA256 126643eb2813b8e615dcea8ed7c710cf5f9827003ad38e06024c178a8b2b0229 SHA512 d372ed0ed8ef5427bae57ea7a3f1aca126aedff84899266fb12dbfb172233720cb1efde16b1d2d23269ebfd2ecdf2acdfdd454224c488cd04b9afe20e620731e WHIRLPOOL 41b241f5e86e95dd37015719df2260971dd5ce34b69596ba55ec0f2e43fa6191f2b00f5e10d7495d0fd90fa06c482095b9312f87bafc33978aeadc3eaa214781
+DIST jdk-6u34-solaris-i586-demos.tar.Z 17940319 SHA256 41901e3a9e47a3f5539dea121d22f9b8282a469b90ed719c0e989adfe2cffac2 SHA512 5d6740899d341655bccf4846ec2be63b782ceef005b263ae7d05ba82b7905c167a66e26aefce500a14d73b33ffaba80277c2b69390cc2f42a16ea01e246d2ca1 WHIRLPOOL 03f974eda73ea6359b6b044356e67cb4230fcab66d7d2a33e534e889e923a4233ec3fee8b285cbe20656ec39fb5d668098bd881c87d0b8eaa7f052f5b4e46863
+DIST jdk-6u34-solaris-i586.sh 71659586 SHA256 863b4ddc634af5195ec74b6d262d40aeb0c0065deda223ed03419e159da0a95c SHA512 ff741871a791d439d345ff0bd51385e57ac48d3fc122ffa5754b0ce4a3e76775deac0edabd365c85bb176a6e4f560b7f63c85c4c66a68099c55676aab0eed0cb WHIRLPOOL 02d5db76f7578cc7a8b866527a4a00020efac113dca94fce16adbbadf0827d9654f238a3de923b64e016a351746fe5294886db68cdeac5bc82b646b1ba791082
+DIST jdk-6u34-solaris-sparc-demos.tar.Z 17941087 SHA256 67eeed36136e9bb238c17136dffcd221275144d468b450e0264e2ca09e90e0cf SHA512 994291ab5133f53384d7bffcdfab9da52d0dc2d7989f1d6c76902d550a8935a1ee1c8952f8ee40420dbb069e0f3fd4962710346082bb4d26b8ab8e4085f44749 WHIRLPOOL 5a1991299405aa37c8cbe2afe1a05a6e094e98feafd6b2e4b8d585f76e734a6cb388b702a368ec05e81099b0e5c0fb59be0d3282ddec69ceeb8fe8b8234c0069
+DIST jdk-6u34-solaris-sparc.sh 76861470 SHA256 37782a5771ee55c852c8ef0cc68c94b7db21ba3204adf2462c7f175c9b40a26d SHA512 881e01625d091e493d9180576fa78c096b423183bd36df4cbcfecf688f106928aadb778e6169f332b3ab79736f932858ef79cdee98146a0d9b4781a88945ac80 WHIRLPOOL e2216e8210b690d6b02aeb45069f918014f0e331b695c330181afc2da426aa5020e65d258f1845694e879ce964a99d1b661b2e2dd6d8470bee5113549085e1be
+DIST jdk-6u34-solaris-sparcv9-demos.tar.Z 66549 SHA256 efdb5e27bae008a9f587b557c5a341f8746d24298cf1775c9f086565832fe331 SHA512 9177d54f45452a0a1c509b55c2bd4a2cf5c2d40d354982f679019d7cf162ceb0ece219e72216d622df0d99d8d636fc7da40cc497393039eb93a63189db235689 WHIRLPOOL 394b5986797bef82d148afe412a4decb3297d5c9f9479870f3f48d0bf3b9f153ade2bd784ff1e9c1bef54140247b7a83620a37ee8ca3cb86bf60ac6b94ee6e06
+DIST jdk-6u34-solaris-sparcv9.sh 12775208 SHA256 35e2b54a5ea18b9a4ad11f709aca529a55cb84143747566146b0237fcdc15766 SHA512 7c84d94818c0e173c7c931847fc44ac5abd2eede5277f252ec7f1c40c4f5f6f92670dad1059f44d6bac78aec409176c4d225a200b0cf5c34363d017fb0126722 WHIRLPOOL 0e1168933a412b45f7277502ce2c986be31ce682d043e7337fb42faa5d975080c8e8dbc29d4d13dcb5cf469a35319d0060e78120a14d2b1a4e61ea6805c9ba4c
+DIST jdk-6u34-solaris-x64-demos.tar.Z 71869 SHA256 7f930f5694d9fd2cb98e9578abf6a2cbd4179ba819ea9eeb2b0ea50bcf382fd9 SHA512 ed0039170c4852fe43d81b36c53118866e27ffec72ddefc825274505403306b03194c1e13e529cfb2e5027d524ac521083918cbd82b78e7508077745353cb8ca WHIRLPOOL e7ec5ff1ff5b166f2cace26b43a3b51295c3259faca1c55d65447d36970531cbbb7b2d443435d56264c12f6c42ef0f42a8ba4030c51763d1f0e425402ed1dca2
+DIST jdk-6u34-solaris-x64.sh 8853420 SHA256 c8ec1507b061ead492f97d6ce9d42b25d967968b7c4a40dfca304acc6605300b SHA512 862aba416abe5ccecb28e6dbc4a9c0c8bb51f2ddfd6f5804d4ba89ff7dca46ffc35538fe17b9385f1ce739dc2dd7e69c73616260529162807b1746bdfe4afe04 WHIRLPOOL 839b5820e1b9b3ba4dfd5fc4b651a78529878722417fec5b890a5be8b221b6a9f1a1fd13503d2fd2f6513032563db49802dc5f94ed66c24aa0e0d5afe6ce880e
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild
new file mode 100644
index 000000000000..695d594e69c2
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.34.ebuild,v 1.1 2012/08/23 19:41:13 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk6-downloads-1637591.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jdk-${MY_PV}-linux-i586.bin"
+AMD64_AT="jdk-${MY_PV}-linux-x64.bin"
+#IA64_AT="jdk-${MY_PV}-linux-ia64.bin"
+SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh"
+SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh"
+SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh"
+SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh"
+
+X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+#IA64_DEMOS="jdk-${MY_PV}-linux-ia64-demos.tar.gz"
+SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.Z"
+SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.Z"
+SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.Z"
+SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	x86? ( ${X86_AT}
+		examples? ( ${X86_DEMOS} ) )
+	amd64? ( ${AMD64_AT} )
+	x86-solaris? ( ${SOL_X86_AT}
+		examples? ( ${SOL_X86_DEMOS} ) )
+	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT}
+		examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) )
+	sparc-solaris? ( ${SOL_SPARC_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ) )
+	sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
+		examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )"
+#		examples? ( ${AMD64_DEMOS} ) )
+#	ia64? ( ${IA64_AT}
+#		examples? ( ${IA64_DEMOS} ) )
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"
+
+RESTRICT="fetch strip"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-java/java-sdk-docs:1.6.0 )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	kernel_SunOS? ( app-arch/unzip )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+_set_at() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	elif use x86-solaris; then
+		AT=${SOL_X86_AT}
+	elif use x64-solaris; then
+		AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+	elif use sparc-solaris; then
+		AT=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
+	fi
+}
+
+_set_demos() {
+	if use x86; then
+		DEMOS=${X86_DEMOS}
+	elif use amd64; then
+		DEMOS=${AMD64_DEMOS}
+	elif use ia64; then
+		DEMOS=${IA64_DEMOS}
+	elif use x86-solaris; then
+		DEMOS=${SOL_X86_DEMOS}
+	elif use x64-solaris; then
+		DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
+	elif use sparc-solaris; then
+		DEMOS=${SOL_SPARC_AT}
+	elif use sparc64-solaris; then
+		DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
+	fi
+}
+
+pkg_nofetch() {
+	_set_at
+	_set_demos
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download ${AT} from:"
+	einfo "${JDK_URI}"
+	einfo "and move it to ${DISTDIR}"
+
+	if use examples; then
+		einfo ""
+		einfo "Also download ${DEMOS} from:"
+		einfo "${JDK_URI}"
+		einfo "and move it to ${DISTDIR}"
+	fi
+}
+
+_sol_src_unpack() {
+	for i in ${AT}; do
+		[[ ${i} == "and" ]] && continue
+		rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE
+		# don't die on unzip, it always "fails"
+		unzip "${DISTDIR}"/${i}
+	done
+	for f in $(find "${S}" -name "*.pack") ; do
+		"${S}"/bin/unpack200 ${f} ${f%.pack}.jar
+		rm ${f}
+	done
+	if use examples ; then
+		for i in ${DEMOS}; do
+			[[ ${i} == "and" ]] && continue
+			use examples && unpack ${i}
+		done
+		mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \
+			"${S}"/ || die
+	fi
+}
+
+src_unpack() {
+	[[ ${PV} != 1.6.0.34 ]] && die "Check if amd64 examples distfile is available again before bumping. Chang SRC_URI and 'use examples' in src_{unpack,install}."
+	_set_at
+	_set_demos
+	if use kernel_SunOS; then
+		_sol_src_unpack
+	else
+		sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack"
+		use examples && ! use amd64 && unpack ${DEMOS}
+	fi
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
+			{,jre/}lib/i386/libjavaplugin_nscp*.so
+		rm -vrf jre/plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf {,jre/}lib/${arch}/libnpjp2.so \
+			{,jre/}lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby; then
+		cp -pPR db "${ddest}" || die
+	fi
+
+	if use examples; then
+		if use amd64; then
+			ewarn "examples are not available in this version for amd64 due to upstream error (zero-byte distfile)"
+		else
+			cp -pPR demo sample "${ddest}" || die
+		fi
+	fi
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	dodoc COPYRIGHT
+	dohtml README.html
+
+	if use jce; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (sun-jdk)#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		jre/lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/jre/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/appletviewer
+	/opt/${P}/bin/apt
+	/opt/${P}/bin/extcheck
+	/opt/${P}/bin/idlj
+	/opt/${P}/bin/jar
+	/opt/${P}/bin/jarsigner
+	/opt/${P}/bin/java
+	/opt/${P}/bin/javac
+	/opt/${P}/bin/javadoc
+	/opt/${P}/bin/javah
+	/opt/${P}/bin/javap
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/jconsole
+	/opt/${P}/bin/jdb
+	/opt/${P}/bin/jhat
+	/opt/${P}/bin/jinfo
+	/opt/${P}/bin/jmap
+	/opt/${P}/bin/jps
+	/opt/${P}/bin/jrunscript
+	/opt/${P}/bin/jsadebugd
+	/opt/${P}/bin/jstack
+	/opt/${P}/bin/jstat
+	/opt/${P}/bin/jstatd
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/native2ascii
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmic
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/schemagen
+	/opt/${P}/bin/serialver
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/bin/wsgen
+	/opt/${P}/bin/wsimport
+	/opt/${P}/bin/xjc
+	/opt/${P}/demo/jvmti/gctest/lib/libgctest.so
+	/opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so
+	/opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so
+	/opt/${P}/demo/jvmti/minst/lib/libminst.so
+	/opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so
+	/opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so
+	/opt/${P}/demo/jvmti/waiters/lib/libwaiters.so
+	/opt/${P}/jre/bin/java
+	/opt/${P}/jre/bin/java_vm
+	/opt/${P}/jre/bin/javaws
+	/opt/${P}/jre/bin/keytool
+	/opt/${P}/jre/bin/orbd
+	/opt/${P}/jre/bin/pack200
+	/opt/${P}/jre/bin/policytool
+	/opt/${P}/jre/bin/rmid
+	/opt/${P}/jre/bin/rmiregistry
+	/opt/${P}/jre/bin/servertool
+	/opt/${P}/jre/bin/tnameserv
+	/opt/${P}/jre/bin/unpack200
+	/opt/${P}/jre/lib/jexec
+	/opt/${P}/lib/jexec
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
+		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
+		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
+		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so"
+done
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 71c8e69306ed..7316dced55d0 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,3 +1,5 @@
 DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
 DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3 SHA512 8fbfbcfec1900db8f931f6812800f835ce4ca493b7e1c0b8e90d3ffa9c611f8df3d034ac5c9412ae2356f37ca8529c0632baef930b35364839f279b45981a75d WHIRLPOOL 5225a721e7d35a2f3fe1f66f7e1802479d6a759fbfc590de03069dec4717644f83757bf1bb65a2ee9b5be464220348269862eaa921537ffe94fe27b7dd4fe2fe
 DIST jre-6u33-linux-x64.bin 21300793 SHA256 c8a596ece07c79131fd33c65ab61f6099b203a42c0fe2daedb24360a15ab70ab SHA512 ced532e0eedab8312dfd242c624e59fde3ed8428eb1ec443ca0183522261b4af5979b566e3c88e27882e7eca9af7210735ed88841164ca06a9fb2d0fd6db1349 WHIRLPOOL 6ffcbd081e277e32e596eb0f4faf2de47b5c523622f7972e2bee4e7c60e8caea13111fea677bde7a076c1e051529a80bce1d0bc03713dcb4a837aabd63a28711
+DIST jre-6u34-linux-i586.bin 21697699 SHA256 c8274dd85af48a881276790e4b685b6a74b81eb3b4d60fa65e49820f932e1acf SHA512 7dc1c31c7fcb9721769e1c74b6aef29f698912879bcdf06973b99bb987ae7f9059b8b1abd487c180d1b560b38bfa11b0746256ed0ad63b3c01bbc14096bc7354 WHIRLPOOL c7f36a3e68931b204aa21d49f3305b19f905cea3c4d5f3001834ad3beac56c2bfb702e69841beed76383b9a451a347d93f66a5161937fe486034feadd9980e62
+DIST jre-6u34-linux-x64.bin 21302095 SHA256 affbb1851a2235130cb8f6d6cf467a3b130474b417658418bf8a4d85cff0dbaf SHA512 d8b50060ce190c44261a15c081bab731e6b5fede0e2643e99a778a84fe95c8023f79dd5a5aa840d42cd49b629c3f28d0bcad55528d6dd32d4ccbbe9b6c844832 WHIRLPOOL 5f98b815db24b65e2b7527f2769d2c5c9747bc13395751d8b98e3ae009f8eb6d1e5685356bfdbbece468e5f4a4c127a0f8935213e8b07316ba0a97f752e04284
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild
new file mode 100644
index 000000000000..081790d4a639
--- /dev/null
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.34.ebuild,v 1.1 2012/08/23 20:15:34 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils prefix versionator
+
+# This URIs need to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
+
+MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
+S_PV="$(replace_version_separator 3 '_')"
+
+X86_AT="jre-${MY_PV}-linux-i586.bin"
+AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+IA64_AT="jre-${MY_PV}-linux-ia64.bin"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AMD64_AT} )
+	x86? ( ${X86_AT} )"
+#	ia64? ( ${IA64_AT} )
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X alsa jce nsplugin pax_kernel"
+
+RESTRICT="fetch strip"
+
+RDEPEND="
+	X? (
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libX11
+	)
+	alsa? ( media-libs/alsa-lib )
+	jce? ( dev-java/sun-jce-bin:1.6 )
+	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+	if use x86; then
+		AT=${X86_AT}
+	elif use amd64; then
+		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
+	fi
+
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
+	einfo ""
+	einfo "Please download ${AT} from:"
+	einfo "${JRE_URI}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
+}
+
+src_compile() {
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	if use x86; then
+		bin/java -client -Xshare:dump || die
+	fi
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
+	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
+	# writable executable segments
+	if use x86; then
+		rm -vf lib/i386/libjavaplugin_oji.so \
+			lib/i386/libjavaplugin_nscp*.so
+		rm -vrf plugin/i386
+	fi
+	# Without nsplugin flag, also remove the new plugin
+	local arch=${ARCH};
+	use x86 && arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT README
+
+	if use jce; then
+		dodir "${dest}"/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
+		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}
+
+QA_TEXTRELS_x86="
+	opt/${P}/lib/i386/client/libjvm.so
+	opt/${P}/lib/i386/motif21/libmawt.so
+	opt/${P}/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/bin/java
+	/opt/${P}/bin/java_vm
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/rmid
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/unpack200
+	/opt/${P}/lib/jexec"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/lib/${java_system_arch}/libawt.so
+		/opt/${P}/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/lib/${java_system_arch}/libinstrument.so
+		/opt/${P}/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so
+		/opt/${P}/lib/${java_system_arch}/libjava.so
+		/opt/${P}/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/lib/${java_system_arch}/libnet.so
+		/opt/${P}/lib/${java_system_arch}/libnio.so
+		/opt/${P}/lib/${java_system_arch}/libnpjp2.so
+		/opt/${P}/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/lib/${java_system_arch}/librmi.so
+		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/lib/${java_system_arch}/libverify.so
+		/opt/${P}/lib/${java_system_arch}/libzip.so
+		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
+done
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index ced49906a673..2171eabff864 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,3 +1,4 @@
 DIST nqp-2012.05.tar.gz 934141 SHA256 877ef099a2949c5d3c8dc0742d4e22fb5a066536f8fa9176304472d2e6a00c31 SHA512 f5ac3771e1bf6402ed91041fdafac1a4f39b74bb91813f303d1ce4a007e56173ea5753d6a3964c38f9a104f4121d24118cb1d0db169612f10a028d46211e9405 WHIRLPOOL 3c528c200c70c0651a54ffa7508a35e652ecedc513461336faf99c9005e9c5b56196377faeb5ac81c50944c96029e0cd4152ab9f1aa03bb3317c3b6bcc61a6d3
 DIST nqp-2012.06.tar.gz 983184 SHA256 0852cf6f4cea87d52db5be2b16d27c52982d55246b9a3d11e7a2ef05d4f00f0e SHA512 41b8a1e795abeb3772f407fb8762795dbd242c9f96b908d3d0aa4edd639ac1d6dc54c1b48770d65963c55001c4a6ebc28f079491fd91343d14d44c2eb6b12f7e WHIRLPOOL 1517f9c3d60883197d6e0e93193b05590136c3c0de9529c8c5e717d535865d7d7b6b73547114518024e5c35040144a3eaea8a7744ccbc85c97726e06c02bf2c0
 DIST nqp-2012.07.tar.gz 985839 SHA256 25fa0607b01c68019a144f37768a7e913660b899fb1c1067e8d9076eac5e24b0 SHA512 eb23cec2d9886b86f8d28f892b99937dffe87b3f66febcb934cdab0c8c485011a0d9c0013a8cee19aa1e912d218fb17e3793b21fd0398ad3c5d1e353ce3249e0 WHIRLPOOL dfc03cec97bd12bb7e80f52298351d3fb5fbcce96f18ed96ebab046c092d64ac42dc7374acb6f236593449eededbf3e0de1ec7c08541fbdd03df58a06f729176
+DIST nqp-2012.08.tar.gz 1022786 SHA256 7d12102edfc810fc4a441b37edecc0339d38ba39b23530a8139c43775ca728aa SHA512 13f2b54b6d63564413ba00a53787e558ac4677c11fe87ed5bfd631d52f443289a8aafa95a390d7b6f120b3dd55db7b679b0c9cb71dddceee9c5df795081127f9 WHIRLPOOL da0fb11d2aa2d45af7d466e3ae6c274203425c7e96273319052e5e0885ff44438b234aa6769300436599abce0c16c2e0788083e9f3d6536068b09fa163e54a96
diff --git a/dev-lang/nqp/nqp-2012.08.ebuild b/dev-lang/nqp/nqp-2012.08.ebuild
new file mode 100644
index 000000000000..2a90ea38fcb5
--- /dev/null
+++ b/dev-lang/nqp/nqp-2012.08.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2012.08.ebuild,v 1.1 2012/08/24 03:03:35 patrick Exp $
+
+EAPI=3
+
+inherit eutils multilib
+
+PARROT_VERSION="4.4.0"
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="http://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	ln -s * "${S}" || die
+	cd "${S}"
+	echo "${PV}" > VERSION
+}
+
+src_configure() {
+	perl Configure.pl || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README || die
+
+	if use doc; then
+		dodoc docs/* || die
+	fi
+}
diff --git a/dev-lang/php/php-5.4.6.ebuild b/dev-lang/php/php-5.4.6.ebuild
index e445716c2924..bbb916d0c7ea 100644
--- a/dev-lang/php/php-5.4.6.ebuild
+++ b/dev-lang/php/php-5.4.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-lang/php/php-5.4.6.ebuild,v 1.2 2012/08/22 11:25:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6.ebuild,v 1.3 2012/08/24 04:56:32 xmw Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index d1b5ac79185b..82782da50b7b 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,3 +1,4 @@
 DIST rakudo-2012.05.tar.gz 1066098 SHA256 f691a8bebd3cff9c17dac6d5c81b85e2de446c2fc7814ea2142aeaf0c9a75d35 SHA512 92df50ab593f9eca7ecf71527fdc9859ae9a12d53d78143e427d8dfc011f6cc92b899995286ec0bc309e3e17eb91234a25ba8eb68bca2129d0a7f2433c5cb560 WHIRLPOOL e368e8e177001485c454b67f92f9f6230672a694d5b78d2307c2ad47451ee01ff805a0d5cee3001d95dded3d6969c09a4cce11e9da280e6ed96300d4d688a87c
 DIST rakudo-2012.06.tar.gz 1073037 SHA256 50ce8016bd73bda7ab9b8367af2b68d3f4b8d30d323ee60e80ab167e3fdc115c SHA512 a97d3a477c1bd82ea46575b423feeae69a2706c96495cb5d03d3d669707c21157b84f6893a1f0eae881f721825eb9db90c1c75ec82bdbbcc3c8c2fac2019737c WHIRLPOOL 91f36376c6a378cc62d2821a511d7abbca79cabdf29c6499b8242e605523d92479736da2b7fa38130c8bcd1fd0a75ae73c17ffad5511bcd8ad9ebd977a4468cb
 DIST rakudo-2012.07.tar.gz 1078876 SHA256 c95258d0fb864957e8be218494030b57d807a91f5a0dd26ac3f59aeffdfea4b0 SHA512 ea5c57ee8301a3d3341bda186cfcf4e55419fd4aedc3c9500df39f9684fc1c5952e893f519311cfb7c151f1eac54fa6e6036e193d0bb24f7630deb2584e7f8fc WHIRLPOOL b6452daf834a3fd9e07b003c170069a9c8c0e07301d0baafe26c905994fd705b41aec088497861131163eb97d5f53b2307c405b7c8b957daf22be82adc3b5133
+DIST rakudo-2012.08.tar.gz 1090560 SHA256 6bbd54317fbf650fdeca6781b73eec9945d47643472efc5cbb4be8475fd90dde SHA512 7da6b19d8f07dfd21f1681a6259a5b7d1fab721c78e80f23c10bfb6bfa206ed263de4a6546dfbc3a06ba7982e9b01fccacc633cb01a8c984a2e02ed42509faf3 WHIRLPOOL bf6e1b2de487ef958664f7bfdbf716187e3c9eb008999a02a8c4ff66f07d3d7ef708694b98113596c3a3d17aaa126e2a67ab1578b02a1733813d18108c7f7f36
diff --git a/dev-lang/rakudo/rakudo-2012.08.ebuild b/dev-lang/rakudo/rakudo-2012.08.ebuild
new file mode 100644
index 000000000000..a4c042175308
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2012.08.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2012.08.ebuild,v 1.1 2012/08/24 03:04:17 patrick Exp $
+
+EAPI=3
+
+PARROT_VERSION="4.4.0"
+NQP_VERSION="${PV}"
+
+inherit eutils multilib
+
+DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/parrot-${PARROT_VERSION}[unicode]
+	>=dev-lang/nqp-${NQP_VERSION}"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	sed -i "s,\$(DOCDIR)/rakudo$,&-${PVR}," tools/build/Makefile.in || die
+}
+
+src_configure() {
+	perl Configure.pl || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README docs/ChangeLog docs/ROADMAP || die
+
+	if use doc; then
+		dohtml -A svg docs/architecture.html docs/architecture.svg || die
+		dodoc docs/*.pod || die
+		docinto announce
+		dodoc docs/announce/* || die
+	fi
+}
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index cadf7c49ee31..58805a7af6eb 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,3 +1,4 @@
 DIST PadWalker-1.92.tar.gz 14573 SHA256 27a65d8a5f5eac3563a28cb727eff8b72d8ae29be8f5ef6dff0a9839c6576156 SHA512 3cbe82a04e1aa4ff35b02c40bb1a239d9f280f50a3bc3fcc92f16b7be1340a5fa6d6fcb0cc2ce1439e5c7d3bddd95554cab11c1686f724e1872bd0247c5ad33c WHIRLPOOL b71652a2f898bcfd278fb859e9d389402ace56be81798406e0d86cbe3f1e226681bfe20a87f6612a57eac3af6a9ffb5185c144555d1b43ea0f025d7aec962d58
 DIST PadWalker-1.93.tar.gz 14694 SHA256 f40d241a4bf2a981fde63a89ff2647fd6ca253c7fa56948dc300aa74c74720f7 SHA512 45cda5ab8d54550c9c124021bbc7b794ee869b6799b2d8cd0227a93ba6f39c753914a3f291315996ae135538987bbba2d8f279c48e8e92dc156e843eae06e31c WHIRLPOOL 71d7ff08d1be899f074a694a5a5ecce7ad269ba325b44862527850edb1a9e38931f110c9b9bd91c6212c1a12fc97cc4aefce3abd6f5dfd525878e43ec31d222e
 DIST PadWalker-1.94.tar.gz 15226 SHA256 eeefa287f13cb43ba968934d8b7bbaf2ab408ea92ab99a30ca2ab16881e2cb34 SHA512 0053189ae9d21af5e0c0b338b7ed1d7aceca751c755b6809678ad6ab545abebe1b977bef70c962d4bac46fb25b96be4d608e392066d716f0ab9932570a56ea92 WHIRLPOOL 58ffbfdeecb5a4628ffe9c28da0e3f57236f7ebcb5626c533830f6e35cf5afeef8e9c16b9773721de8185228c6864eefd984328177a36c81cd753773afdd5e7b
+DIST PadWalker-1.95.tar.gz 15480 SHA256 02912fe5a39af9283b561ab3ba02b738adf25851057790777e4427e862cd8ed1 SHA512 b4609dfeb2ff0bd6a48168653b3221a9e084a72127f1a60b43a9c00044592690211ce349d4e7e83bf890d9c7d4ce73f0defabcab9b3072a8fd5b04bf752784df WHIRLPOOL d630f75da24fbf4c4d17fc3fc107dbe8443e3a008f1ed8103ea7de36396e5d65260ad49962c2bc3364a29aafa32261a2d30a004faa1782dad7e69f4c033d9997
diff --git a/dev-perl/PadWalker/PadWalker-1.950.0.ebuild b/dev-perl/PadWalker/PadWalker-1.950.0.ebuild
new file mode 100644
index 000000000000..a4c3ccc9533c
--- /dev/null
+++ b/dev-perl/PadWalker/PadWalker-1.950.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PadWalker/PadWalker-1.950.0.ebuild,v 1.1 2012/08/23 18:02:55 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=ROBIN
+MODULE_VERSION=1.95
+inherit perl-module
+
+DESCRIPTION="play with other peoples' lexical variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
index b6ea60b307c1..4054586fb9cf 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.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/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild,v 1.2 2012/08/22 11:29:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild,v 1.3 2012/08/24 05:00:58 xmw Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries."
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild
index c1210570b01d..1e9a9762d96a 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.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-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild,v 1.2 2012/08/22 11:28:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild,v 1.3 2012/08/24 05:00:09 xmw Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 
 DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages."
 LICENSE="PHP-2.02"
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 51f83e8870bc..dcf6c1f1c563 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,2 +1 @@
-DIST yaml-1.0.1.tgz 33774 SHA256 cfd03416c6a7dc22f0f4c8faeaf79478973084e1686801387864636146dccc11 SHA512 6b53907034621eb761c149d45edc043ccbc2ce071d90f7666b9e99c17b2eb231f4e8776f211eca09b83a049ab31450496a08662dab943d2ce2b0d7d6be54759f WHIRLPOOL 914414da51cfc125a34be0bed3677a2faea50c5c896c0e8afaa7418ffecdf442ca78ed577867f25a0976a25c0e0641adf7432913cff766b93f088f145a95b2b7
 DIST yaml-1.1.0.tgz 35916 SHA256 eecaad722d177a1cea61c7efb454a360fd3e288a50a528e4d23d44d420aa9f4a SHA512 a1148d0ea671766043135dc898e239504e25f69f794cad5145eb0c041bbe4de54f3b29edd6dbe2d4190543ce0e1cc709d221cc6d0492cc79736a4b99d8facb09 WHIRLPOOL 1b423effe76b122cd2e16c932664192bb49a0bbec2979ef73c05f269f3e3e716792d1466f132666f61141f527d637bdda78d18be8af094e6bae7357db8ee00ce
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.0.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.0.1.ebuild
deleted file mode 100644
index d6909cc3e868..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-yaml/pecl-yaml-1.0.1.ebuild,v 1.1 2011/12/14 22:51:36 mabi Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CREDITS EXPERIMENTAL README"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Support for YAML 1.1 (YAML Ain't Markup Language) serialization
-using the LibYAML library."
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index ff53352b402e..1f039d39d821 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -1,2 +1 @@
 DIST suhosin-0.9.32.1.tar.gz 119117 SHA256 d283abcbd1803eaa11bbd91cb5aae727b2bbab3a00a1de8510f85d8cc598e490 SHA512 3bdfb16af6c679950eaf06a45f8826fa7e90085d2107440bc4aaf2c1f98e1f681d11a99c0de8913330fe9de57d1e038e97747a3f820ad3a38b6e196fbb00c3d6 WHIRLPOOL 7a75a717afc51c53ece34af818f3431b61717f4902a5795ae2ee42abc6604fbdd1523dbf525ea33fb650b699e64918f5cb2dc8e3129c5b33777250478216e93d
-DIST suhosin-0.9.33.tgz 104488 SHA256 865b1c72bae9a5a710fe0b07a0635556ce6c838653ec364d2a2a6e6f594529c5 SHA512 a9db84da19ae2fed29b8d3c61d253ab4f00dea986b202b45e55a9277e01e1c2037a720668dfd506b5a2a544131a006bb454b2c3c9440742f54e7371d62375dc8 WHIRLPOOL f88544b012940233cf492c8cabaeb763d288447ef3d7168360bbde180b533ff874c3d43add308fb76613893a10ac00b7f1ae1c0acb35fcfa74f70d5a43596c68
diff --git a/dev-php/suhosin/suhosin-0.9.33.ebuild b/dev-php/suhosin/suhosin-0.9.33.ebuild
deleted file mode 100644
index cc0c937e9672..000000000000
--- a/dev-php/suhosin/suhosin-0.9.33.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.33.ebuild,v 1.8 2012/02/18 19:43:56 armin76 Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="suhosin"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-source-r2
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
-
-DESCRIPTION="Suhosin is an advanced protection system for PHP installations."
-HOMEPAGE="http://www.suhosin.org/"
-SRC_URI="http://download.suhosin.org/${P}.tgz"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php[unicode]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		epatch "${FILESDIR}"/${P}-libcrypt.patch
-		epatch "${FILESDIR}"/${P}-fix-ZTS-compile-problem.patch
-	done
-	php-ext-source-r2_src_prepare
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-	dodoc CREDITS
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		for inifile in ${PHPINIFILELIST} ; do
-			insinto "${inifile/${PHP_EXT_NAME}.ini/}"
-			insopts -m644
-			doins "suhosin.ini"
-		done
-	done
-}
-
-src_test() {
-	# Makefile passes a hard-coded -d extension_dir=./modules, we move the lib
-	# away from there in src_compile
-	for slot in `php_get_slots`; do
-		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
-	done
-}
diff --git a/dev-php/xdebug/xdebug-2.2.0.ebuild b/dev-php/xdebug/xdebug-2.2.0.ebuild
index 063b0462b438..faaec698ce20 100644
--- a/dev-php/xdebug/xdebug-2.2.0.ebuild
+++ b/dev-php/xdebug/xdebug-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0.ebuild,v 1.2 2012/08/22 11:26:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0.ebuild,v 1.3 2012/08/24 04:57:26 xmw Exp $
 
 EAPI="4"
 PHP_EXT_NAME="xdebug"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
diff --git a/dev-python/pyxdg/pyxdg-0.23.ebuild b/dev-python/pyxdg/pyxdg-0.23.ebuild
index e2d70b89fd91..5dd120a49905 100644
--- a/dev-python/pyxdg/pyxdg-0.23.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.23.ebuild,v 1.1 2012/07/30 19:34:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.23.ebuild,v 1.3 2012/08/23 22:11:29 johu Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://people.freedesktop.org/~takluyver/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 PYTHON_MODNAME=xdg
diff --git a/dev-util/cmake/cmake-2.8.8-r3.ebuild b/dev-util/cmake/cmake-2.8.8-r3.ebuild
index a7a82abdc423..9ac6256bf183 100644
--- a/dev-util/cmake/cmake-2.8.8-r3.ebuild
+++ b/dev-util/cmake/cmake-2.8.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.7 2012/08/18 02:00:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.8 2012/08/23 21:06:34 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
diff --git a/dev-vcs/git/git-1.6.4.5.ebuild b/dev-vcs/git/git-1.6.4.5.ebuild
index 63ce7fa65293..6c5b6d55aac5 100644
--- a/dev-vcs/git/git-1.6.4.5.ebuild
+++ b/dev-vcs/git/git-1.6.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.10 2011/04/04 08:58:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.5.ebuild,v 1.11 2012/08/23 20:18:14 robbat2 Exp $
 
 EAPI=2
 
diff --git a/dev-vcs/git/git-1.7.10.2.ebuild b/dev-vcs/git/git-1.7.10.2.ebuild
index 9cc604d18ff6..b97511b839d9 100644
--- a/dev-vcs/git/git-1.7.10.2.ebuild
+++ b/dev-vcs/git/git-1.7.10.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-vcs/git/git-1.7.10.2.ebuild,v 1.4 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.2.ebuild,v 1.6 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.10.ebuild b/dev-vcs/git/git-1.7.10.ebuild
index e3888be3c603..76fa906bd41e 100644
--- a/dev-vcs/git/git-1.7.10.ebuild
+++ b/dev-vcs/git/git-1.7.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.10.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.11.1.ebuild b/dev-vcs/git/git-1.7.11.1.ebuild
index 1f2570bdd64e..884ee6fdd23e 100644
--- a/dev-vcs/git/git-1.7.11.1.ebuild
+++ b/dev-vcs/git/git-1.7.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.11.1.ebuild,v 1.1 2012/07/07 05:29:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.11.1.ebuild,v 1.3 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.12-r1.ebuild b/dev-vcs/git/git-1.7.12-r1.ebuild
index be77f1ddffcc..97b8f74f6592 100644
--- a/dev-vcs/git/git-1.7.12-r1.ebuild
+++ b/dev-vcs/git/git-1.7.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/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.3 2012/08/22 05:14:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.5 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.12-r2.ebuild b/dev-vcs/git/git-1.7.12-r2.ebuild
index 04e294cec4eb..6af0ba908717 100644
--- a/dev-vcs/git/git-1.7.12-r2.ebuild
+++ b/dev-vcs/git/git-1.7.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.1 2012/08/23 05:38:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.3 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.12.ebuild b/dev-vcs/git/git-1.7.12.ebuild
index 96c07596c9db..d9fb18509fea 100644
--- a/dev-vcs/git/git-1.7.12.ebuild
+++ b/dev-vcs/git/git-1.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.4 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.2.5.ebuild b/dev-vcs/git/git-1.7.2.5.ebuild
index 1e7fa9b29936..bc47b7628bd9 100644
--- a/dev-vcs/git/git-1.7.2.5.ebuild
+++ b/dev-vcs/git/git-1.7.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.13 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.5.ebuild,v 1.14 2012/08/23 20:18:14 robbat2 Exp $
 
 EAPI=3
 
diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
index 048177f5682a..0755dcb94197 100644
--- a/dev-vcs/git/git-1.7.3.4-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.17 2011/08/19 18:43:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.18 2012/08/23 20:18:14 robbat2 Exp $
 
 EAPI=3
 
diff --git a/dev-vcs/git/git-1.7.9.1.ebuild b/dev-vcs/git/git-1.7.9.1.ebuild
index bc9b81b9ee40..81f1519b0b41 100644
--- a/dev-vcs/git/git-1.7.9.1.ebuild
+++ b/dev-vcs/git/git-1.7.9.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-vcs/git/git-1.7.9.1.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.1.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9.2.ebuild b/dev-vcs/git/git-1.7.9.2.ebuild
index 885567f37872..f6a07fa1d19a 100644
--- a/dev-vcs/git/git-1.7.9.2.ebuild
+++ b/dev-vcs/git/git-1.7.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.2.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9.3.ebuild b/dev-vcs/git/git-1.7.9.3.ebuild
index 53e5fcf28ab5..7b0d625f1dda 100644
--- a/dev-vcs/git/git-1.7.9.3.ebuild
+++ b/dev-vcs/git/git-1.7.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/dev-vcs/git/git-1.7.9.3.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.3.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9.4.ebuild b/dev-vcs/git/git-1.7.9.4.ebuild
index 1bca4749c6dd..7906f23fd2ed 100644
--- a/dev-vcs/git/git-1.7.9.4.ebuild
+++ b/dev-vcs/git/git-1.7.9.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-vcs/git/git-1.7.9.4.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.4.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild
index 4125cc4d4cf1..77dcf1de83e1 100644
--- a/dev-vcs/git/git-1.7.9.7.ebuild
+++ b/dev-vcs/git/git-1.7.9.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-vcs/git/git-1.7.9.7.ebuild,v 1.5 2012/07/27 17:14:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9.ebuild b/dev-vcs/git/git-1.7.9.ebuild
index e53a31588356..27ad325b98f4 100644
--- a/dev-vcs/git/git-1.7.9.ebuild
+++ b/dev-vcs/git/git-1.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.5 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-1.7.9_rc2.ebuild b/dev-vcs/git/git-1.7.9_rc2.ebuild
index b69df564bc23..0878dc1ed0e2 100644
--- a/dev-vcs/git/git-1.7.9_rc2.ebuild
+++ b/dev-vcs/git/git-1.7.9_rc2.ebuild
@@ -1,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.9_rc2.ebuild,v 1.5 2012/06/14 04:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.7 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gtk highlight +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 93b358bb4240..acc318137d70 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.35 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.37 2012/08/24 03:51:48 zmedico Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
@@ -60,7 +60,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
-			cgi? ( virtual/perl-CGI app-text/highlight )
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 52b84f64d19d..41c2e4977b96 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -28,5 +28,6 @@
     <flag name="webdav">Adds support for push'ing to HTTP repositories via DAV.</flag>
     <flag name="gtk">Include the gitview contrib tool.</flag>
     <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support.</flag>
+	<flag name="highlight">GitWeb support for app-text/highlight.</flag>
   </use>
 </pkgmetadata>
diff --git a/games-action/powermanga/powermanga-0.90.ebuild b/games-action/powermanga/powermanga-0.90.ebuild
index cce687c447b7..5adae1c74cc6 100644
--- a/games-action/powermanga/powermanga-0.90.ebuild
+++ b/games-action/powermanga/powermanga-0.90.ebuild
@@ -1,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-action/powermanga/powermanga-0.90.ebuild,v 1.12 2012/08/08 15:00:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/powermanga/powermanga-0.90.ebuild,v 1.13 2012/08/24 06:59:11 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -18,7 +18,7 @@ DEPEND=">=media-libs/libsdl-1.2[audio,joystick,video]
 	media-libs/libpng
 	x11-libs/libXext
 	x11-libs/libXxf86dga
-	media-libs/sdl-mixer[mikmod]"
+	media-libs/sdl-mixer[mod]"
 
 src_prepare() {
 	sed -i -e "/null/d" graphics/Makefile.in || die
diff --git a/games-arcade/ceferino/ceferino-0.97.8.ebuild b/games-arcade/ceferino/ceferino-0.97.8.ebuild
index 99149238bae4..f79f0b6b1eb7 100644
--- a/games-arcade/ceferino/ceferino-0.97.8.ebuild
+++ b/games-arcade/ceferino/ceferino-0.97.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ceferino-0.97.8.ebuild,v 1.5 2010/01/25 22:11:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ceferino/ceferino-0.97.8.ebuild,v 1.6 2012/08/24 07:01:08 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -47,10 +47,10 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[mikmod]" ; then
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
 		ewarn
 		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mikmod\" USE flag turned on."
+		ewarn "with the \"mod\" USE flag turned on."
 		ewarn
 	fi
 }
diff --git a/games-board/pokerth/pokerth-0.9.5.ebuild b/games-board/pokerth/pokerth-0.9.5.ebuild
index 32e42469c27d..50d1913bd625 100644
--- a/games-board/pokerth/pokerth-0.9.5.ebuild
+++ b/games-board/pokerth/pokerth-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.5 2012/08/23 16:34:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.6 2012/08/23 17:06:52 mr_bones_ Exp $
 
 EAPI=2
 inherit flag-o-matic eutils qt4-r2 games
@@ -65,6 +65,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-ldflags $(no-as-needed)
 	eqmake4
 }
 
diff --git a/games-emulation/stella/stella-3.7.2.ebuild b/games-emulation/stella/stella-3.7.2.ebuild
index aca782b77998..c2398acd840d 100644
--- a/games-emulation/stella/stella-3.7.2.ebuild
+++ b/games-emulation/stella/stella-3.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-3.7.2.ebuild,v 1.1 2012/08/11 20:49:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-3.7.2.ebuild,v 1.2 2012/08/23 23:38:49 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils gnome2-utils games
@@ -52,7 +52,7 @@ src_configure() {
 src_install() {
 	# icons
 	local i
-	for i in 48 128 ; do 
+	for i in 48 128 ; do
 		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
 	done
 
diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index b1c59b174937..1bca5e0e0fc5 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1,6 +1,7 @@
-DIST frobtads-0.13.tar.gz 1513088 RMD160 016c2d0af44560802d8ed8822b4599af1d68e20f SHA1 2a03ebba5a0332dda6e2413ff950b9c079437f96 SHA256 0996f1453cc6b650e108d58e762037f25c4ecf5f4d784bbc52d7316b1ff69a29
-DIST frobtads-1.0.tar.gz 1513973 RMD160 72cf59be7bf780a89dcb56c7f6f3f1aa880b132e SHA1 97d17fd9377d0860b754a7313f13739f9134890a SHA256 504f0b20546c7be04a60c94bf6125991fc1902b6141963c69753de16b4a42e9c
-DIST frobtads-t2compiler-0.13.tar.gz 131422 RMD160 e0c45c12cddf6167ce6921ff9aa01e17af3e2621 SHA1 cabc8f4303acadafde469f6e084b9a5a4b7d6e2b SHA256 49c759e960eed12b98016d13a8e954080614c13fb2dde10d7119571d8e7dcd61
-DIST frobtads-t2compiler-1.0.tar.gz 131319 RMD160 78a352f79dd4a721e8ed41f112e831fc8f8d5e07 SHA1 b299d0133bda7d0591b39efb131a3af140eb57d7 SHA256 3f67e45f86905f53f9947b0512de53729dd219d1df8743d6c3e5d4404a0b0af6
-DIST frobtads-t3compiler-0.13.tar.gz 2203638 RMD160 df2bbe12c3a28ffea1f0eb132d72879f2218a48b SHA1 1c46bf86ae19297fadb2e95fdf621489b5a7465a SHA256 eb3a0ea14b72f133282bc0944a3f5b9359c138ecb0329ac2551304b299811221
-DIST frobtads-t3compiler-1.0.tar.gz 2206632 RMD160 b5bfaf2c116afc1e8e4cf7eaf5cfc411938b3e1b SHA1 76520c66aa19ffea7557a4f8e8187bdb5b0b0ef9 SHA256 049691706e9ed8b2e81914dfc831003eb476483c462939da802a2769725ea16a
+DIST frobtads-0.13.tar.gz 1513088 SHA256 0996f1453cc6b650e108d58e762037f25c4ecf5f4d784bbc52d7316b1ff69a29
+DIST frobtads-1.0.tar.gz 1513973 SHA256 504f0b20546c7be04a60c94bf6125991fc1902b6141963c69753de16b4a42e9c SHA512 0c79fefa4700cb9a20bf305296621265b9cb001ece5ec14887a7dcf5b6e54bee87a9d60a15799371893e93f96d4036a237a7294229a42f9af03f9a6a50a0abe3 WHIRLPOOL bf926096e47d90638809f748403bad5e141d8ec4af8bf3cc38f602251be96e9680f857928029f49b8756e3159868857d9327a4b50696bf64197880c16671cab3
+DIST frobtads-1.2.1.tar.gz 5203115 SHA256 4c7da491d39b9ff4640e561e97e97e4ae5e7be7bd2041ed632d600e4326c48e5 SHA512 a8367fa830dae0aebeac0c49471283c6db7de60e18f5e904056eadad3329ec2f263462a64db3179066f10bd2712778309d09583474b03615e48c5f34365f4b1e WHIRLPOOL ed44f60bf763cd3dcac5891a002d8c6bc215d82f41b7e530127b6de5d6da9d99c38a2139457cb518ea2dc37438ae43614ddf4c202472708971255aaf907a89da
+DIST frobtads-t2compiler-0.13.tar.gz 131422 SHA256 49c759e960eed12b98016d13a8e954080614c13fb2dde10d7119571d8e7dcd61
+DIST frobtads-t2compiler-1.0.tar.gz 131319 SHA256 3f67e45f86905f53f9947b0512de53729dd219d1df8743d6c3e5d4404a0b0af6 SHA512 dc3f135a9429b833d471582eceedd109eb1b7b43a6d685814afe0bc677a0b0f70eb57914744feb1f62455b6c67ffa30fa7bc121ca8fc30cab46ee51b1ca50258 WHIRLPOOL 435e0ed350b97100f368dc0a1dc182016abcf2c2f3f9a9a1a20e8f781a833bee411032a316cd349c483dc40a864f5fea29b6c73de6e5a8310965034aee9a1a1b
+DIST frobtads-t3compiler-0.13.tar.gz 2203638 SHA256 eb3a0ea14b72f133282bc0944a3f5b9359c138ecb0329ac2551304b299811221
+DIST frobtads-t3compiler-1.0.tar.gz 2206632 SHA256 049691706e9ed8b2e81914dfc831003eb476483c462939da802a2769725ea16a SHA512 cd3562cf66da50a12dd0f1406e5764c34533e576d969d135bfb8c9d513ed82750431f9289b4bec7aa84c3449a110e9ce28a331f9fb90a4ef17741d225ce942f6 WHIRLPOOL b6d7ca56f6fe1dea7c27bd9fc508912b6a69303cda87cae4bba0795210e0026deedad63fc1eee4ec40a2599488e1e5af257f7ac5316e47da428eb93ce50af814
diff --git a/games-engines/frobtads/files/frobtads-1.2.1-underlinking.patch b/games-engines/frobtads/files/frobtads-1.2.1-underlinking.patch
new file mode 100644
index 000000000000..6f7609dbe20c
--- /dev/null
+++ b/games-engines/frobtads/files/frobtads-1.2.1-underlinking.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug 23 17:57:20 UTC 2012
+Subject: build system
+
+fix underlinking
+
+--- configure.ac
++++ configure.ac
+@@ -631,6 +631,7 @@
+ #
+ AM_CONDITIONAL([NO_TLS], [test x$ac_cv_tls = xnone])
+ 
++LIBS="$LIBS -lpthread"
+ 
+ #
+ # Generate the output files.
diff --git a/games-engines/frobtads/frobtads-1.2.1.ebuild b/games-engines/frobtads/frobtads-1.2.1.ebuild
new file mode 100644
index 000000000000..041d2dd95c54
--- /dev/null
+++ b/games-engines/frobtads/frobtads-1.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/frobtads/frobtads-1.2.1.ebuild,v 1.1 2012/08/23 19:48:06 hasufell Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic games
+
+DESCRIPTION="Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures"
+HOMEPAGE="http://www.tads.org/frobtads.htm"
+SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
+
+LICENSE="TADS2 TADS3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tads2compiler tads3compiler"
+
+RESTRICT="!tads3compiler? ( test )"
+
+RDEPEND="net-misc/curl
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -fno-strict-aliasing -fpermissive
+	append-cflags -fno-strict-aliasing
+	egamesconf \
+		--disable-silent-rules \
+		$(use_enable debug t3debug) \
+		$(use_enable debug error-checking) \
+		$(use_enable tads2compiler t2-compiler) \
+		$(use_enable tads3compiler t3-compiler)
+}
+
+src_test() {
+	# FIXME: make check broken
+#	if use debug; then
+#		emake -j1 check
+#	fi
+
+	emake -j1 sample
+	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
+		save
+		testsave.sav
+		restore
+		testsave.sav
+	END_FROB_TEST
+	[[ $? -eq 0 ]] || die "Failed to run test game"
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index ffd0d77925b7..34a5297fc00d 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1 +1 @@
-DIST yakuake-2.9.8.tar.bz2 319316 RMD160 5035391d271d0a514b94fd167509500f1d0efc2a SHA1 b9c9e23f276d62b4d2c31fe6c79fad2a5c551186 SHA256 a359dfe47cd230af9663854972f2594716674e63f9c0413ba11629aaaa1d3d29
+DIST yakuake-2.9.8.tar.bz2 319316 SHA256 a359dfe47cd230af9663854972f2594716674e63f9c0413ba11629aaaa1d3d29 SHA512 37e1c8323c76f09e60677bc6283825e42e3c29c68ef9b86fd3797191d6911ab3958635953bb959e64fa4721b643764f6d2fe3aee6443e2a1f0c5f5c625850b84 WHIRLPOOL cec6f9da373c3b1da34432cd772cd37831f9df3ffe0d9e14f31e96f1f5c90da064808f24f595086f50968b39218330e5ab44ebbd2c126e91b3ddc9b55f808283
diff --git a/kde-misc/yakuake/yakuake-2.9.8-r1.ebuild b/kde-misc/yakuake/yakuake-2.9.8-r1.ebuild
new file mode 100644
index 000000000000..7208ef886dc1
--- /dev/null
+++ b/kde-misc/yakuake/yakuake-2.9.8-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.8-r1.ebuild,v 1.1 2012/08/23 23:23:25 johu Exp $
+
+EAPI=4
+
+KDE_LINGUAS="ca cs da de el en_GB es et fr ga gl hr it ja ko nb nds nl nn pl pt
+pt_BR ro ru sk sv th tr uk wa zh_CN"
+inherit kde4-base
+
+DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
+HOMEPAGE="http://yakuake.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="$(add_kdebase_dep konsole)
+	sys-devel/gettext"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/yakuake/yakuake-2.9.8.ebuild b/kde-misc/yakuake/yakuake-2.9.8.ebuild
index d021eff0d0b0..73075d148644 100644
--- a/kde-misc/yakuake/yakuake-2.9.8.ebuild
+++ b/kde-misc/yakuake/yakuake-2.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.8.ebuild,v 1.5 2011/06/01 19:51:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.8.ebuild,v 1.6 2012/08/23 23:23:25 johu Exp $
 
 EAPI=3
 
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index 000fdede84a5..d4f7faf5f8d6 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,3 +1,4 @@
 DIST libquvi-scripts-0.4.2.tar.xz 93568 SHA256 44eaf1c1a1613914b26d4ffc09b84d4df0ee952286c607784fb19dd2352d583d SHA512 5fefe3f0a1551ebffc2b1c34217b3401b52c621a530d88f977c826ef29db4b6b560c279a0eb3f9756b0c57bf91dd08f9522a7e59b2a2b07cc653e08f362985eb WHIRLPOOL 43c6f6b7852f190123865dd4d5bbbfab0c101ca89ae57110937bb1a671da709a93d9f4ff1b1ed6331bdd162ab78b9731eb3488305f3e777d5be1f5c1d1e1da13
 DIST libquvi-scripts-0.4.6.tar.xz 101896 SHA256 ec2d8e06b775bfe6caa8cf3f885585868d440a0f0f1f67560876fb99a737d49f SHA512 f76232522648aeaac7bae5a1b9ca870f40b8697e8c3df2506c02d72d170b73505914bf1ffaccee218541b84057bf64f8ab5cd13808763212c0b19d207c430398 WHIRLPOOL f6b9b1e289eeed522caec6e33e7bbd23ef8f58bb6563b5a9c80951043fd9b48074d9a8427cb531fdc5cba54d04d7f32b0f4fe3662a0fdac3061c375811230913
 DIST libquvi-scripts-0.4.7.tar.xz 103024 SHA256 ef7e44b2ac9fbefb3f41c92383089527d379cf08c0693ce04db8c565eeed3901 SHA512 ac85991b90ba486029fdafaee87ed84b178c996f7247787228aaa4b4c4ff1284f3a3743f6f2aba86764e54b765b5abe60efcf81efc8b6c7cce0615144197309c WHIRLPOOL ad0fe5a78276aedf80ea2006a4459dfd50148fbf9448263e19066e68ae5585aa369a9c7bde5b6784c3ef3294435b246ed22b5ab7af200165a5e2cac911bade29
+DIST libquvi-scripts-0.4.8.tar.xz 106020 SHA256 c26268dd2378e2d3b772d964a1e97da9bf38382006db97fa18b33f43b7d9cdb4 SHA512 b754f06cbd377c10ef32b58eb1a8656449129ece1f9010de3c556c2f2760217e07dd28b0009a0094e1ac6251e7da546bfcef22919061b60c25483814ecb838fc WHIRLPOOL c2fb4673f8557c231d659d68411d75e289344a0aa3c7aa7188ae01a24e2ab81822413ecd77bf01155b81f238fee45e9dd7b82fe40d53860f6e0d941bd243914d
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.4.8.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.4.8.ebuild
new file mode 100644
index 000000000000..9ca0a5afeef9
--- /dev/null
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.4.8.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/media-libs/libquvi-scripts/libquvi-scripts-0.4.8.ebuild,v 1.1 2012/08/24 04:43:04 radhermit Exp $
+
+EAPI=4
+
+DESCRIPTION="Embedded lua scripts for libquvi"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="offensive"
+
+DEPEND="app-arch/xz-utils"
+
+# tests fetch data from live websites, so it's rather normal that they
+# will fail
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		--with-manual \
+		$(use_with offensive nsfw)
+}
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 47874c6c6a3f..d3e1b288b885 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,2 +1,2 @@
 DIST SDL_mixer-1.2.11.tar.gz 2690654 SHA256 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9 SHA512 60fc881afe6ad3d7cf9b7b54ac0f916dee526c501f13ae6472029c78432e3f563a0c4e957e0dd8ee4ea8c427cf27fae2805ea6241ca8cb0a5706d6a9108080ce WHIRLPOOL 328da39841068b44b85d7d4ee3afb5733574e873bee974e15585be695c1c8d24035ee3ea596b95575d3d887719b84803ed135e91beaf45ecfb08a5926aad3e99
-DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
+DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 WHIRLPOOL 046b7a160cfe214cdac8c1a5ea424024a8850d3737908e5630b504f1f12817bfd2f391909f37be3d6994cab7f71ab24ecab92e99f5429dd8405f0e4046bc00a7
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 7a09f4b971b9..dd6ca3ae9cf2 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.9 2012/07/29 18:49:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.10 2012/08/24 06:56:06 mr_bones_ 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 ~ia64 ~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-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
deleted file mode 100644
index c363793320dd..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.ebuild,v 1.13 2012/04/17 21:47:43 ranger Exp $
-
-EAPI=4
-inherit eutils
-
-MY_P=${P/sdl-/SDL_}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-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"
-IUSE="flac fluidsynth mad midi mikmod modplug mp3 playtools static-libs timidity vorbis +wav"
-REQUIRED_USE="
-	midi? ( || ( timidity fluidsynth ) )
-	timidity? ( midi )
-	fluidsynth? ( midi )
-	"
-
-DEPEND=">=media-libs/libsdl-1.2.10
-	flac? ( media-libs/flac )
-	midi? (
-		fluidsynth? ( media-sound/fluidsynth )
-		timidity? ( media-sound/timidity++ )
-	)
-	mad? ( media-libs/libmad )
-	!mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) )
-	modplug? ( media-libs/libmodplug )
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wav.patch
-	sed -i \
-		-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
-		Makefile.in || die
-}
-
-src_configure() {
-	local myconf=$(use_enable timidity music-timidity-midi) \
-			$(use_enable fluidsynth music-fluidsynth-midi)
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-music-flac-shared \
-		--disable-music-fluidsynth-shared \
-		--disable-music-mod-shared \
-		--disable-music-mp3-shared \
-		--disable-music-ogg-shared \
-		$(use_enable wav music-wave) \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable mikmod music-mod) \
-		$(use_enable modplug music-mod-modplug) \
-		$(use_enable flac music-flac) \
-		$(use_enable static-libs static) \
-		$(use mad && echo --disable-music-mp3 || use_enable mp3 music-mp3) \
-		$(use_enable mad music-mp3-mad-gpl) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	if use playtools; then
-		emake DESTDIR="${D}" install-bin
-	fi
-	dodoc CHANGES README
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
-}
-
-pkg_postinst() {
-	# bug 412035
-	# https://bugs.gentoo.org/show_bug.cgi?id=412035
-	if use midi ; then
-		if use fluidsynth; then
-			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
-			ewarn "environment variable to the location of a SoundFont file"
-			ewarn "unless the game or application happens to do this for you."
-
-			if use timidity; then
-				ewarn "Failing to do so will result in Timidity being used instead."
-			else
-				ewarn "Failing to do so will result in silence."
-			fi
-		fi
-	fi
-}
diff --git a/media-plugins/quodlibet-plugins/Manifest b/media-plugins/quodlibet-plugins/Manifest
index f521d0f62615..3af602cbe2d8 100644
--- a/media-plugins/quodlibet-plugins/Manifest
+++ b/media-plugins/quodlibet-plugins/Manifest
@@ -1,2 +1,2 @@
-DIST quodlibet-plugins-2.3.92.tar.gz 91692 RMD160 630b9b7ab22c85e41d57d355808e1e7eb82253e2 SHA1 c9f75f37b9f1f1304a90617a0ff28f906cf78129 SHA256 2d1126c0eff5e2069a773128045c4af9edfcdf61898d495b7196743bee3dcc27
-DIST quodlibet-plugins-2.4.tar.gz 92116 RMD160 5f33fd96e81e1a8a0b436f9c8190bd62b06028e6 SHA1 761fe89ed200daf602c1b0685a664a438c6de3bb SHA256 c28186ee5833dc306a44350e6528616e52741d2ed2d48ce0156cb38a581432c0
+DIST quodlibet-plugins-2.3.92.tar.gz 91692 SHA256 2d1126c0eff5e2069a773128045c4af9edfcdf61898d495b7196743bee3dcc27
+DIST quodlibet-plugins-2.4.tar.gz 92116 SHA256 c28186ee5833dc306a44350e6528616e52741d2ed2d48ce0156cb38a581432c0
diff --git a/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild b/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild
index 3236628ddf08..44e0032e85b6 100644
--- a/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild
+++ b/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild,v 1.4 2012/06/12 06:07:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.ebuild,v 1.5 2012/08/23 20:34:38 xmw Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-sound/quodlibet-${PV}"
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index ef23673e267e..6a78f0dad888 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -8,31 +8,25 @@
 	<name>Jorge Manuel B. S. Vicetto</name>
 </maintainer>
 <use>
-	<flag name="daap">
-		Enable the scripts for music sharing through DAAP. This flag adds
+	<flag name="daap">Enable the scripts for music sharing through DAAP. This flag adds
 		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
 		the Amarok music collection through DAAP protocol. Please note
 		that turning this flag off has no effect on DAAP browsing.
 	</flag>
-	<flag name="embedded">
-		Use libmysqld, MySQL embedded server library.
+	<flag name="embedded">Use libmysqld, MySQL embedded server library.
 		Try disabling this if you encounter -PIC related in amarok,
 		it will make amarok rely only on standalone MySQL server.
 	</flag>
-	<flag name="lastfm">
-		Enable Last.fm streaming services support through
+	<flag name="lastfm">Enable Last.fm streaming services support through
 		<pkg>media-libs/liblastfm</pkg>
 	</flag>
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
-	<flag name="mtp">
-		Enable support for libMTP (Plays4Sure) devices access through libmtp
+	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
 	</flag>
-	<flag name="ofa">
-		Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)
 	</flag>
-	<flag name="utils">
-		Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg>
 	</flag>
 </use>
 </pkgmetadata>
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index c5b11a94cc89..6962a9b5fc86 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,3 @@
-DIST audacity-minsrc-2.0.0.tar.bz2 6625078 RMD160 a6e999751296770091d147182a0585479b7c4573 SHA1 0175474e63c51aaa97df9b45574f7f307f1d3bc8 SHA256 d849288ca5f90764d497953e7d2744e269bfbb6f71840762c66419e4c68aeb6a
-DIST audacity-minsrc-2.0.1.tar.bz2 6771643 RMD160 8a3db262a569d2f61775642885761447917ec2f2 SHA1 366a10f3bd71c4d84c29437fff1e27a8560f691b SHA256 bda21ec18233e683ab9ef983ece9eb0637198743aac84624b42b04756822e52a
+DIST audacity-minsrc-2.0.0.tar.bz2 6625078 SHA256 d849288ca5f90764d497953e7d2744e269bfbb6f71840762c66419e4c68aeb6a SHA512 b3056c63ae1946915d15872e871a3acfa213da1d518dd1521cae5dab27c5626e04895a5dc52aa2fb4ff73c931beb810de4c1b2982216e994df2beded9ec0a830 WHIRLPOOL a1be04dfed9cf184b515ef4da461c1bc0381b61c1563e72db4a1276e0536f8d7e2fe97209c48d189f7084fc2c1e31ffdb95a8affb2e3cc080c5d412d28ece588
+DIST audacity-minsrc-2.0.1.tar.bz2 6771643 SHA256 bda21ec18233e683ab9ef983ece9eb0637198743aac84624b42b04756822e52a SHA512 6d7fda9ac7582cf658b7f54b5a9e6a1a8318d4921bcdcb31be03356d20deacbcfb0c9757780675ab33aae93ceb5a2990b96b12f5817ff0c0ee5352c3caf20002 WHIRLPOOL de6c3fb49a05d0e527e7f78212436a802ed2d01743164a2600167701f0f246d1d1b30b3df8ad1aa366f4109f880fb8d1bc8ad5ae0e60a35f6cdac4f532740cc6
+DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e WHIRLPOOL 3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
diff --git a/media-sound/audacity/audacity-2.0.2.ebuild b/media-sound/audacity/audacity-2.0.2.ebuild
new file mode 100644
index 000000000000..b8f2fc91754f
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-2.0.2.ebuild,v 1.1 2012/08/24 05:03:30 radhermit Exp $
+
+EAPI=4
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="http://audacity.googlecode.com/files/${MY_T}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( virtual/ffmpeg )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * if libsamplerate not requested, use libresample instead.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libresample) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with sbsms) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index ad1c65cc5385..1a475ed3afcc 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,2 +1 @@
-DIST mixxx-1.10.0-src.tar.gz 15852338 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97 SHA512 8ebb3bd303f6c32cf67c00e6a767f855c5cd4bd17216d4d290a3b0f6dbe25250301ed7dbb529a89f61ad60797327688b8cf9832082c87b62921d681a0ab16f58 WHIRLPOOL 782a7fd4c2d31aabd4156878370952d097fadadc82736c6e7d208baaede96612129841fb592cb21432605fcf79d5082dcf375455256405d4f0f93e7b04bebae2
 DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3 WHIRLPOOL 39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch b/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
deleted file mode 100644
index c0d395d48917..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
-+++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c
-@@ -114,7 +114,11 @@
- 	faacDecSetConfiguration(priv->decoder, neaac_cfg);
- 
- 	/* open mpeg-4 file */
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+	priv->mp4.handle = MP4Read(ip_data->filename);
-+#else
- 	priv->mp4.handle = MP4Read(ip_data->filename, 0);
-+#endif
- 	if (!priv->mp4.handle) {
- 		d_print("MP4Read failed\n");
- 		goto out;
---- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
-+++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
-@@ -164,7 +164,11 @@
-     faacDecSetConfiguration(priv->decoder, neaac_cfg);
- 
-     /* open mpeg-4 file */
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+    priv->mp4.handle = MP4Read(ip_data->filename);
-+#else
-     priv->mp4.handle = MP4Read(ip_data->filename, 0);
-+#endif
-     if (!priv->mp4.handle) {
-         qDebug() << "MP4Read failed";
-         goto out;
diff --git a/media-sound/mixxx/mixxx-1.10.0.ebuild b/media-sound/mixxx/mixxx-1.10.0.ebuild
deleted file mode 100644
index 930cfa4838df..000000000000
--- a/media-sound/mixxx/mixxx-1.10.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.9 2012/06/13 12:58:54 johu Exp $
-
-EAPI=4
-
-inherit eutils multilib scons-utils toolchain-funcs
-
-DESCRIPTION="A Qt based Digital DJ tool"
-HOMEPAGE="http://mixxx.sourceforge.net"
-SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac debug doc mp3 pulseaudio shout wavpack"
-
-RDEPEND="media-libs/fidlib
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/taglib
-	virtual/glu
-	virtual/opengl
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-webkit:4
-	x11-libs/qt-xmlpatterns:4
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	mp3? ( media-libs/libmad )
-	pulseaudio? ( media-sound/pulseaudio )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-system-libs.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-bzr.patch
-	epatch "${FILESDIR}"/${P}-libmp4v2_r479_compat.patch
-
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	# alter startup command when pulseaudio support is disabled
-	if ! use pulseaudio ; then
-		sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
-	fi
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBPATH="/usr/$(get_libdir)" escons \
-		prefix=/usr \
-		qtdir=/usr/$(get_libdir)/qt4 \
-		hifieq=1 \
-		vinylcontrol=1 \
-		optimize=0 \
-		$(use_scons aac faad) \
-		$(use_scons debug qdebug) \
-		$(use_scons mp3 mad) \
-		$(use_scons shout shoutcast) \
-		$(use_scons wavpack wv)
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBPATH="/usr/$(get_libdir)" escons install \
-		prefix=/usr \
-		qtdir=/usr/$(get_libdir)/qt4 \
-		install_root="${D}"/usr
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 5876281d8c1a..196e14e4443d 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,2 +1,2 @@
-DIST quodlibet-2.3.92.tar.gz 1086791 RMD160 f6a4899ba7517abe4c83c1c913b43f1c1ed81d04 SHA1 f19a9bdc6cef647ac17bf26383f59d1a51df9ce7 SHA256 0c64fb32eeafa73bb38cba3e111f8f27bb13c5bad4b031ab3df6b0422474645d
-DIST quodlibet-2.4.tar.gz 1091868 RMD160 d6703b0889377d407bb28a10dd8388e3aef18515 SHA1 7e11cda2827bb0d04b7d2b7854b8a2854ed074c8 SHA256 b1f2eefe82c885c5194eed6496aa3a473e8e9679cdd4bf147bbc816012e6b5e8
+DIST quodlibet-2.3.92.tar.gz 1086791 SHA256 0c64fb32eeafa73bb38cba3e111f8f27bb13c5bad4b031ab3df6b0422474645d
+DIST quodlibet-2.4.tar.gz 1091868 SHA256 b1f2eefe82c885c5194eed6496aa3a473e8e9679cdd4bf147bbc816012e6b5e8
diff --git a/media-sound/quodlibet/quodlibet-2.4.ebuild b/media-sound/quodlibet/quodlibet-2.4.ebuild
index c50551ba5e2a..d91027532c6e 100644
--- a/media-sound/quodlibet/quodlibet-2.4.ebuild
+++ b/media-sound/quodlibet/quodlibet-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.4.ebuild,v 1.5 2012/06/12 06:06:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.4.ebuild,v 1.6 2012/08/23 20:31:18 xmw Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="dbus gstreamer ipod"
 
 COMMON_DEPEND=">=dev-python/pygtk-2.12"
diff --git a/media-sound/xwax/xwax-1.2.ebuild b/media-sound/xwax/xwax-1.2.ebuild
index 13816d53cc68..43caf3665e8b 100644
--- a/media-sound/xwax/xwax-1.2.ebuild
+++ b/media-sound/xwax/xwax-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.4 2012/07/10 18:59:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.5 2012/08/23 19:10:03 xmw Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 REQUIRED_USE="|| ( cdda mp3 fallback )
 	|| ( alsa jack oss )"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 66f9548b107b..4c4830b52ad5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Aug 2012 17:07:30 +0000
+Fri, 24 Aug 2012 07:08:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 66f9548b107b..4c4830b52ad5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Aug 2012 17:07:30 +0000
+Fri, 24 Aug 2012 07:08:03 +0000
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r4 b/metadata/md5-cache/app-editors/emacs-23.4-r4
index 9efad777244e..df95e113ef36 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r4
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r4
@@ -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-7.tar.bz2
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=318f025a7b5966945d6e546c5dfd5a28
+_md5_=6f0dbb987e23de328c82241392de2bfe
diff --git a/metadata/md5-cache/app-editors/emacs-24.1-r1 b/metadata/md5-cache/app-editors/emacs-24.1-r1
index 53cb7d7d6ba5..4b4b990dc83a 100644
--- a/metadata/md5-cache/app-editors/emacs-24.1-r1
+++ b/metadata/md5-cache/app-editors/emacs-24.1-r1
@@ -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 gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int 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 ~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 ~x86-linux ~ppc-macos ~x64-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 ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) 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 ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) 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? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( 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-24.1.9999-r1
 REQUIRED_USE=aqua? ( !X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.1.tar.bz2 mirror://gentoo/emacs-24.1-patches-5.tar.bz2
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4bd3a52b885acc597dc184a14850a6fa
+_md5_=c805683c86488abbcc2778380463ae03
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.2.9999 b/metadata/md5-cache/app-editors/emacs-vcs-24.2.9999
index 188b8e6b0655..568c1a6bed9d 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.2.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.2.9999
@@ -9,4 +9,4 @@ 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[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 ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) 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 ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) 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? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) )
 SLOT=24
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	bzr	8bf2fb439b1b76c0c6173c8b803310ae	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c31aa7f6b10d6a88d90d3a6ed06abdfd
+_md5_=d54c274be68d18370cd20c6895d200e1
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.0.4 b/metadata/md5-cache/app-office/libreoffice-3.6.0.4
index c7d906a37b0a..d853c9184765 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.0.4
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.0.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.6.0.4.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.6.0.4.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.6.0.4.tar.xz http://download.documentfoundation.org/libreoffice/src/3.6.0//libreoffice-core-3.6.0.4.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/3.6.0//libreoffice-binfilter-3.6.0.4.tar.xz ) http://download.documentfoundation.org/libreoffice/src/3.6.0//libreoffice-help-3.6.0.4.tar.xz http://download.documentfoundation.org/libreoffice/old/3.6.0.4//libreoffice-core-3.6.0.4.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/3.6.0.4//libreoffice-binfilter-3.6.0.4.tar.xz ) http://download.documentfoundation.org/libreoffice/old/3.6.0.4//libreoffice-help-3.6.0.4.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=1a38b00dbc7a5b5b2bf99e121ad9c57e
+_md5_=30c88e1d6a1dec441cdf60585afe7ce8
diff --git a/metadata/md5-cache/app-office/libreoffice-3.6.9999 b/metadata/md5-cache/app-office/libreoffice-3.6.9999
index ac8e0d9fd232..8b53c553eae1 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.6.9999
+++ b/metadata/md5-cache/app-office/libreoffice-3.6.9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.6.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=098448799d1adca7080639bea9bf9430
+_md5_=ae1d3bf0239378b26348684bf3533792
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p37 b/metadata/md5-cache/app-shells/bash-4.2_p37
index ebbf0c7e8c61..a84836d2c279 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p37
+++ b/metadata/md5-cache/app-shells/bash-4.2_p37
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=1
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline vanilla
-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-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d32f9493b336e133f8b7a8581641ad2
+_md5_=235673355b17871086a187b4ca0695f4
diff --git a/metadata/md5-cache/app-text/acroread-9.5.1-r1 b/metadata/md5-cache/app-text/acroread-9.5.1-r1
index 67d18b161862..6c02e3c966c1 100644
--- a/metadata/md5-cache/app-text/acroread-9.5.1-r1
+++ b/metadata/md5-cache/app-text/acroread-9.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Adobe's PDF reader
 EAPI=4
 HOMEPAGE=http://www.adobe.com/products/reader/
 IUSE=cups ldap minimal nsplugin linguas_en linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko
-KEYWORDS=-* ~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=-* ~amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Adobe
 RDEPEND=media-libs/fontconfig x86? ( =dev-libs/openssl-0.9.8* ) cups? ( net-print/cups ) x86? ( x11-libs/gtk+:2 net-dns/libidn ldap? ( net-nds/openldap ) !minimal? ( || ( www-client/firefox www-client/firefox-bin www-client/seamonkey ) ) ) amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 ) !linguas_en? ( http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.1/enu/AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 )
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	564d80d2026ae9f1910d8da4ea211e91	nsplugins	53a3f3fd1f914a7f2bd910ba57e155a9	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b506f62bcd756fbcf02ebd58b600ee70
+_md5_=2d7f7601cf5d266ca92746e83ea09268
diff --git a/metadata/md5-cache/app-text/kchmviewer-6.0-r1 b/metadata/md5-cache/app-text/kchmviewer-6.0-r1
new file mode 100644
index 000000000000..dea6cbea0cd1
--- /dev/null
+++ b/metadata/md5-cache/app-text/kchmviewer-6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/chmlib >=x11-libs/qt-dbus-4.5:4 >=x11-libs/qt-webkit-4.5:4 !kde? ( >=x11-libs/qt-gui-4.5:4 ) kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=KchmViewer is a feature rich chm file viewer, based on Qt.
+EAPI=4
+HOMEPAGE=http://www.kchmviewer.net/
+IUSE=debug kde linguas_cs linguas_fr linguas_hu linguas_it linguas_nl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/chmlib >=x11-libs/qt-dbus-4.5:4 >=x11-libs/qt-webkit-4.5:4 !kde? ( >=x11-libs/qt-gui-4.5:4 ) kde? ( >=kde-base/kdelibs-4.4:4[aqua=] !kde-base/okular[chm] )
+SLOT=0
+SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-6.0.tar.gz
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=58fd812a836813a81c393a89502f087d
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-3.5.2.2 b/metadata/md5-cache/dev-db/phpmyadmin-3.5.2.2
index ff3740a370ed..13f7c86a95d4 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-3.5.2.2
+++ b/metadata/md5-cache/dev-db/phpmyadmin-3.5.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
 EAPI=4
 HOMEPAGE=http://www.phpmyadmin.net/
 IUSE=setup vhosts
-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
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( <dev-lang/php-5.3[spl,pcre] >=dev-lang/php-5.3 ) || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.5.2.2
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-3.5.2.2-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=597f21ffadb2cb97eca567c7d210c4f1
+_md5_=287d70dfa1401187acd68865ae4cc911
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.6 b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.6
new file mode 100644
index 000000000000..6138ec4448f7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
+HOMEPAGE=http://download.oracle.com/javase/7/docs/
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-7
+RESTRICT=fetch
+SLOT=1.7
+SRC_URI=jdk-7u6-apidocs.zip
+_md5_=4f47cee362f94079ee7c40a8e24c5bdc
diff --git a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.34 b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.34
new file mode 100644
index 000000000000..3213a35b5df5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst postrm prerm setup unpack
+DEPEND=pax_kernel? ( sys-apps/paxctl ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DESCRIPTION=Oracle's Java SE Development Kit
+EAPI=4
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.6.0 ) jce? ( dev-java/sun-jce-bin:1.6 ) kernel_SunOS? ( app-arch/unzip ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+RESTRICT=fetch strip
+SLOT=1.6
+SRC_URI=x86? ( jdk-6u34-linux-i586.bin examples? ( jdk-6u34-linux-i586-demos.tar.gz ) ) amd64? ( jdk-6u34-linux-x64.bin ) x86-solaris? ( jdk-6u34-solaris-i586.sh examples? ( jdk-6u34-solaris-i586-demos.tar.Z ) ) x64-solaris? ( jdk-6u34-solaris-i586.sh jdk-6u34-solaris-x64.sh examples? ( jdk-6u34-solaris-i586-demos.tar.Z jdk-6u34-solaris-x64-demos.tar.Z ) ) sparc-solaris? ( jdk-6u34-solaris-sparc.sh examples? ( jdk-6u34-solaris-sparc-demos.tar.Z ) ) sparc64-solaris? ( jdk-6u34-solaris-sparc.sh jdk-6u34-solaris-sparcv9.sh examples? ( jdk-6u34-solaris-sparc-demos.tar.Z jdk-6u34-solaris-sparcv9-demos.tar.Z ) )
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=caeb81b83baa60b801f1589e5bb1a3b7
diff --git a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.34 b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.34
new file mode 100644
index 000000000000..9376b60e66b7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst postrm prerm setup unpack
+DEPEND=pax_kernel? ( sys-apps/paxctl ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DESCRIPTION=Oracle's Java SE Runtime Environment
+EAPI=4
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=X alsa jce nsplugin pax_kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) jce? ( dev-java/sun-jce-bin:1.6 ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+RESTRICT=fetch strip
+SLOT=1.6
+SRC_URI=amd64? ( jre-6u34-linux-x64.bin ) x86? ( jre-6u34-linux-i586.bin )
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3b0541770464195a224cb42fac0434e0
diff --git a/metadata/md5-cache/dev-lang/nqp-2012.08 b/metadata/md5-cache/dev-lang/nqp-2012.08
new file mode 100644
index 000000000000..8e10514e56e7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2012.08
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/parrot-4.4.0[unicode] dev-lang/perl
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=3
+HOMEPAGE=http://rakudo.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/parrot-4.4.0[unicode]
+SLOT=0
+SRC_URI=http://github.com/perl6/nqp/tarball/2012.08 -> nqp-2012.08.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=beaa1348a8cfd3cbc3cf57447c552fa4
diff --git a/metadata/md5-cache/dev-lang/php-5.4.6 b/metadata/md5-cache/dev-lang/php-5.4.6
index 34981ddff4e4..7ab690587c6b 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.6
+++ b/metadata/md5-cache/dev-lang/php-5.4.6
@@ -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 sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=>=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 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) 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 apache2? ( =www-servers/apache-2* )
@@ -12,4 +12,4 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.6.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	d89996a2048bc6d1ae72bfa4c04517fe	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f25da9fc065b07350c5331b7063d94a2
+_md5_=9eff9cfcdbede831018ec78cb0844d33
diff --git a/metadata/md5-cache/dev-lang/rakudo-2012.08 b/metadata/md5-cache/dev-lang/rakudo-2012.08
new file mode 100644
index 000000000000..40a25901fb23
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2012.08
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-lang/parrot-4.4.0[unicode] >=dev-lang/nqp-2012.08 dev-lang/perl
+DESCRIPTION=A Perl 6 implementation built on the Parrot virtual machine
+EAPI=3
+HOMEPAGE=http://rakudo.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/parrot-4.4.0[unicode] >=dev-lang/nqp-2012.08
+SLOT=0
+SRC_URI=mirror://github/rakudo/rakudo/rakudo-2012.08.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aa8626222ea2eff544adfc205d143eb6
diff --git a/metadata/md5-cache/dev-perl/PadWalker-1.950.0 b/metadata/md5-cache/dev-perl/PadWalker-1.950.0
new file mode 100644
index 000000000000..8a77b34199a4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/PadWalker-1.950.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl[-build]
+DESCRIPTION=play with other peoples' lexical variables
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/PadWalker/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.95.tar.gz
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9ba7a835f0f1c6a05e23bacbbfc44312
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
index bfccac70f6d7..6936220ea11e 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=PHP interface to the cracklib libraries.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/crack
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~x86
 LICENSE=PHP-3 CRACKLIB
 RDEPEND=|| ( =dev-php/pecl-crack-0.4-r2[php_targets_php5-3] =dev-php/pecl-crack-0.4-r2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	6ac0e904fcb03f1eae789381844c42aa	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b1d18cff3276913ac89373253d516858
+_md5_=ed12c8f136e080becdd9423c9ce52861
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
index e2c493599dd0..19a32274bb70 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=A PHP extension for parsing and working with RFC822 and RFC2045 (MIM
 EAPI=4
 HOMEPAGE=http://pecl.php.net/mailparse
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~x86
 LICENSE=PHP-2.02
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.6[php_targets_php5-3] =dev-php/pecl-mailparse-2.1.6[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.6.tgz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	6ac0e904fcb03f1eae789381844c42aa	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f0f6d04abf6cf82fdfec60bcabaf881
+_md5_=1105b2faa1df7d7842fd887ba89dbb37
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-1.0.1 b/metadata/md5-cache/dev-php/pecl-yaml-1.0.1
deleted file mode 100644
index 14336dedd65a..000000000000
--- a/metadata/md5-cache/dev-php/pecl-yaml-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libyaml-0.1.0 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-DESCRIPTION=Support for YAML 1.1 (YAML Ain't Markup Language) serialization using the LibYAML library.
-EAPI=2
-HOMEPAGE=http://pecl.php.net/yaml
-IUSE=php_targets_php5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 || ( =dev-php/pecl-yaml-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/yaml-1.0.1.tgz
-_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	6ac0e904fcb03f1eae789381844c42aa	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=73fb952ce3be539bb94e2a7d9e990de8
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.33 b/metadata/md5-cache/dev-php/suhosin-0.9.33
deleted file mode 100644
index 6cbcb5ad135e..000000000000
--- a/metadata/md5-cache/dev-php/suhosin-0.9.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/php[unicode] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-DESCRIPTION=Suhosin is an advanced protection system for PHP installations.
-EAPI=2
-HOMEPAGE=http://www.suhosin.org/
-IUSE=php_targets_php5-3
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
-LICENSE=PHP-3
-RDEPEND=dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.33[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-SLOT=0
-SRC_URI=http://download.suhosin.org/suhosin-0.9.33.tgz
-_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	6ac0e904fcb03f1eae789381844c42aa	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0996b48b5f62a4660fe0572a68acb225
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0 b/metadata/md5-cache/dev-php/xdebug-2.2.0
index f499fb083316..66b596369730 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A PHP debugging and profiling extension
 EAPI=4
 HOMEPAGE=http://www.xdebug.org/
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0 || ( =dev-php/xdebug-2.2.0[php_targets_php5-3] =dev-php/xdebug-2.2.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0.tgz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	6ac0e904fcb03f1eae789381844c42aa	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3c338a0f115bb8d13c3940f0a404ca79
+_md5_=ed661b267b24e2f3a3c2ffaf5e3308ed
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.23 b/metadata/md5-cache/dev-python/pyxdg-0.23
index 950602b76537..455f32ee73ea 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.23
+++ b/metadata/md5-cache/dev-python/pyxdg-0.23
@@ -4,10 +4,10 @@ DESCRIPTION=A Python module to deal with freedesktop.org specifications
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~takluyver/pyxdg-0.23.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=71a00fb5f2e1a6535e51b9df613322f9
+_md5_=e83f772e4f5c520ad23d33c96cbeef82
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.8-r3 b/metadata/md5-cache/dev-util/cmake-2.8.8-r3
index 6d3496b8d10e..a93b45ad4de0 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.8-r3
+++ b/metadata/md5-cache/dev-util/cmake-2.8.8-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=4
 HOMEPAGE=http://www.cmake.org/
 IUSE=emacs ncurses qt4 vim-syntax test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0 >=net-misc/curl-7.20.0-r1[ssl] >=dev-libs/expat-2.0.1 virtual/pkgconfig sys-libs/zlib ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4 ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=db9ed666901c9641f05b8b14b2cc9880
+_md5_=0951e38a3ce7c198b51875ca05c3bc93
diff --git a/metadata/md5-cache/dev-vcs/git-1.6.4.5 b/metadata/md5-cache/dev-vcs/git-1.6.4.5
index 312d862a1ad0..cdf316940145 100644
--- a/metadata/md5-cache/dev-vcs/git-1.6.4.5
+++ b/metadata/md5-cache/dev-vcs/git-1.6.4.5
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl sys-libs/zlib app-arch/cpio perl? ( dev-lang/perl[-buil
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.6.4.5.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.6.4.5.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.6.4.5.tar.bz2 )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion	003731da0df19d26955927bd534f3058	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc588ff1b08f66f971862c82cbf9e1c8
+_md5_=8b9c80687fcb573d47a8696650dc920d
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.10 b/metadata/md5-cache/dev-vcs/git-1.7.10
index bca7149507d9..9a812f3793e9 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.10
+++ b/metadata/md5-cache/dev-vcs/git-1.7.10
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.10.tar.gz mirror://kernel/software/scm/git/git-1.7.10.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.10.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.10.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.10.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.10.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9b36ba0561b894a59d6d19be707febd8
+_md5_=ec90ec3aab498c4ecbbdfd8c4afb23b4
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.10.2 b/metadata/md5-cache/dev-vcs/git-1.7.10.2
index fbdd5c7b0e3d..2747f0d5a51d 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.10.2
+++ b/metadata/md5-cache/dev-vcs/git-1.7.10.2
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz mirror://kernel/software/scm/git/git-1.7.10.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.10.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.10.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=228caf08a54bcab1d6e8132c7868e077
+_md5_=8ee7188dac17dee4b0b06cde5e2687fb
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.11.1 b/metadata/md5-cache/dev-vcs/git-1.7.11.1
index 70844f7e31f8..71d517f0c83f 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.11.1
+++ b/metadata/md5-cache/dev-vcs/git-1.7.11.1
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.11.1.tar.gz mirror://kernel/software/scm/git/git-1.7.11.1.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.11.1.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.11.1.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.11.1.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.11.1.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0932f8cc046803c37b2c5123aa517c17
+_md5_=d82048f4911558f309709f848d5aa67a
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.12 b/metadata/md5-cache/dev-vcs/git-1.7.12
index 41f25f0f2a53..60b9e28abc83 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.12
+++ b/metadata/md5-cache/dev-vcs/git-1.7.12
@@ -3,12 +3,12 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 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 pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.12.tar.gz mirror://kernel/software/scm/git/git-1.7.12.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.12.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.12.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.12.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.12.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b7d77bba5443468735597b3d73a27e6
+_md5_=4769c4baeef9130648a85ef696b11f59
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.12-r1 b/metadata/md5-cache/dev-vcs/git-1.7.12-r1
index 60b3bb2f0c9b..4b27235969e9 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.12-r1
+++ b/metadata/md5-cache/dev-vcs/git-1.7.12-r1
@@ -3,12 +3,12 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 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 pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.12.tar.gz mirror://kernel/software/scm/git/git-1.7.12.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.12.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.12.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.12.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.12.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e50ffee9f86a536d63b3ae544a68f330
+_md5_=01166320b54c42aa348ea6f2baf1f3ed
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.12-r2 b/metadata/md5-cache/dev-vcs/git-1.7.12-r2
index 4f39a7494294..b7d886dfc620 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.12-r2
+++ b/metadata/md5-cache/dev-vcs/git-1.7.12-r2
@@ -3,12 +3,12 @@ DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lan
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 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=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.12.tar.gz mirror://kernel/software/scm/git/git-1.7.12.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.12.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.12.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.12.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.12.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2d36774f54e4b511d2e426940048b512
+_md5_=0d9703aa98eec3ac7c628d5949dce398
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.2.5 b/metadata/md5-cache/dev-vcs/git-1.7.2.5
index 39e74c710d66..f3a2775c91cd 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.2.5
+++ b/metadata/md5-cache/dev-vcs/git-1.7.2.5
@@ -11,4 +11,4 @@ RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-buil
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.2.5.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.2.5.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.2.5.tar.bz2 )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion	003731da0df19d26955927bd534f3058	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fd1123119368850f39b43ad34f76e143
+_md5_=789a4d5f56b54718f43a6681c20d43db
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.3.4-r1 b/metadata/md5-cache/dev-vcs/git-1.7.3.4-r1
index dc325becae1b..576b96690e68 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.3.4-r1
+++ b/metadata/md5-cache/dev-vcs/git-1.7.3.4-r1
@@ -11,4 +11,4 @@ RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-buil
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.3.4.tar.bz2 mirror://kernel/software/scm/git/git-manpages-1.7.3.4.tar.bz2 doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.3.4.tar.bz2 )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion	003731da0df19d26955927bd534f3058	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ca350128183b3a42c498232776f9d8d
+_md5_=974e9efbff4844b4668632e1ae92d398
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9 b/metadata/md5-cache/dev-vcs/git-1.7.9
index dc94f10972c5..42d6838ea635 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.tar.gz mirror://kernel/software/scm/git/git-1.7.9.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=207a62006b9f123b019763ee69508ee1
+_md5_=61c5803d1d2f893722c9aed30068f920
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.1 b/metadata/md5-cache/dev-vcs/git-1.7.9.1
index f9c66cdc5ed3..818d054c4d9e 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9.1
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.1
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.1.tar.gz mirror://kernel/software/scm/git/git-1.7.9.1.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.1.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.1.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.1.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.1.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8cf1c6882fa85dccdd857fb9e6d5ec0b
+_md5_=454feac976656d414b0fc005df176298
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.2 b/metadata/md5-cache/dev-vcs/git-1.7.9.2
index 0f1c6900edfa..8b47ca3ee934 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9.2
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.2
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.2.tar.gz mirror://kernel/software/scm/git/git-1.7.9.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.2.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2dce40ffc03713849f0dd8c41ad95f04
+_md5_=95c7e0cb664196a1cb10d1625a545323
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.3 b/metadata/md5-cache/dev-vcs/git-1.7.9.3
index eaac2a43f9d2..8e95e0847077 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9.3
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.3
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.3.tar.gz mirror://kernel/software/scm/git/git-1.7.9.3.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.3.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.3.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.3.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.3.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=812b91c791871223677aecb6791913c6
+_md5_=3ec02b2aee39edbdc77df385ae7c5a5c
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.4 b/metadata/md5-cache/dev-vcs/git-1.7.9.4
index de006c731fd3..de6c83eb5da1 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9.4
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.4
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.4.tar.gz mirror://kernel/software/scm/git/git-1.7.9.4.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.4.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.4.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.4.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.4.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f312c8ceac23b01d467f0e77df686200
+_md5_=d71a0e01bc32d1fbc195e11dc80869c0
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9.7 b/metadata/md5-cache/dev-vcs/git-1.7.9.7
index 4b69bbc3067a..2bfa045e9b47 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9.7
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9.7
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.7.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.7.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.7.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.7.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=121e6485f346811fdd5bcdf075b9c049
+_md5_=b8241356489c3fe687bffd3dbe4f8881
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.9_rc2 b/metadata/md5-cache/dev-vcs/git-1.7.9_rc2
index ea73aee7e759..a112166275f5 100644
--- a/metadata/md5-cache/dev-vcs/git-1.7.9_rc2
+++ b/metadata/md5-cache/dev-vcs/git-1.7.9_rc2
@@ -3,11 +3,11 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs gtk highlight +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 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 ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+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 ) app-crypt/gnupg perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.7.9.rc2.tar.gz mirror://kernel/software/scm/git/git-1.7.9.rc2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.9.rc2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.9.rc2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.9.rc2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.9.rc2.tar.gz )
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=29f60d8f2ee35a5410fb8f70ed44fdc2
+_md5_=73deac69b214d4cca9a8d9a35739d932
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index c2d19687d808..cb508d8811a2 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -3,10 +3,10 @@ DEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) p
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 LICENSE=GPL-2
-RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=!blksha1? ( dev-libs/openssl ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1df2a3d98b6efa8a39825fd40fe9841f
+_md5_=0e38ddcf5197c7723c08e68c177e33bb
diff --git a/metadata/md5-cache/games-action/powermanga-0.90 b/metadata/md5-cache/games-action/powermanga-0.90
index bd9e4f15daee..094135f139a2 100644
--- a/metadata/md5-cache/games-action/powermanga-0.90
+++ b/metadata/md5-cache/games-action/powermanga-0.90
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mikmod] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An arcade 2D shoot-em-up game
 EAPI=2
 HOMEPAGE=http://linux.tlk.fr/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
-RDEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mikmod]
+RDEPEND=>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=http://linux.tlk.fr/games/Powermanga/download/powermanga-0.90.tgz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	games	024161bb840ff1c7b424696877dbb18b	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7e05751c40d3ce3145cde195b38c3070
+_md5_=d47f3ca7c6fe72322525435415d859f1
diff --git a/metadata/md5-cache/games-board/pokerth-0.9.5 b/metadata/md5-cache/games-board/pokerth-0.9.5
index 04c9586a0d1f..2872ef241629 100644
--- a/metadata/md5-cache/games-board/pokerth-0.9.5
+++ b/metadata/md5-cache/games-board/pokerth-0.9.5
@@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3 >=dev-libs/boost-1.44 dev-libs/libgcrypt dev-libs/tinyxm
 SLOT=0
 SRC_URI=mirror://sourceforge/pokerth/PokerTH-0.9.5-src.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	024161bb840ff1c7b424696877dbb18b	multilib	564d80d2026ae9f1910d8da4ea211e91	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4bf98d18f9ff0b72996ad0638b9de6e8
+_md5_=6b4d54b1f6edf0d6a56e6959cfa065c6
diff --git a/metadata/md5-cache/games-emulation/stella-3.7.2 b/metadata/md5-cache/games-emulation/stella-3.7.2
index 03441c900e52..fa0ae39189f0 100644
--- a/metadata/md5-cache/games-emulation/stella-3.7.2
+++ b/metadata/md5-cache/games-emulation/stella-3.7.2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[joystick?,video] x11-libs/libX11 media-libs/libpng:0 s
 SLOT=0
 SRC_URI=mirror://sourceforge/stella/stella-3.7.2-src.tar.gz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	games	024161bb840ff1c7b424696877dbb18b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9cab1a640cd14228e7db783e3848fb4
+_md5_=6676b491f29f624aa89708a795282962
diff --git a/metadata/md5-cache/games-engines/frobtads-1.2.1 b/metadata/md5-cache/games-engines/frobtads-1.2.1
new file mode 100644
index 000000000000..5ee2ac47430e
--- /dev/null
+++ b/metadata/md5-cache/games-engines/frobtads-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=net-misc/curl sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures
+EAPI=4
+HOMEPAGE=http://www.tads.org/frobtads.htm
+IUSE=debug tads2compiler tads3compiler
+KEYWORDS=~amd64 ~x86
+LICENSE=TADS2 TADS3
+RDEPEND=net-misc/curl sys-libs/ncurses
+RESTRICT=!tads3compiler? ( test )
+SLOT=0
+SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.1.tar.gz
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	024161bb840ff1c7b424696877dbb18b	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1952cc7ccfc0109be731ac9301bb785e
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.8 b/metadata/md5-cache/kde-misc/yakuake-2.9.8
index 72ac07df77be..4c530b27e920 100644
--- a/metadata/md5-cache/kde-misc/yakuake-2.9.8
+++ b/metadata/md5-cache/kde-misc/yakuake-2.9.8
@@ -10,4 +10,4 @@ RDEPEND=>=kde-base/konsole-4.4:4[aqua=] sys-devel/gettext >=kde-base/oxygen-icon
 SLOT=4
 SRC_URI=mirror://kde/stable/yakuake/2.9.8/src/yakuake-2.9.8.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=9352657b507679954c3d45ca01e53cce
+_md5_=422097761bb537cebb42a76272502bd5
diff --git a/metadata/md5-cache/kde-misc/yakuake-2.9.8-r1 b/metadata/md5-cache/kde-misc/yakuake-2.9.8-r1
new file mode 100644
index 000000000000..39fb189354a5
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/yakuake-2.9.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/konsole-4.4:4[aqua=] sys-devel/gettext >=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.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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 quake-style terminal emulator based on KDE konsole technology
+EAPI=4
+HOMEPAGE=http://yakuake.kde.org/
+IUSE=debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hr linguas_it linguas_ja linguas_ko linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN aqua
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-base/konsole-4.4:4[aqua=] sys-devel/gettext >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4: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=mirror://kde/stable/yakuake/2.9.8/src/yakuake-2.9.8.tar.bz2
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=f5616965361cb0390489fd17e392f5fe
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.4.8 b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.8
new file mode 100644
index 000000000000..b6124a26bc6b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Embedded lua scripts for libquvi
+EAPI=4
+HOMEPAGE=http://quvi.sourceforge.net/
+IUSE=offensive
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-scripts-0.4.8.tar.xz
+_md5_=366bdbdc458899ec02f200ef6c2dd4dc
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12
deleted file mode 100644
index 866693de230f..000000000000
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) midi? ( fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) ) mad? ( media-libs/libmad ) !mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) ) modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
-DESCRIPTION=Simple Direct Media Layer Mixer Library
-EAPI=4
-HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
-IUSE=flac fluidsynth mad midi mikmod modplug mp3 playtools 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
-LICENSE=ZLIB
-REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi )
-SLOT=0
-SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e9a7647327ee131bcb639d12f1048cef
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 592ccdea56f1..7436bd85476e 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 ~ia64 ~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	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=55c6e73a25e89dc420c9325a469adb88
+_md5_=823fb7c09c411255165c30420018a3bb
diff --git a/metadata/md5-cache/media-plugins/quodlibet-plugins-2.4 b/metadata/md5-cache/media-plugins/quodlibet-plugins-2.4
index 4eee24ea9a7e..f28c6aa79a3b 100644
--- a/metadata/md5-cache/media-plugins/quodlibet-plugins-2.4
+++ b/metadata/md5-cache/media-plugins/quodlibet-plugins-2.4
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2.7*
 DESCRIPTION=Plugins for Quod Libet and Ex Falso
 EAPI=4
 HOMEPAGE=http://code.google.com/p/quodlibet/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/quodlibet-2.4 =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://quodlibet.googlecode.com/files/quodlibet-plugins-2.4.tar.gz
 _eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=ccefb6ab605e7de750c00ce44bad02fb
+_md5_=c93432faf2a90e628095bdb92aa1cc56
diff --git a/metadata/md5-cache/media-sound/audacity-2.0.2 b/metadata/md5-cache/media-sound/audacity-2.0.2
new file mode 100644
index 000000000000..ee230ff7edfa
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-2.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Free crossplatform audio editor
+EAPI=4
+HOMEPAGE=http://audacity.sourceforge.net/
+IUSE=alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) mp3? ( >=media-sound/lame-3.70 )
+REQUIRED_USE=soundtouch? ( midi )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://audacity.googlecode.com/files/audacity-minsrc-2.0.2.tar.bz2
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_md5_=7397ee4304bc07bbfed62dca1be4c635
diff --git a/metadata/md5-cache/media-sound/mixxx-1.10.0 b/metadata/md5-cache/media-sound/mixxx-1.10.0
deleted file mode 100644
index eb58e1ae8d4a..000000000000
--- a/metadata/md5-cache/media-sound/mixxx-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) virtual/pkgconfig dev-util/scons
-DESCRIPTION=A Qt based Digital DJ tool
-EAPI=4
-HOMEPAGE=http://mixxx.sourceforge.net
-IUSE=aac debug doc mp3 pulseaudio shout wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fidlib media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/taglib virtual/glu virtual/opengl x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) mp3? ( media-libs/libmad ) pulseaudio? ( media-sound/pulseaudio ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=http://downloads.mixxx.org/mixxx-1.10.0/mixxx-1.10.0-src.tar.gz
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=86556d23f46976db28f67a203da3f6d5
diff --git a/metadata/md5-cache/media-sound/quodlibet-2.4 b/metadata/md5-cache/media-sound/quodlibet-2.4
index ff0568fb33c0..43907e181ca7 100644
--- a/metadata/md5-cache/media-sound/quodlibet-2.4
+++ b/metadata/md5-cache/media-sound/quodlibet-2.4
@@ -4,11 +4,11 @@ DESCRIPTION=audio library tagger, manager, and player for GTK+
 EAPI=4
 HOMEPAGE=http://code.google.com/p/quodlibet/
 IUSE=dbus gstreamer ipod
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.12 dev-python/feedparser >=media-libs/mutagen-1.14 gstreamer? ( >=dev-python/gst-python-0.10.2:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-meta:0.10 ) !gstreamer? ( media-libs/xine-lib ) dbus? ( app-misc/media-player-info dev-python/dbus-python ) ipod? ( media-libs/libgpod[python] ) =dev-lang/python-2.7*
 REQUIRED_USE=ipod? ( dbus )
 SLOT=0
 SRC_URI=http://quodlibet.googlecode.com/files/quodlibet-2.4.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3f60df4ebea7d7e4c83ac26a4aeb4e82
+_md5_=ccd383ada8890210634c131d13e10191
diff --git a/metadata/md5-cache/media-sound/xwax-1.2 b/metadata/md5-cache/media-sound/xwax-1.2
index d52bfb795b23..db9683de8db1 100644
--- a/metadata/md5-cache/media-sound/xwax-1.2
+++ b/metadata/md5-cache/media-sound/xwax-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Digital vinyl emulation software
 EAPI=4
 HOMEPAGE=http://www.xwax.co.uk/
 IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/glibc media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
 REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
 SLOT=0
 SRC_URI=http://www.xwax.co.uk/releases/xwax-1.2.tar.gz
 _eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=73bdb7c622e856fff68dee1329ccc05d
+_md5_=bb575f9db03462cde3a49311c42ff1b1
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.4.0 b/metadata/md5-cache/net-analyzer/metasploit-4.4.0
new file mode 100644
index 000000000000..748b025708b9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DESCRIPTION=Advanced open-source framework for developing, testing, and using vulnerability exploit code
+EAPI=3
+HOMEPAGE=http://www.metasploit.org/
+IUSE=gui mysql postgres
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/ruby dev-ruby/rubygems dev-ruby/msgpack gui? ( virtual/jre ) mysql? ( dev-ruby/mysql-ruby dev-ruby/activerecord[mysql] ) postgres? ( dev-ruby/postgres dev-ruby/activerecord[postgres] )
+SLOT=4.4
+SRC_URI=http://updates.metasploit.com/data/releases/framework-4.4.0.tar.bz2
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b0f7bc51f19e32a3694451801b129810
diff --git a/metadata/md5-cache/net-analyzer/munin-1.4.7-r2 b/metadata/md5-cache/net-analyzer/munin-1.4.7-r2
deleted file mode 100644
index 30d07c8e297e..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-1.4.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst prepare setup
-DEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) dev-perl/DateManip dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/libwww-perl dev-perl/net-server dev-perl/DBI virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template net-analyzer/rrdtool[perl] dev-perl/Log-Log4perl ) virtual/perl-Module-Build
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=4
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk doc irc memcached minimal mysql postgres ssl
-KEYWORDS=~amd64 ~mips ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) dev-perl/DateManip dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/libwww-perl dev-perl/net-server dev-perl/DBI virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template net-analyzer/rrdtool[perl] dev-perl/Log-Log4perl ) !minimal? ( virtual/cron )
-SLOT=0
-SRC_URI=mirror://sourceforge/munin/munin-1.4.7.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-1.4.7-patches-1.tar.xz
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e4591ad4f95e81b0da319543745414a
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.5-r2 b/metadata/md5-cache/net-analyzer/munin-2.0.5-r2
new file mode 100644
index 000000000000..1c0bba22b1f5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup
+DEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) syslog? ( virtual/perl-Sys-Syslog ) ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 virtual/awk ) http? ( dev-perl/libwww-perl ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 >=net-analyzer/rrdtool-1.3[perl] ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=4
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http elibc_FreeBSD java
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) syslog? ( virtual/perl-Sys-Syslog ) ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 virtual/awk ) http? ( dev-perl/libwww-perl ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 >=net-analyzer/rrdtool-1.3[perl] ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
+REQUIRED_USE=cgi? ( !minimal )
+SLOT=0
+SRC_URI=mirror://sourceforge/munin/munin-2.0.5.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.5-patches-3.tar.xz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0f4fe2eff0e225acccd5c6bb9ee1e0e2
diff --git a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r103 b/metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r103
deleted file mode 100644
index 7b1dc597987d..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r103
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=net-analyzer/nagios-plugins-1.3.0 ssl? ( dev-libs/openssl )
-DESCRIPTION=Nagios 2.12 NRPE - Nagios Remote Plugin Executor
-EAPI=2
-HOMEPAGE=http://www.nagios.org/
-IUSE=ssl command-args
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/nagios-plugins-1.3.0 ssl? ( dev-libs/openssl )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/nagios/nrpe-2.12.tar.gz
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0ef131389b1eac5423fbbe3928f6a97
diff --git a/metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r102 b/metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r102
deleted file mode 100644
index 2aa6bdb16f2a..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r102
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Nagios NSCA - Nagios Service Check Acceptor
-EAPI=4
-HOMEPAGE=http://www.nagios.org/
-IUSE=tcpd +crypt
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/openrc
-SLOT=0
-SRC_URI=mirror://sourceforge/nagios/nsca-2.7.2.tar.gz
-_eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=602681cee18bef9b1e3b2929fbb3c581
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
new file mode 100644
index 000000000000..1bc11cb27b17
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Nagios 1.4.16 plugins - Pack of plugins to make Nagios work properly
+EAPI=4
+HOMEPAGE=http://www.nagios.org/
+IUSE=+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber gnutls sudo smart
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.6g ) gnutls? ( net-libs/gnutls ) ) radius? ( >=net-dialup/radiusclient-0.3.2 ) >=dev-lang/perl-5.6.1-r7 samba? ( >=net-fs/samba-2.2.5-r1 ) snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) nagios-ntp? ( >=net-misc/ntp-4.1.1a ) nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) nagios-game? ( >=games-util/qstat-2.6 ) jabber? ( >=dev-perl/Net-Jabber-2.0 ) sudo? ( >=app-admin/sudo-1.8.5 ) smart? ( sys-apps/smartmontools )
+REQUIRED_USE=smart? ( sudo )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nagiosplug/nagios-plugins-1.4.16.tar.gz http://dev.gentoo.org/~flameeyes/nagios-plugins/nagios-plugins-1.4.16-patches-2.tar.xz
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=510069b1c3d6480707d70b45c5faeaa2
diff --git a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r102 b/metadata/md5-cache/net-analyzer/nrpe-2.12-r102
similarity index 94%
rename from metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r102
rename to metadata/md5-cache/net-analyzer/nrpe-2.12-r102
index 6654bc5f3820..3c0089156a7d 100644
--- a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.12-r102
+++ b/metadata/md5-cache/net-analyzer/nrpe-2.12-r102
@@ -10,4 +10,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nrpe-2.12.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=96cf602002990c2b6f889236625e475a
+_md5_=a559bf75923ed6cc6b495c4992a42de5
diff --git a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2 b/metadata/md5-cache/net-analyzer/nrpe-2.13-r2
similarity index 96%
rename from metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2
rename to metadata/md5-cache/net-analyzer/nrpe-2.13-r2
index 1f7680270311..f917cde4de95 100644
--- a/metadata/md5-cache/net-analyzer/nagios-nrpe-2.13-r2
+++ b/metadata/md5-cache/net-analyzer/nrpe-2.13-r2
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nrpe-2.13.tar.gz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=32169ba7c37051c2e0e862a02641919b
+_md5_=4e02388e44bbac151cef39d6289eff7b
diff --git a/metadata/md5-cache/net-analyzer/nrpe-2.13-r4 b/metadata/md5-cache/net-analyzer/nrpe-2.13-r4
new file mode 100644
index 000000000000..a50f6cd59e05
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nrpe-2.13-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Nagios Remote Plugin Executor
+EAPI=4
+HOMEPAGE=http://www.nagios.org/
+IUSE=command-args ssl tcpd minimal
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/nagios/nrpe-2.13.tar.gz
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0ae3b5d891a243e7e742dc872ee549a7
diff --git a/metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r100 b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r100
similarity index 92%
rename from metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r100
rename to metadata/md5-cache/net-analyzer/nsca-2.7.2-r100
index 07461f22f510..8b75e2e60795 100644
--- a/metadata/md5-cache/net-analyzer/nagios-nsca-2.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r100
@@ -8,4 +8,4 @@ RDEPEND=>=net-analyzer/nagios-plugins-1.3.1 >=dev-libs/libmcrypt-2.5.1-r4
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nsca-2.7.2.tar.gz
 _eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=3c34b50fdd7f7358e5c2d27e7e6fa106
+_md5_=0a52f84c9c28a8566a634abaac4c2c28
diff --git a/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103 b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
new file mode 100644
index 000000000000..581809895f24
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )
+DESCRIPTION=Nagios Service Check Acceptor
+EAPI=4
+HOMEPAGE=http://www.nagios.org/
+IUSE=tcpd +crypt minimal
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) ) sys-apps/openrc
+SLOT=0
+SRC_URI=mirror://sourceforge/nagios/nsca-2.7.2.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1d42e9001756e2670bdaa798dcd7df8f
diff --git a/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3 b/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3
index 0d84351e1e9b..d7748d8cbb44 100644
--- a/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3
+++ b/metadata/md5-cache/net-misc/modemmanager-0.5.2.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=doc policykit test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/dbus-glib-0.86 net-dialup/ppp policykit? ( >=sys-auth/polkit-0.99 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/ModemManager/0.5/ModemManager-0.5.2.0.tar.xz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d2347ee59ced8863023171f6a3fdbc98
+_md5_=60328a01c79addf0ab4c2b7d1655ce12
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6 b/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
index 78cce49ed51d..4a2bc0ce5d88 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.4.0-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Network configuration and management in an easy way. Desktop environ
 EAPI=4
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
 IUSE=avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf +wext wimax
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1 >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3 ) modemmanager? ( >=net-misc/modemmanager-0.4 ) sys-auth/consolekit
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.4.0.tar.xz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	a83de71c2123161fc5a8323cb275f8e5	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2f014961a275fca5218d08edab76f8c1
+_md5_=9f6ae4aa9b42a7a879d89a821de2a287
diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.2 b/metadata/md5-cache/net-misc/openvpn-2.2.2
index dcbdaa1cb07e..05d0e3a4ce19 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.2.2
+++ b/metadata/md5-cache/net-misc/openvpn-2.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compat
 EAPI=4
 HOMEPAGE=http://openvpn.net/
 IUSE=examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=283101c916399fa22205a2e74871d3c9
+_md5_=cc4704e06daa4566efa49696e3bccc8d
diff --git a/metadata/md5-cache/net-misc/wget-1.14 b/metadata/md5-cache/net-misc/wget-1.14
index 6ad53d6561e9..96e53afb186e 100644
--- a/metadata/md5-cache/net-misc/wget-1.14
+++ b/metadata/md5-cache/net-misc/wget-1.14
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) ) nls? ( 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
+DEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) nls? ( 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=Network utility to retrieve files from the WWW
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 nls ntlm +ssl static
+IUSE=debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) )
+RDEPEND=!static? ( idn? ( net-dns/libidn ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.14.tar.xz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e2aca43d8831905bf10a3a6067a5e572
+_md5_=9e83940c567fc8c698a7241263b27459
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.23 b/metadata/md5-cache/net-print/cups-filters-1.0.23-r1
similarity index 97%
rename from metadata/md5-cache/net-print/cups-filters-1.0.23
rename to metadata/md5-cache/net-print/cups-filters-1.0.23-r1
index 1c47a788d25e..81d94df32929 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.23
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.23-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl app-text/poppler[cxx,jpeg?,lcms,tiff?,xpdf-head
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.23.tar.xz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=71c28891b091fddbffaef3ca3f28be65
+_md5_=5748f0b0231018b7a16048554ad0dde1
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index 63257c06a238..2a1c9f0fbc05 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -8,4 +8,4 @@ LICENSE=MIT GPL-2
 RDEPEND=app-text/ghostscript-gpl app-text/poppler[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] app-text/qpdf media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff )
 SLOT=0
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	bzr	8bf2fb439b1b76c0c6173c8b803310ae	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c974229905f26a190984fde971a8d50d
+_md5_=664de1226a96d2c3b6aacbe8d1ce0c38
diff --git a/metadata/md5-cache/net-print/lprng-3.8.35 b/metadata/md5-cache/net-print/lprng-3.8.35-r1
similarity index 95%
rename from metadata/md5-cache/net-print/lprng-3.8.35
rename to metadata/md5-cache/net-print/lprng-3.8.35-r1
index 52f517059b2c..08f3fe3c412c 100644
--- a/metadata/md5-cache/net-print/lprng-3.8.35
+++ b/metadata/md5-cache/net-print/lprng-3.8.35-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-process/procps ssl? ( dev-libs/openssl ) foomaticdb? ( net-print/foo
 SLOT=0
 SRC_URI=ftp://ftp.lprng.com/pub/LPRng/LPRng/LPRng-3.8.35.tgz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d4fd518f20d03d6661c4f4e97114a357
+_md5_=f3e8f27b37ee6aa6fff4f43535864957
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.1-r1 b/metadata/md5-cache/sys-apps/baselayout-2.1-r1
index cadd3b8522c5..ea49a2d2883c 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.1-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-2.1-r1
@@ -8,4 +8,4 @@ PDEPEND=sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gentoo/baselayout-2.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.1.tar.bz2
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cdefcc3eff22e94e1474618971a87173
+_md5_=af8629a79d3ddb1b7d595bf954da299f
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.2 b/metadata/md5-cache/sys-apps/baselayout-2.2
index 1294b444c036..772188fff193 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.2
@@ -8,4 +8,4 @@ PDEPEND=sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://gentoo/baselayout-2.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.2.tar.bz2
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2bc13a030c748400fb101e2b21fbc1ba
+_md5_=1ba1484bda618b139840932fd2b62f56
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.16 b/metadata/md5-cache/sys-apps/coreutils-8.16
index 2d42570377fd..943a4af85148 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.16
+++ b/metadata/md5-cache/sys-apps/coreutils-8.16
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilit
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp nls selinux static unicode vanilla xattr
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.16.tar.xz mirror://gnu/coreutils/coreutils-8.16.tar.xz mirror://gentoo/coreutils-8.16.tar.xz mirror://gentoo/coreutils-8.16-patches-1.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.16-patches-1.tar.xz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8789bfa7015d40ec27ed7d345df188b4
+_md5_=2ef2e86f4e83b8835eb25f5c0608b57c
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.12 b/metadata/md5-cache/sys-fs/dosfstools-3.0.12
index 98c7d3346c6c..2ab8250decb0 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.12
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.12
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
 EAPI=3
 HOMEPAGE=http://www.daniel-baumann.ch/software/dosfstools/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.12.tar.bz2 -> dosfstools-3.0.12.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=00f69c0f8f2b661a0c68a212b039370e
+_md5_=73bf4dbbe32c6bc58d6845541744ca1a
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1
new file mode 100644
index 000000000000..187312f3cdda
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including Linux-VServer patchsets for the 3.5 kernel tree.
+HOMEPAGE=http://www.gentoo.org/proj/en/vps/
+IUSE=symlink build
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=2.3.4.1-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.5.2-vs2.3.4.1.diff
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	kernel-2	dd451098928ff900df7c254820871c00	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f465435cf563a0fc7e441bfc8c22f2ca
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1180.77 b/metadata/md5-cache/www-client/chromium-21.0.1180.77
deleted file mode 100644
index de5a506c1fa6..000000000000
--- a/metadata/md5-cache/www-client/chromium-21.0.1180.77
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=4
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib dev-libs/elfutils dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.77.tar.bz2
-_eclasses_=chromium	862ef76ded8984f8deecb72729f9e773	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=3de77824d24ea045d5cde0e98f7f2f1a
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1180.77-r1 b/metadata/md5-cache/www-client/chromium-21.0.1180.77-r1
deleted file mode 100644
index d0d0acea3ee3..000000000000
--- a/metadata/md5-cache/www-client/chromium-21.0.1180.77-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=4
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.77.tar.bz2
-_eclasses_=chromium	862ef76ded8984f8deecb72729f9e773	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=20e6bf1446b24bb56b7687df8025f53b
diff --git a/metadata/md5-cache/www-client/chromium-22.0.1229.8 b/metadata/md5-cache/www-client/chromium-22.0.1229.14
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-22.0.1229.8
rename to metadata/md5-cache/www-client/chromium-22.0.1229.14
index cdcda003087e..6c2498528532 100644
--- a/metadata/md5-cache/www-client/chromium-22.0.1229.8
+++ b/metadata/md5-cache/www-client/chromium-22.0.1229.14
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.8.tar.bz2
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.14.tar.bz2
 _eclasses_=chromium	862ef76ded8984f8deecb72729f9e773	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=5644a48cb0f3a180c9f2c599018cd4eb
+_md5_=61c7abff646b5bcdbb5f7e9a67f8871e
diff --git a/metadata/md5-cache/www-client/google-chrome-21.0.1180.81_beta151980 b/metadata/md5-cache/www-client/google-chrome-22.0.1229.14_beta152690
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-21.0.1180.81_beta151980
rename to metadata/md5-cache/www-client/google-chrome-22.0.1229.14_beta152690
index e197796d53c2..23c3e71b83cb 100644
--- a/metadata/md5-cache/www-client/google-chrome-21.0.1180.81_beta151980
+++ b/metadata/md5-cache/www-client/google-chrome-22.0.1229.14_beta152690
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=media-libs/alsa-lib app-arch/bzip2 x11-libs/cairo net-print/cups sys-apps/dbus dev-libs/expat media-libs/fontconfig media-libs/freetype app-misc/ca-certificates gnome-base/gconf:2 dev-libs/libgcrypt x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss x11-libs/pango media-libs/libpng:1.2 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-fs/udev x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXScrnSaver sys-libs/zlib x11-misc/xdg-utils net-misc/curl dev-libs/openssl:0.9.8 !www-client/google-chrome:0 !www-client/google-chrome:stable !www-client/google-chrome:unstable
 RESTRICT=mirror strip
 SLOT=beta
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_21.0.1180.81-r151980_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_21.0.1180.81-r151980_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_22.0.1229.14-r152690_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_22.0.1229.14-r152690_i386.deb )
 _eclasses_=chromium	862ef76ded8984f8deecb72729f9e773	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cc79de8d84ea7eae1384cd4f27dc6e61
+_md5_=9ec60ca192cecb08e466f82212a3b449
diff --git a/metadata/md5-cache/www-servers/varnish-3.0.3 b/metadata/md5-cache/www-servers/varnish-3.0.3
new file mode 100644
index 000000000000..c7c142f97fed
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-3.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) dev-python/docutils virtual/pkgconfig
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=4
+HOMEPAGE=http://www.varnish-cache.org/
+IUSE=doc libedit static-libs +tools
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) sys-devel/gcc
+RESTRICT=test
+SLOT=0
+SRC_URI=http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=eb3cdc3257f57c0a4360a5e6b7977e1f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6ce81ee0207d..08c806add6c1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Aug 2012 17:07:32 +0000
+Fri, 24 Aug 2012 07:08:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 24d84f1f48e5..d7f5d08c6a2a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 23 17:07:30 UTC 2012
+Fri Aug 24 07:08:03 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d9d0591e5d22..25695e29835d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Aug 2012 17:30:01 +0000
+Fri, 24 Aug 2012 07:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f9e42eab98d6..7cd7c94de189 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1345741501 Thu Aug 23 17:05:01 2012 UTC
+1345791901 Fri Aug 24 07:05:01 2012 UTC
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 0992490f3b6f..1f8c72b2ff88 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -2,3 +2,4 @@ DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f8
 DIST framework-4.0.0.tar.bz2 79515768 SHA256 45c3c379ea82e46d8efef9cbbe0afa8ae8df98e50f2642afcea84a86c83c5a50
 DIST framework-4.2.0.tar.bz2 78756418 SHA256 24095059ea718dc1288f0a6653eb64e057132242531b8fa520ff15b1d121dcec
 DIST framework-4.3.0.tar.bz2 111235968 SHA256 d7b39750c68cacfb07f113bf54fb22e99e83c3117b3b8cf279dc55c4515e53cc SHA512 0406d1c7e44cb4db70f72ace1126fdc2bf86268747b980d359e76bf385375b2cef58287b694ebc4d83b6b3f1ac035168579842d6c1ed6ee330da8f35907c9128 WHIRLPOOL 358da3e963ad3f6d6f4558708fe260bc6445bc8bd5e390f018c4c9fde6cd5c0565113ddbb21a7d209040661d44770a1c57cb49463a4d6bc5d6767b954d298d5f
+DIST framework-4.4.0.tar.bz2 148529027 SHA256 ddcc7890a394d8154120a163c90b11119a0322b62d937ad1a3a14ef3fe6cf74e SHA512 dffa5dd36904d4963d0fd240f1796d43824f7df011f91d75a41f0d0ff20d942fc8a3d10495c1a0537df5b455ad7055760743e5022d742e5321b679b2d4c003df WHIRLPOOL ee0fa85a83965f75213e60aaf0174b1962841e8f10193be1cd6bea1aff561f80471c4d8892a07e65ad767587e73c4445b88149460cc5bc5509b5b096f2375b52
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-conf b/net-analyzer/metasploit/files/msfrpcd-4.4-conf
new file mode 100644
index 000000000000..dc56a9d966a6
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.4-conf
@@ -0,0 +1,25 @@
+# Config file for /etc/init.d/msfrpcd
+
+# msfrpcd -h for more info
+
+# Bind to the following IP instead of 0.0.0.0
+MSF_OPTS="-a 127.0.0.1"
+
+# Bind to the following TCP port instead of default 55553
+#MSF_OPTS="${MSF_OPTS} -p 55553"
+
+# Specify the username to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -U msf"
+
+# Specify the password to access msfrpcd
+MSF_OPTS="${MSF_OPTS} -P secret"
+
+# Server type, [Basic|Web]
+#MSF_OPTS="${MSF_OPTS} -t Basic"
+
+# URI for Web server
+#MSF_OPTS="${MSF_OPTS} -u "
+
+# Disable SSL on the XMLRPC socket
+# JAVA GUI doesn't support SSL as of Nov 6, 2010
+MSF_OPTS="${MSF_OPTS} -S"
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.4-initd b/net-analyzer/metasploit/files/msfrpcd-4.4-initd
new file mode 100644
index 000000000000..d3bee1094abf
--- /dev/null
+++ b/net-analyzer/metasploit/files/msfrpcd-4.4-initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.4-initd,v 1.1 2012/08/24 02:28:18 zerochaos Exp $
+
+VERSION=4.3
+PIDFILE=/var/run/msfrpcd${VERSION}.pid
+
+start() {
+	ebegin "Starting msfrpcd${VERSION}"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/lib/metasploit${VERSION}/msfrpcd \
+		--pidfile ${PIDFILE} \
+		--make-pidfile -- -f ${MSF_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping msfrpcd${VERSION}"
+	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index eb8bf365ee11..269b0f5360ee 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+		<description>lover of abuse</description>
+	</maintainer>
 	<herd>netmon</herd>
 	<longdescription lang="en">
 		This project is a powerful tool for penetration testing, exploit
diff --git a/net-analyzer/metasploit/metasploit-4.4.0.ebuild b/net-analyzer/metasploit/metasploit-4.4.0.ebuild
new file mode 100644
index 000000000000..ce821614091a
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.4.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.4.0.ebuild,v 1.1 2012/08/24 02:28:18 zerochaos Exp $
+
+EAPI="3"
+inherit eutils multilib
+
+SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+
+LICENSE="BSD"
+SLOT="4.4"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui mysql postgres"
+
+# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
+# such solution, bug #247787
+RDEPEND="dev-lang/ruby
+	dev-ruby/rubygems
+	dev-ruby/msgpack
+	gui? ( virtual/jre )
+	mysql? ( dev-ruby/mysql-ruby
+		dev-ruby/activerecord[mysql] )
+	postgres? ( dev-ruby/postgres
+		dev-ruby/activerecord[postgres] )"
+DEPEND=""
+
+QA_PREBUILT="
+	usr/$(get_libdir)/${PN}${SLOT}/data/cpuinfo/cpuinfo.ia32.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/cpuinfo/cpuinfo.ia64.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/eventmachine-0.12.10/lib/fastfilereaderext.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/eventmachine-0.12.10/lib/rubyeventmachine.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/thin-1.3.1/lib/thin_parser.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/nokogiri-1.5.2/lib/nokogiri/nokogiri.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/pg-0.13.2/lib/pg_ext.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/msgpack-0.4.6/lib/msgpack.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/eventmachine-0.12.10/lib/fastfilereaderext.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/eventmachine-0.12.10/lib/rubyeventmachine.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/thin-1.3.1/lib/thin_parser.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/nokogiri-1.5.2/lib/nokogiri/nokogiri.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/pg-0.13.2/lib/pg_ext.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/msgpack-0.4.6/lib/msgpack.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch-old/linux64/pg-0.13.2/lib/pg_ext.so
+	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch-old/linux32/pg-0.13.2/lib/pg_ext.so
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/john
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/genmkvpwd
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/tgtsnarf
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/mkvcalcproba
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/calc_stat
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/john
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/genmkvpwd
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/tgtsnarf
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/mkvcalcproba
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/calc_stat
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/john
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/genmkvpwd
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/tgtsnarf
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/mkvcalcproba
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/calc_stat
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/john
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/genmkvpwd
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/tgtsnarf
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/mkvcalcproba
+	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/calc_stat
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso"
+
+
+S=${WORKDIR}/msf3
+
+src_configure() {
+	# upstream makes weird tarbllz
+	find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
+
+	rm "${S}"/msfupdate
+	chmod +x "${S}"/msf*
+
+	use gui || rm msfgui
+}
+
+src_install() {
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R "${S}"/* "${D}"/usr/$(get_libdir)/${PN}${SLOT}
+	chown -R root:0 "${D}"
+
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp "${S}"/{README,HACKING} "${D}"/usr/share/doc/${PF}
+	dosym /usr/$(get_libdir)/${PN}${SLOT}/documentation /usr/share/doc/${PF}/documentation
+
+	dodir /usr/bin/
+	for file in msf*; do
+		dosym /usr/$(get_libdir)/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
+	done
+
+	newinitd "${FILESDIR}"/msfrpcd-${SLOT}-initd msfrpcd${SLOT} || die
+	newconfd "${FILESDIR}"/msfrpcd-${SLOT}-conf msfrpcd${SLOT} || die
+
+	use gui &&	make_desktop_entry msfgui${SLOT} \
+			"Metasploit Framework" \
+			metasploit \
+			'GNOME;System;Network;GTK;' &&
+		doicon "${FILESDIR}"/metasploit.icon
+
+	# Avoid useless revdep-rebuild trigger #377617
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
+		"${D}"/etc/revdep-rebuild/70-${PN}-${SLOT}
+}
+
+pkg_postinst() {
+	if use gui; then
+		elog "You will need to create a /usr/bin/msfrpcd symlink pointing to"
+		elog "the version of msfrpcd if you want to be able to start msfrpcd"
+		elog "from the java gui."
+		elog
+		elog "ln /usr/bin/msfrpcd${SLOT} /usr/bin/msfrpcd"
+		elog
+	fi
+}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 6c90d521a004..ce6e889947d9 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,5 +1,4 @@
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
-DIST munin-1.4.7-patches-1.tar.xz 10208 SHA256 7429c949ebfe3fbeaf50f54401a3119915cf4f3c520e7925d5118fbf576f8d61 SHA512 7588df8eb4528f56e34bdf925a534d8b46f1fee09a2a7ec5ccb411b2a15353f8a769664347019a2fe490611aee52f6b878518662a6965b840f667a7d460da185 WHIRLPOOL 3b14f5ba9c5c86539b1dfcd363df655e3bd7b6be8e873c1243d527aad58d68a83dff4f53ff58b0177e7c94b64f900a556a67e0dda8a82bbb83d13f9a403daccf
-DIST munin-1.4.7.tar.gz 1236273 SHA256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af SHA512 5a01c04a291f53e750b170e715c9f0d5e2cca5fa2a11f725ba6a81bbe7b34c34ef6459ea60177d13d1c38e9e91d374c1e227b2d4d7ba8c094353320a51f40b30 WHIRLPOOL f16ad8331b48136ec9cdd21fdab0efd2bca7800954f0160e7a09192c22f2d7f88cbba1df81a5750f5e4577ca1a93e41643e9ad1445b645f76becfa5db28a8088
 DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
+DIST munin-2.0.5-patches-3.tar.xz 11144 SHA256 4a8af6f8e4dcb34476ecfdffb6ba7ef139157d23906cba984b10e3da58651ef6 SHA512 69e95288f43414e8fb12b2251689a0dbebbcd4dc64e27041ad5b9be8f917a3be5bf23e754f5565b67426ff998750b28ea3b2e412ff795cad094b352ecb489746 WHIRLPOOL 3d0102296a2480b5dc163e8d473dc9778988105574fe1f9479328d9a43a4c13b9c5fa6c77fb97b07f651e2925f3fbd9472e6c3ba215c2a20b3d46606008f9811
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
new file mode 100644
index 000000000000..db0b47c7716c
--- /dev/null
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init.2,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+
+command=/usr/libexec/munin/munin-asyncd
+command_args="--fork"
+pidfile="/var/run/munin/munin-asyncd.pid"
+start_stop_daemon_args="--background --make-pidfile --user munin-asyncd"
+
+depend() {
+	need munin-node
+	before cron
+}
+
+start_pre() {
+	checkpath -d -o munin-async -m 0700 /var/spool/munin
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.5 b/net-analyzer/munin/files/munin-node_init.d_2.0.5
new file mode 100644
index 000000000000..a3ad32f0dd3a
--- /dev/null
+++ b/net-analyzer/munin/files/munin-node_init.d_2.0.5
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+
+get_munin_config() {
+	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
+}
+
+: ${CFGFILE:=/etc/munin/munin-node.conf}
+
+command=/usr/sbin/munin-node
+command_args="--config ${CFGFILE}"
+pidfile=$(get_munin_config pid_file)
+start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0}"
+
+depend() {
+	config "$CFGFILE"
+
+	need net
+	before cron
+
+	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
+		use logger
+}
+
+# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-1.4.7-r2.ebuild b/net-analyzer/munin/munin-1.4.7-r2.ebuild
deleted file mode 100644
index 97ca8968fbcf..000000000000
--- a/net-analyzer/munin/munin-1.4.7-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7-r2.ebuild,v 1.2 2012/07/25 06:56:53 mr_bones_ Exp $
-
-EAPI=4
-
-PATCHSET=1
-
-inherit eutils user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="asterisk doc irc memcached minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			mysql? ( virtual/mysql
-					 dev-perl/Cache-Cache
-					 dev-perl/DBD-mysql )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			memcached? ( dev-perl/Cache-Memcached )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/patches/*.patch
-
-	# Don't build java plugins in this series
-	# sed is needed so the java plugins aren't automagically built.
-	sed -i -e 's: build-plugins-java : :' \
-		-e 's: install-plugins-java : :' Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man
-	if use doc; then
-		emake -j 1 build-doc
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime
-	else
-		emake -j 1 DESTDIR="${D}" install
-	fi
-	fowners munin:munin ${dirs}
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.2 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache*
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin
-
-	if ! use minimal; then
-		exeinto /etc/local.d/
-		newexe "${FILESDIR}"/localstart-munin 50munin.start
-
-		dodir /usr/share/${PN}
-		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-# Mail reports to root@, not munin@
-MAILTO=root
-
-# This runs the munin task every 5 minutes.
-*/5	* * * *		/usr/bin/munin-cron
-
-# Alternatively, this route works differently
-# Update once a minute (for busy sites)
-#*/1 * * * *		/usr/libexec/munin/munin-update
-## Check for limit excess every 2 minutes
-#*/2 * * * *		/usr/libexec/munin/munin-limits
-## Update graphs every 5 minutes
-#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-## Update HTML pages every 15 minutes
-#*/15 * * * *		nice /usr/libexec/munin/munin-html
-EOF
-
-		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
-# Mail reports to root@, not munin@, only execute one at a time
-!mailto(root),serial(true)
-
-# This runs the munin task every 5 minutes.
-@ 5		/usr/bin/munin-cron
-
-# Alternatively, this route works differently
-# Update once a minute (for busy sites)
-#@ 1	/usr/libexec/munin/munin-update
-## Check for limit excess every 2 minutes
-#@ 2	/usr/libexec/munin/munin-limits
-## Update graphs every 5 minutes
-#@ 5	nice /usr/libexec/munin/munin-graph
-## Update HTML pages every 15 minutes
-#@ 15	nice /usr/libexec/munin/munin-html
-EOF
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	if ! use minimal; then
-		elog "To have munin's cronjob automatically configured for you if this is"
-		elog "your munin master installation, please:"
-		elog "emerge --config net-analyzer/munin"
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.5-r2.ebuild b/net-analyzer/munin/munin-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..a85dc8a50d64
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.5-r2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.5-r2.ebuild,v 1.1 2012/08/23 19:20:42 flameeyes Exp $
+
+EAPI=4
+
+PATCHSET=3
+
+inherit eutils user java-pkg-opt-2
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http"
+REQUIRED_USE="cgi? ( !minimal )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="dev-lang/perl
+			sys-process/procps
+			asterisk? ( dev-perl/Net-Telnet )
+			irc? ( dev-perl/Net-IRC )
+			mysql? ( virtual/mysql
+					 dev-perl/Cache-Cache
+					 dev-perl/DBD-mysql )
+			ssl? ( dev-perl/Net-SSLeay )
+			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
+			memcached? ( dev-perl/Cache-Memcached )
+			cgi? ( dev-perl/FCGI )
+			syslog? ( virtual/perl-Sys-Syslog )
+			ipmi? (
+				>=sys-libs/freeipmi-1.1.6-r1
+				virtual/awk
+			)
+			http? ( dev-perl/libwww-perl )
+			dev-perl/DBI
+			dev-perl/DateManip
+			dev-perl/File-Copy-Recursive
+			dev-perl/Log-Log4perl
+			dev-perl/Net-CIDR
+			dev-perl/Net-Netmask
+			dev-perl/Net-SNMP
+			dev-perl/net-server[ipv6(-)?]
+			virtual/perl-Digest-MD5
+			virtual/perl-Getopt-Long
+			virtual/perl-MIME-Base64
+			virtual/perl-Storable
+			virtual/perl-Text-Balanced
+			virtual/perl-Time-HiRes
+			!minimal? (
+				dev-perl/HTML-Template
+				dev-perl/IO-Socket-INET6
+				>=net-analyzer/rrdtool-1.3[perl]
+			)"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	virtual/perl-Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/true /var/lib/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	cat - >> "${S}"/Makefile.config <<EOF
+PREFIX=\$(DESTDIR)/usr
+CONFDIR=\$(DESTDIR)/etc/munin
+DOCDIR=${T}/useless/doc
+MANDIR=\$(PREFIX)/share/man
+LIBDIR=\$(PREFIX)/libexec/munin
+HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+CGIDIR=${cgidir}
+DBDIR=\$(DESTDIR)/var/lib/munin
+SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+LOGDIR=\$(DESTDIR)/var/log/munin
+PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+JCVALID=$(usex java yes no)
+EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	local install_targets="install-common-prime install-node-prime install-plugins-prime"
+	use java && install_targets+=" install-plugins-java"
+
+	use minimal || install_targets=install
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" ${install_targets}
+
+	# remove the plugins for non-Gentoo package managers
+	rm "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.5 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodoc README ChangeLog INSTALL build/resources/apache*
+
+	# bug 254968
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/logrotate.d-munin munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	keepdir /var/lib/munin-async/.ssh /var/spool/munin-async
+	touch "${D}"/var/lib/munin-async/.ssh/authorized_keys
+	fowners munin-async /var/lib/munin-async/.ssh/{,authorized_keys}
+	fperms 0700 /var/lib/munin-async/.ssh /var/spool/munin-async
+	fperms 0600 /var/lib/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		exeinto /etc/local.d/
+		newexe "${FILESDIR}"/localstart-munin 50munin.start
+
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+		else
+			sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat - >> "${D}"/var/lib/munin/.ssh/config <<EOF
+IdentityFile /var/lib/munin/.ssh/id_ecdsa
+IdentityFile /var/lib/munin/.ssh/id_rsa
+EOF
+
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat - >> "${D}"/usr/share/${PN}/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+# Mail reports to root@, not munin@
+MAILTO=root
+
+# This runs the munin task every 5 minutes.
+*/5	* * * *		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * *		/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * *		/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#*/15 * * * *		nice /usr/libexec/munin/munin-html
+EOF
+
+		cat - >> "${D}"/usr/share/${PN}/fcrontab <<EOF
+# Mail reports to root@, not munin@, only execute one at a time
+!mailto(root),serial(true)
+
+# This runs the munin task every 5 minutes.
+@ 5		/usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#@ 1	/usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#@ 2	/usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#@ 5	nice /usr/libexec/munin/munin-graph
+## Update HTML pages every 15 minutes
+#@ 15	nice /usr/libexec/munin/munin-html
+EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa -f /var/lib/munin/.ssh/id_rsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa -f /var/lib/munin/.ssh/id_ecdsa -N '' -C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+}
diff --git a/net-analyzer/nagios-nrpe/files/multiline.patch b/net-analyzer/nagios-nrpe/files/multiline.patch
deleted file mode 100644
index c70580704531..000000000000
--- a/net-analyzer/nagios-nrpe/files/multiline.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -ur nrpe-2.12.original/include/common.h nrpe-2.12/include/common.h
---- nrpe-2.12.original/include/common.h	2008-03-10 22:04:42.000000000 +0100
-+++ nrpe-2.12/include/common.h	2008-08-05 00:27:10.664753368 +0200
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT	10	/* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300	/* timeout if daemon is waiting for connection more than this time */
- 
--#define MAX_INPUT_BUFFER	2048	/* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER	16384	/* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH     256
- 
- #define MAX_HOST_ADDRESS_LENGTH	256	/* max size of a host address */
-@@ -55,12 +55,14 @@
- 
- #define QUERY_PACKET		1		/* id code for a packet containing a query */
- #define	RESPONSE_PACKET		2		/* id code for a packet containing a response */
-+#define	RESPONSE_PACKET_WITH_MORE	3	/* id code for a packet containing a response, with more data to follow */
- 
- #define NRPE_PACKET_VERSION_3   3               /* packet version identifier */
- #define NRPE_PACKET_VERSION_2   2               
- #define NRPE_PACKET_VERSION_1	1		/* older packet version identifiers (no longer supported) */
- 
--#define MAX_PACKETBUFFER_LENGTH	1024		/* max amount of data we'll send in one query/response */
-+#define MAX_PACKETBUFFER_LENGTH	1024		/* max amount of data we'll send in one query/response. WARNING - do not change this
-+						as older clients/servers will not work */
- 
- typedef struct packet_struct{
- 	int16_t   packet_version;
-Binary files nrpe-2.12.original/src/check_nrpe and nrpe-2.12/src/check_nrpe differ
-diff -ur nrpe-2.12.original/src/check_nrpe.c nrpe-2.12/src/check_nrpe.c
---- nrpe-2.12.original/src/check_nrpe.c	2008-03-10 22:04:43.000000000 +0100
-+++ nrpe-2.12/src/check_nrpe.c	2008-08-05 00:48:00.731981872 +0200
-@@ -221,6 +221,11 @@
- 			return STATE_UNKNOWN;
- 		        }
- 
-+		/* Altinity patch: Allow multiple packets to be received */
-+		/* Indentation not corrected to allow simpler patching */
-+		/* START MULTI_PACKET LOOP */
-+		do {
-+
- 		/* wait for the response packet */
- 		bytes_to_recv=sizeof(receive_packet);
- 		if(use_ssl==FALSE)
-@@ -233,31 +238,24 @@
- 		/* reset timeout */
- 		alarm(0);
- 
--		/* close the connection */
--#ifdef HAVE_SSL
--		if(use_ssl==TRUE){
--			SSL_shutdown(ssl);
--			SSL_free(ssl);
--			SSL_CTX_free(ctx);
--	                }
--#endif
--		graceful_close(sd,1000);
--
- 		/* recv() error */
- 		if(rc<0){
- 			printf("CHECK_NRPE: Error receiving data from daemon.\n");
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
- 		/* server disconnected */
- 		else if(rc==0){
- 			printf("CHECK_NRPE: Received 0 bytes from daemon.  Check the remote server logs for error messages.\n");
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
- 		/* receive underflow */
- 		else if(bytes_to_recv<sizeof(receive_packet)){
- 			printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
-@@ -271,21 +269,21 @@
- 		calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
- 		if(packet_crc32!=calculated_crc32){
- 			printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
-                         }
- 	
- 		/* check packet version */
- 		if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
- 			printf("CHECK_NRPE: Invalid packet version received from server.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 			}
- 
- 		/* check packet type */
--		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
-+		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
- 			printf("CHECK_NRPE: Invalid packet type received from server.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 			}
- 
-@@ -297,8 +295,18 @@
- 		if(!strcmp(receive_packet.buffer,""))
- 			printf("CHECK_NRPE: No output returned from daemon.\n");
- 		else
--			printf("%s\n",receive_packet.buffer);
--	        }
-+			printf("%s",receive_packet.buffer);
-+
-+		} while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
-+		/* END MULTI_PACKET LOOP */
-+
-+		/* Finish output with newline */
-+		printf("\n");
-+
-+		/* close the connection */
-+		graceful_close(sd,1000);
-+
-+		}
- 
- 	/* reset the alarm */
- 	else
-@@ -434,6 +442,14 @@
-         struct timeval tv;
-         char buf[1000];
- 
-+#ifdef HAVE_SSL
-+	if(use_ssl==TRUE){
-+		SSL_shutdown(ssl);
-+		SSL_free(ssl);
-+		SSL_CTX_free(ctx);
-+		}
-+#endif
-+
- 	/* send FIN packet */
-         shutdown(sd,SHUT_WR);  
-         for(;;){
-Binary files nrpe-2.12.original/src/nrpe and nrpe-2.12/src/nrpe differ
-diff -ur nrpe-2.12.original/src/nrpe.c nrpe-2.12/src/nrpe.c
---- nrpe-2.12.original/src/nrpe.c	2008-08-04 16:17:25.729637000 +0200
-+++ nrpe-2.12/src/nrpe.c	2008-08-05 00:52:47.690415400 +0200
-@@ -1029,6 +1029,8 @@
- 	char processed_command[MAX_INPUT_BUFFER];
- 	int result=STATE_OK;
- 	int early_timeout=FALSE;
-+	int bytes_copied=0;
-+	char *pbuffer=&buffer[0];
- 	int rc;
- 	int x;
- #ifdef DEBUG
-@@ -1245,6 +1247,14 @@
- 	if(buffer[strlen(buffer)-1]=='\n')
- 		buffer[strlen(buffer)-1]='\x0';
- 
-+	/* Altinity patch to allow multi packet responses */
-+	/* Loop not indented to allow easier patching */
-+	/* START MULTI_PACKET LOOP */
-+	do {
-+
-+	if(debug==TRUE)
-+		syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
-+
- 	/* clear the response packet buffer */
- 	bzero(&send_packet,sizeof(send_packet));
- 
-@@ -1253,11 +1263,17 @@
- 
- 	/* initialize response packet data */
- 	send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
--	send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
- 	send_packet.result_code=(int16_t)htons(result);
--	strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
-+	strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
- 	send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
- 	
-+	bytes_copied = strlen(&send_packet.buffer[0]);
-+	pbuffer = pbuffer+bytes_copied;
-+	if(strlen(pbuffer)>0)
-+		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE);
-+	else
-+		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
-+
- 	/* calculate the crc 32 value of the packet */
- 	send_packet.crc32_value=(u_int32_t)0L;
- 	calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet));
-@@ -1276,6 +1292,9 @@
- 		SSL_write(ssl,&send_packet,bytes_to_send);
- #endif
- 
-+	} while (strlen(pbuffer) > 0);
-+	/* END MULTI_PACKET LOOP */
-+
- #ifdef HAVE_SSL
- 	if(ssl){
- 		SSL_shutdown(ssl);
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild
deleted file mode 100644
index a254f2384797..000000000000
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild,v 1.5 2012/06/07 00:14:47 idl0r Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs user multilib
-
-DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="ssl command-args"
-DEPEND=">=net-analyzer/nagios-plugins-1.3.0
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/nrpe-${PV}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-src_prepare() {
-	# Add support for large output,
-	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
-	epatch "${FILESDIR}/multiline.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="${myconf} $(use_enable ssl) \
-					  $(use_enable command-args)"
-
-	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
-	if use ssl ; then
-		openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > "${S}"/src/dh.h
-	fi
-
-	econf ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-grp=nagios || die "econf failed"
-}
-
-src_compile() {
-	emake all || die "make failed"
-	# Add nifty nrpe check tool
-	cd contrib
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o nrpe_check_control	nrpe_check_control.c
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY README.SSL \
-		contrib/README.nrpe_check_control
-
-	insinto /etc/nagios
-	newins "${S}"/sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/bin
-	doexe src/nrpe
-
-	exeopts -m0750 -o nagios -g nagios
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe src/check_nrpe contrib/nrpe_check_control
-
-	newinitd "${FILESDIR}"/nrpe-nagios3 nrpe
-
-	# Create pidfile in /var/run/nrpe, bug #233859
-	keepdir /var/run/nrpe
-	fowners nagios:nagios /var/run/nrpe
-	sed -i -e \
-		"s#pid_file=/var/run/nrpe.pid#pid_file=/var/run/nrpe/nrpe.pid#" \
-		"${D}"/etc/nagios/nrpe.cfg || die "sed failed"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are using the nrpe daemon, remember to edit"
-	einfo "the config file /etc/nagios/nrpe.cfg"
-	einfo
-
-	if use command-args ; then
-		ewarn "You have enabled command-args for NRPE. This enables"
-		ewarn "the ability for clients to supply arguments to commands"
-		ewarn "which should be run. "
-		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-	fi
-}
diff --git a/net-analyzer/nagios-nsca/files/nsca.init b/net-analyzer/nagios-nsca/files/nsca.init
deleted file mode 100644
index 19de9ce12ba0..000000000000
--- a/net-analyzer/nagios-nsca/files/nsca.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/files/nsca.init,v 1.2 2012/08/21 17:30:54 flameeyes Exp $
-
-get_pidfile() {
-    sed -n -e 's:^[ \t]*pid_file=\([^#]\+\).*:\1:p' \
-	/etc/nagios/nsca.cfg
-}
-
-extra_started_commands="reload"
-
-command=/usr/libexec/${SVCNAME}
-command_args="-c /etc/nagios/nsca.cfg --daemon"
-pidfile=$(get_pidfile)
-
-depend() {
-    need net
-    use icinga nagios
-}
-
-reload() {
-    ebegin "Reloading nsca"
-    kill -HUP `cat $(get_pidfile)`
-    eend $? "Failed to reload nsca"
-}
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r102.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r102.ebuild
deleted file mode 100644
index f7c977808427..000000000000
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r102.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r102.ebuild,v 1.1 2012/08/21 17:30:54 flameeyes Exp $
-
-EAPI=4
-
-inherit multilib user
-
-DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="tcpd +crypt"
-
-DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-RDEPEND="${DEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/nsca-${PV}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	use tcpd || export ac_cv_lib_wrap_main=no
-	use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false
-
-	econf
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nsca-user=nagios \
-		--with-nsca-grp=nagios
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY
-
-	insinto /etc/nagios
-	doins "${S}"/sample-config/nsca.cfg
-	doins "${S}"/sample-config/send_nsca.cfg
-
-	dobin src/send_nsca
-
-	exeinto /usr/libexec
-	doexe src/nsca
-
-	newinitd "${FILESDIR}"/nsca.init nsca
-}
-
-pkg_postinst() {
-	elog "If you are using the nsca daemon, remember to edit"
-	elog "the config file /etc/nagios/nsca.cfg"
-	elog ""
-	elog "If you intend to use nsca with Icinga, make sure you"
-	elog "change the value of command_file in nsca.cfg."
-}
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index e98d98816cfe..1173385a4c3d 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -37,6 +37,23 @@
       Install <pkg>dev-perl/Net-SNMP</pkg> required for monitoring
       SNMP values. Disabling the flag does not remove any plugin file.
     </flag>
+    <flag name='suid'>
+      Give root privileges to the ICMP, DHCP and IDE S.M.A.R.T. check
+      binaries. This allows them to ignore the access controls that
+      would disallow the nagios user from running the check.
+    </flag>
+    <flag name='sudo'>
+      Install a file to allow the nagios user to execute some commands
+      via <pkg>app-admin/sudo</pkg>, so that the scripts can access
+      devices and features that wouldn't be otherwise allowed by
+      nagios.
+    </flag>
+    <flag name='smart'>
+      Install <pkg>sys-apps/smartmontools</pkg> required for
+      S.M.A.R.T. disk monitoring. Disabling the flag removes the
+      plugin file. This plugin also requires the sudo flag to be
+      enable.
+    </flag>
   </use>
 </pkgmetadata>
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
new file mode 100644
index 000000000000..ccce43ba1093
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.16-r2.ebuild,v 1.1 2012/08/23 22:03:56 flameeyes Exp $
+
+EAPI=4
+
+PATCHSET=2
+
+inherit autotools eutils multilib user
+
+DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6 radius +suid jabber gnutls sudo smart"
+
+DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6g )
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( >=net-dialup/radiusclient-0.3.2 )"
+
+# tests try to ssh into the box itself
+RESTRICT="test"
+
+RDEPEND="${DEPEND}
+	>=dev-lang/perl-5.6.1-r7
+	samba? ( >=net-fs/samba-2.2.5-r1 )
+	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 )
+	mysql? ( dev-perl/DBI
+			 dev-perl/DBD-mysql )
+	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
+	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
+	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
+	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
+	ups? ( >=sys-power/nut-1.4 )
+	nagios-game? ( >=games-util/qstat-2.6 )
+	jabber? ( >=dev-perl/Net-Jabber-2.0 )
+	sudo? ( >=app-admin/sudo-1.8.5 )
+	smart? ( sys-apps/smartmontools )"
+
+REQUIRED_USE="smart? ( sudo )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use ssl; then
+		myconf+="
+			$(use_with !gnutls openssl /usr)
+			$(use_with gnutls gnutls /usr)"
+	else
+		myconf+=" --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with radius) \
+		$(use_with postgres pgsql /usr) \
+		${myconf} \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--sysconfdir=/etc/nagios
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS BUGS CODING ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS )
+
+src_install() {
+	default
+
+	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
+
+	use suid && fperms 04710 ${nagiosplugindir}/check_{icmp,ide_smart,dhcp}
+
+	if use sudo; then
+		cat - > "${T}"/50${PN} <<EOF
+# we add /bin/false so that we don't risk causing syntax errors if all USE flags
+# are off as we'd end up with an empty set
+Cmnd_Alias NAGIOS_PLUGINS_CMDS = /bin/false, $(usex smart /usr/sbin/smartctl)
+User_Alias NAGIOS_PLUGINS_USERS = nagios, icinga
+
+NAGIOS_PLUGINS_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_CMDS
+EOF
+	fi
+	insinto /etc/sudoers.d
+	doins "${T}"/50${PN}
+
+	cd contrib/
+	dodoc *README*
+
+	# remove stuff that is way too broken to fix, or for which the USE
+	# flag has been removed.
+	rm -r tarballs aix \
+		check_compaq_insight.pl *.c *README* \
+		$(usex !jabber nagios_sendim.pl) \
+		$(usex !smart check_smart.pl)
+
+	# fix perl interpreter
+	sed -i -e '1s:/usr/local/bin/perl:/usr/bin/perl:' \
+		"${S}"/contrib/* || die
+
+	exeinto ${nagiosplugindir}/contrib
+	doexe *
+
+	dosym ../utils.sh ${nagiosplugindir}/contrib/utils.sh
+	dosym ../utils.pm ${nagiosplugindir}/contrib/utils.pm
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags which determines what nagios is able to monitor."
+	elog "Depending on what you want to monitor with nagios, some or all of these USE"
+	elog "flags need to be set for nagios to function correctly."
+	elog "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
+}
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nrpe/Manifest
similarity index 100%
rename from net-analyzer/nagios-nrpe/Manifest
rename to net-analyzer/nrpe/Manifest
diff --git a/net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-command-args.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-command-args.patch
rename to net-analyzer/nrpe/files/nagios-nrpe-2.13-command-args.patch
diff --git a/net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-multiline.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-multiline.patch
rename to net-analyzer/nrpe/files/nagios-nrpe-2.13-multiline.patch
diff --git a/net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-tcpd.patch b/net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nagios-nrpe-2.13-tcpd.patch
rename to net-analyzer/nrpe/files/nagios-nrpe-2.13-tcpd.patch
diff --git a/net-analyzer/nagios-nrpe/files/nrpe-nagios3 b/net-analyzer/nrpe/files/nrpe-nagios3
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nrpe-nagios3
rename to net-analyzer/nrpe/files/nrpe-nagios3
diff --git a/net-analyzer/nagios-nrpe/files/nrpe-nagios3-r1 b/net-analyzer/nrpe/files/nrpe-nagios3-r1
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nrpe-nagios3-r1
rename to net-analyzer/nrpe/files/nrpe-nagios3-r1
diff --git a/net-analyzer/nrpe/files/nrpe.init b/net-analyzer/nrpe/files/nrpe.init
new file mode 100644
index 000000000000..cf3b2242b2dd
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/files/nrpe.init,v 1.1 2012/08/23 23:07:05 flameeyes Exp $
+
+: ${CFGFILE:=/etc/nagios/nrpe.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
+}
+
+extra_started_commands="reload"
+
+command=/usr/libexec/${SVCNAME}
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
+
+depend() {
+    config ${CFGFILE}
+    need net
+}
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    kill -HUP `cat $(get_config pid_file)`
+    eend $?
+}
diff --git a/net-analyzer/nagios-nrpe/files/nrpe.xinetd b/net-analyzer/nrpe/files/nrpe.xinetd
similarity index 100%
rename from net-analyzer/nagios-nrpe/files/nrpe.xinetd
rename to net-analyzer/nrpe/files/nrpe.xinetd
diff --git a/net-analyzer/nrpe/files/nrpe.xinetd.2 b/net-analyzer/nrpe/files/nrpe.xinetd.2
new file mode 100644
index 000000000000..d9f226eb2f96
--- /dev/null
+++ b/net-analyzer/nrpe/files/nrpe.xinetd.2
@@ -0,0 +1,5 @@
+/nrpe
+	server_args = -c /etc/nagios/nrpe.cfg --inetd
+#	only_from   = 127.0.0.1
+	disabled    = yes
+}
diff --git a/net-analyzer/nagios-nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
similarity index 50%
rename from net-analyzer/nagios-nrpe/metadata.xml
rename to net-analyzer/nrpe/metadata.xml
index 505d584563e0..36b9db86d375 100644
--- a/net-analyzer/nagios-nrpe/metadata.xml
+++ b/net-analyzer/nrpe/metadata.xml
@@ -7,6 +7,14 @@
     execute commands defined in a centralized configuration file.
   </longdescription>
   <use>
-    <flag name='command-args'>allow clients to specify command arguments</flag>
+    <flag name='command-args'>
+      Build support for specifying the command-line arguments from the
+      Nagios/Icinga master. Make sure you understand the implications
+      of this flag as it can be a security risk.
+    </flag>
+
+    <flag name='minimal'>
+      Only build the check plugins for Nagios/Icinga, and not the daemon.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild b/net-analyzer/nrpe/nrpe-2.12-r102.ebuild
similarity index 95%
rename from net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild
rename to net-analyzer/nrpe/nrpe-2.12-r102.ebuild
index e9425068e9d6..f1ea10698a75 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild
+++ b/net-analyzer/nrpe/nrpe-2.12-r102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild,v 1.9 2012/06/07 00:14:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/nrpe-2.12-r102.ebuild,v 1.1 2012/08/23 23:07:05 flameeyes Exp $
 
 inherit eutils toolchain-funcs user multilib
 
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild b/net-analyzer/nrpe/nrpe-2.13-r2.ebuild
similarity index 92%
rename from net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild
rename to net-analyzer/nrpe/nrpe-2.13-r2.ebuild
index 3edae58c9f5c..1fb1fa8cd8e8 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild
+++ b/net-analyzer/nrpe/nrpe-2.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.13-r2.ebuild,v 1.6 2012/07/15 17:03:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/nrpe-2.13-r2.ebuild,v 1.1 2012/08/23 23:07:05 flameeyes Exp $
 
 EAPI=4
 
@@ -38,12 +38,12 @@ pkg_setup() {
 src_prepare() {
 	# Add support for large output,
 	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
-	epatch "${FILESDIR}/${P}-multiline.patch"
+	epatch "${FILESDIR}/nagios-nrpe-2.13-multiline.patch"
 
 	# TCP wrappers conditional, bug 326367
-	epatch "${FILESDIR}/${P}-tcpd.patch"
+	epatch "${FILESDIR}/nagios-nrpe-2.13-tcpd.patch"
 	# Make command-args really conditional, bug 397603
-	epatch "${FILESDIR}/${P}-command-args.patch"
+	epatch "${FILESDIR}/nagios-nrpe-2.13-command-args.patch"
 
 	sed -i -e "s:/usr/local/nagios/var/rw/nagios.cmd:${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}:" contrib/nrpe_check_control.c || die
 	sed -i -e "s:/usr/local/nagios/etc/services.cfg:${NAGIOS_SERVICES_FILE:-/etc/services.cfg}:" contrib/nrpe_check_control.c || die
diff --git a/net-analyzer/nrpe/nrpe-2.13-r4.ebuild b/net-analyzer/nrpe/nrpe-2.13-r4.ebuild
new file mode 100644
index 000000000000..099222bd2e10
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-2.13-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nrpe/nrpe-2.13-r4.ebuild,v 1.1 2012/08/24 04:54:29 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib user autotools
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="command-args ssl tcpd minimal"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
+RDEPEND="${DEPEND}
+	!minimal? ( >=net-analyzer/nagios-plugins-1.3.0 )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+
+	elog "If you plan to use \"nrpe_check_control\" then you may want to specify"
+	elog "different command and services files. You can override the defaults"
+	elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables."
+	elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}"
+	elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}"
+}
+
+src_prepare() {
+	# Add support for large output,
+	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
+	epatch "${FILESDIR}/nagios-nrpe-2.13-multiline.patch"
+
+	# TCP wrappers conditional, bug 326367
+	epatch "${FILESDIR}/nagios-nrpe-2.13-tcpd.patch"
+	# Make command-args really conditional, bug 397603
+	epatch "${FILESDIR}/nagios-nrpe-2.13-command-args.patch"
+
+	sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' contrib/nrpe_check_control.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use minimal; then
+		myconf="--disable-tcp-wrapper --disable-command-args"
+	else
+		myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)"
+	fi
+
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-group=nagios \
+		$(use_enable ssl) \
+		${myconf}
+}
+
+src_compile() {
+	emake -C src check_nrpe $(usex !minimal nrpe)
+
+	# Add nifty nrpe check tool
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
+		-DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \
+		-DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \
+		${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY \
+		contrib/README.nrpe_check_control \
+		$(usex ssl README.SSL)
+
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe src/check_nrpe nrpe_check_control
+
+	use minimal && return 0
+
+	## NON-MINIMAL INSTALL FOLLOWS ##
+
+	insinto /etc/nagios
+	newins sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	exeinto /usr/libexec
+	doexe src/nrpe
+
+	newinitd "${FILESDIR}"/nrpe.init nrpe
+
+	insinto /etc/xinetd.d/
+	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
+
+	if use tcpd; then
+		sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \
+			"${D}"/etc/init.d/nrpe
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are using the nrpe daemon, remember to edit"
+	elog "the config file /etc/nagios/nrpe.cfg"
+
+	if use command-args ; then
+		ewarn ""
+		ewarn "You have enabled command-args for NRPE. This enables"
+		ewarn "the ability for clients to supply arguments to commands"
+		ewarn "which should be run. "
+		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
+		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
+	fi
+}
diff --git a/net-analyzer/nagios-nsca/Manifest b/net-analyzer/nsca/Manifest
similarity index 100%
rename from net-analyzer/nagios-nsca/Manifest
rename to net-analyzer/nsca/Manifest
diff --git a/net-analyzer/nagios-nsca/files/nsca-nagios3 b/net-analyzer/nsca/files/nsca-nagios3
similarity index 100%
rename from net-analyzer/nagios-nsca/files/nsca-nagios3
rename to net-analyzer/nsca/files/nsca-nagios3
diff --git a/net-analyzer/nsca/files/nsca.conf b/net-analyzer/nsca/files/nsca.conf
new file mode 100644
index 000000000000..987cd10ebf58
--- /dev/null
+++ b/net-analyzer/nsca/files/nsca.conf
@@ -0,0 +1,5 @@
+# Choose the configuration file to use; the pre-defined configurations
+# for Nagios and Icinga are available in their respective directories:
+#  /etc/nagios/nsca.cfg
+#  /etc/icinga/nsca.cfg
+CFGFILE=/etc/nagios/nsca.cfg
diff --git a/net-analyzer/nsca/files/nsca.init b/net-analyzer/nsca/files/nsca.init
new file mode 100644
index 000000000000..36c72d5c5700
--- /dev/null
+++ b/net-analyzer/nsca/files/nsca.init
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/files/nsca.init,v 1.2 2012/08/23 23:08:41 flameeyes Exp $
+
+: ${CFGFILE:=/etc/nagios/nsca.cfg}
+
+get_config() {
+    [ -f ${CFGFILE} ] || return 1
+
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	${CFGFILE}
+}
+
+extra_started_commands="reload"
+
+command=/usr/libexec/${SVCNAME}
+command_args="-c ${CFGFILE} --daemon"
+pidfile=$(get_config pid_file)
+
+depend() {
+    config ${CFGFILE}
+
+    need net
+    case $(get_config nsca_user) in
+	icinga) need icinga ;;
+	nagios) need nagios ;;
+    esac
+}
+
+reload() {
+    ebegin "Reloading ${SVCNAME}"
+    kill -HUP `cat $(get_config pid_file)`
+    eend $?
+}
diff --git a/net-analyzer/nagios-nsca/metadata.xml b/net-analyzer/nsca/metadata.xml
similarity index 87%
rename from net-analyzer/nagios-nsca/metadata.xml
rename to net-analyzer/nsca/metadata.xml
index e4387720d64e..be5f7d8397fe 100644
--- a/net-analyzer/nagios-nsca/metadata.xml
+++ b/net-analyzer/nsca/metadata.xml
@@ -25,6 +25,11 @@
       flag unless all the communication will be handled in an
       absolutely safe environment.
     </flag>
+    <flag name='minimal'>
+      Only build and install the send_nsca command and not the
+      daemon. This allows a very minimal install with no overhead when
+      setting up a node.
+    </flag>
   </use>
 </pkgmetadata>
 
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r100.ebuild b/net-analyzer/nsca/nsca-2.7.2-r100.ebuild
similarity index 90%
rename from net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r100.ebuild
rename to net-analyzer/nsca/nsca-2.7.2-r100.ebuild
index 86b5c25acbb3..8c4e3fabc230 100644
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r100.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r100.ebuild,v 1.7 2009/03/18 22:22:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/nsca-2.7.2-r100.ebuild,v 1.1 2012/08/23 21:27:08 flameeyes Exp $
 
 inherit multilib
 
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
new file mode 100644
index 000000000000..10040edf9e25
--- /dev/null
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/nsca-2.7.2-r103.ebuild,v 1.3 2012/08/23 21:30:30 flameeyes Exp $
+
+EAPI=4
+
+inherit multilib user eutils
+
+DESCRIPTION="Nagios Service Check Acceptor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tcpd +crypt minimal"
+
+DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 )
+	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
+
+RDEPEND="${DEPEND}
+	!minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) )
+	sys-apps/openrc"
+
+pkg_setup() {
+	if ! use minimal; then
+		enewgroup nagios
+		enewgroup icinga
+		enewuser nagios -1 /bin/bash /var/nagios/home nagios
+		enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+	fi
+}
+
+src_configure() {
+	use tcpd || export ac_cv_lib_wrap_main=no
+	use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false
+
+	econf \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nsca-user=nagios \
+		--with-nsca-grp=nagios
+}
+
+src_compile() {
+	emake -C src send_nsca $(usex !minimal nsca)
+
+	# prepare the alternative configuration file
+	sed \
+		-e '/nsca_\(user\|group\)/s:nagios:icinga:' \
+		-e '/nsca_chroot/s:=.*:=/var/lib/icinga/rw:' \
+		-e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \
+		"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY
+
+	dobin src/send_nsca
+
+	insinto /etc/nagios
+	doins "${S}"/sample-config/send_nsca.cfg
+
+	if ! use minimal; then
+		exeinto /usr/libexec
+		doexe src/nsca
+
+		newinitd "${FILESDIR}"/nsca.init nsca
+		newconfd "${FILESDIR}"/nsca.conf nsca
+
+		insinto /etc/nagios
+		doins "${S}"/sample-config/nsca.cfg
+
+		insinto /etc/icinga
+		newins "${T}"/nsca.icinga.cfg nsca.cfg
+	fi
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog "If you are using the nsca daemon, remember to edit"
+		elog "the config file /etc/nagios/nsca.cfg"
+		elog ""
+		elog "If you intend to use nsca with Icinga, change the"
+		elog "configuration file path in /etc/conf.d/nsca so that"
+		elog "it will default to the correct paths and users."
+	fi
+}
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild b/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
index 9473c7b0575b..35c5118ad1bb 100644
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.3 2012/08/17 09:41:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.4 2012/08/23 20:58:54 maekke Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@@ -12,7 +12,7 @@ HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="doc policykit test"
 
 RDEPEND=">=dev-libs/glib-2.18:2
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
index 0f185d5628f8..e409b42cadec 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-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/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild,v 1.4 2012/08/17 09:43:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild,v 1.5 2012/08/23 21:00:14 maekke Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf +wext wimax" # systemd
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 3ca0619bdfca..6ad9d950ed01 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,4 +1,4 @@
-DIST openvpn-2.1.0_eurephia.patch 2774 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896
+DIST openvpn-2.1.0_eurephia.patch 2774 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896 SHA512 b81b69887f820a54f9d354b1fd8d7168094d9bd952fb6aedb68f88d6eeab74f69fdf1cc9a938b56ffb28bce75ea2d0b3d78f11bc811b99554e6c7b5e0dc15bf6 WHIRLPOOL 3321af7572cce1752df3eadfac3f9f85b60197bdb3d90471e3229e87797fbf183a8ab5773f9edab81c83d67d9252ebf723b16b7ba68f2b81fd8969f6af6a82ab
 DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d SHA512 939043e8e900f704ce4dfb56fb5113f7233726b435f4564df051784f3814c95abd88fab122262fb87f92f10cc73bd324c60bdd63c07999a1f2296c68084130c7 WHIRLPOOL 98d2a92695c464cec8254f26738573e63929356e27ace9d27cb045edb78bdf37a6539043783bedbc3e0f624d47f80d8dcf9df2f2ba3c0ac371f2ca0f42407977
 DIST openvpn-2.1.4.tar.gz 863726 SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5 SHA512 f3845da8de3d777d0aa92dc272c6824043fd1363bf3cb92e61ceedea93fa2d9f96f4910afa3823d19423357a574e4ea7db29ade73a09197cca0f8efb05cfaf3c WHIRLPOOL 0aaa9b3a77e387f65612c180b31b49aa36745e37ce7998bfa68841f841a06e19ac98a0b4ea9d4a2cb361180b7e15a9503fa29d7bd026df8be5f68ac657a9c499
 DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00 SHA512 69725652c95d779371ded032db7efeb51d1287cc270e7c6e47dc06ae4b22438e6d6dd7b6d9fc41b9c2315b83eebcd28ca83df47b3f0f3a2f3d7b1aeba9524802 WHIRLPOOL 1a04b5633df65ffb11fecc71c2dd25da2bd1f83114b3138b22b868b65cc7ac1cda5ca3b80c40e54cb32efc525a1c7458f4077b2c7965d646343b0a11cc6ecf91
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index 97b217de680b..ecd2f2c8177f 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.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/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.13 2012/08/23 03:49:47 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.14 2012/08/23 17:15:24 grobian Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
 
 DEPEND=">=dev-libs/lzo-1.07
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 48906f53c22c..789a0bee1c40 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -4,5 +4,6 @@
  <herd>base-system</herd>
 <use>
  <flag name='ntlm'>Enable support for NTLM (Windows-based) authorization</flag>
+ <flag name='uuid'>Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/wget/wget-1.14.ebuild b/net-misc/wget/wget-1.14.ebuild
index 6d133fd0d15a..b172e7b909e7 100644
--- a/net-misc/wget/wget-1.14.ebuild
+++ b/net-misc/wget/wget-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14.ebuild,v 1.1 2012/08/06 19:43:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.14.ebuild,v 1.2 2012/08/23 18:14:40 vapier Exp $
 
 EAPI="4"
 
@@ -13,13 +13,16 @@ SRC_URI="mirror://gnu/wget/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 nls ntlm +ssl static"
+IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static uuid zlib"
 
 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls[static-libs(+)] )
 		!gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] )
-	)"
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
@@ -46,6 +49,9 @@ src_configure() {
 	# the configure script contains a few hacks to workaround openssl
 	# build limitations.  disable those, and use openssl's pkg-config.
 	eval export ac_cv_lib_{z_compress,dl_{dlopen,shl_load}}=no
+	# some libraries tests lack configure options :( #432468
+	eval export ac_cv_{header_pcre_h,lib_pcre_pcre_compile}=$(usex pcre)
+	eval export ac_cv_{header_uuid_uuid_h,lib_uuid_uuid_generate}=$(usex uuid)
 
 	if use static ; then
 		append-ldflags -static
@@ -61,7 +67,8 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable nls) \
 		$(use_enable ntlm) \
-		$(use_enable debug)
+		$(use_enable debug) \
+		$(use_with zlib)
 }
 
 src_install() {
diff --git a/net-print/cups-filters/cups-filters-1.0.23.ebuild b/net-print/cups-filters/cups-filters-1.0.23-r1.ebuild
similarity index 94%
rename from net-print/cups-filters/cups-filters-1.0.23.ebuild
rename to net-print/cups-filters/cups-filters-1.0.23-r1.ebuild
index 9f41e5204751..a6141507a0b4 100644
--- a/net-print/cups-filters/cups-filters-1.0.23.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.23-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-print/cups-filters/cups-filters-1.0.23.ebuild,v 1.2 2012/08/23 00:14:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.23-r1.ebuild,v 1.1 2012/08/23 21:18:15 dilfridge Exp $
 
 EAPI=4
 
@@ -52,6 +52,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
 		--enable-imagefilters \
 		$(use_with jpeg) \
 		$(use_with png) \
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 892c66c9c273..93905205855e 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-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-print/cups-filters/cups-filters-9999.ebuild,v 1.24 2012/08/21 14:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.26 2012/08/23 21:18:14 dilfridge Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~mips ~x86"
+	KEYWORDS="~amd64 ~hppa ~mips ~x86"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
@@ -52,6 +52,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
 		--enable-imagefilters \
 		$(use_with jpeg) \
 		$(use_with png) \
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
index 9219b4fd8cbf..af558844a497 100644
--- a/net-print/lprng/Manifest
+++ b/net-print/lprng/Manifest
@@ -1,2 +1,2 @@
-DIST LPRng-3.8.28.tgz 10212500 RMD160 f0460d7fa7d1ea0ce6b49fcb656905fdda3d0d41 SHA1 f4373004adb1439819600701bb98517137daf1fc SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d
-DIST LPRng-3.8.35.tgz 12512453 RMD160 d7a9f2ce94a52227a205e6849268f4195bd230ef SHA1 374bdd28245e015b85e59b20c2b0cdb490127b54 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37
+DIST LPRng-3.8.28.tgz 10212500 SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d
+DIST LPRng-3.8.35.tgz 12512453 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37
diff --git a/net-print/lprng/files/lprng-init b/net-print/lprng/files/lprng-init
index fd4bb40ad00a..01ec7995bb56 100644
--- a/net-print/lprng/files/lprng-init
+++ b/net-print/lprng/files/lprng-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/files/lprng-init,v 1.4 2004/07/15 00:22:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/files/lprng-init,v 1.5 2012/08/23 20:23:41 dilfridge Exp $
 
 depend() {
 	need net
@@ -28,12 +28,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting lpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lpd
+	start-stop-daemon --start --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping lpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/lpd
+	start-stop-daemon --stop --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
 	eend $?
 }
diff --git a/net-print/lprng/lprng-3.8.35.ebuild b/net-print/lprng/lprng-3.8.35-r1.ebuild
similarity index 94%
rename from net-print/lprng/lprng-3.8.35.ebuild
rename to net-print/lprng/lprng-3.8.35-r1.ebuild
index 5b59daba87e2..bc9681c9804f 100644
--- a/net-print/lprng/lprng-3.8.35.ebuild
+++ b/net-print/lprng/lprng-3.8.35-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-print/lprng/lprng-3.8.35.ebuild,v 1.2 2012/02/05 13:58:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.35-r1.ebuild,v 1.1 2012/08/23 20:23:41 dilfridge Exp $
 
 EAPI=4
 
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index e320e091a66b..a2017aa7d1ca 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -221,3 +221,7 @@ wayland
 # Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012)
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
+
+# Michael Sterrett <mr_bones_@gentoo.org) (24 Aug 2012)
+# media-sound/fluidsynth isn't keyworded
+fluidsynth
diff --git a/profiles/arch/m68k/package.mask b/profiles/arch/m68k/package.mask
deleted file mode 100644
index ea0b87912b72..000000000000
--- a/profiles/arch/m68k/package.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/m68k/package.mask,v 1.3 2011/08/09 03:02:22 zmedico Exp $
-
-# We currently have the required glibc masked
-sys-apps/openrc
->=sys-apps/baselayout-2
--<sys-devel/binutils-2.18-r1
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 9b55639b592e..cf383ddfd608 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.56 2012/07/18 12:48:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.57 2012/08/24 06:38:38 mr_bones_ Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -mips
@@ -361,6 +361,10 @@ d3d
 # mask wayland since dev-libs/wayland isn't keyworded
 wayland
 
+# Michael Sterrett <mr_bones_@gentoo.org) (24 Aug 2012)
+# media-sound/fluidsynth isn't keyworded
+fluidsynth
+
 # Mips USE flags
 -n32
 -n64
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index c525607372ae..e7eab623660e 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.91 2012/08/19 15:50:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.92 2012/08/24 06:38:38 mr_bones_ Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
@@ -170,8 +170,6 @@ java
 java-internal
 java-external
 lirc
-mod
-modplug
 mpm-peruser
 mythtv
 netbeans
diff --git a/profiles/package.mask b/profiles/package.mask
index 0f0537617c67..0bfceea09073 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14069 2012/08/22 23:42:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14070 2012/08/23 19:23:59 floppym 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,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (23 Aug 2012)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-23
+>=www-client/google-chrome-23
+
+# Mike Gilbert <floppym@gentoo.org> (23 Aug 2012)
+# Mask v8 versions used for www-client/chromium dev channel releases.
+>=dev-lang/v8-3.13
+
 # Julian Ospald <hasufell@gentoo.org> (19 Aug 2012)
 # Masked for removal in 30 days
 # games-strategy/megaglest supersedes games-strategy/glest
@@ -173,13 +183,6 @@ dev-ruby/mail:0
 # binary package in his overlay. (layman -a xmw)
 =app-misc/jbidwatcher-1*
 
-# Mike Gilbert <floppym@gentoo.org> (09 Jul 2012)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-22
->=www-client/google-chrome-22
->=dev-lang/nacl-toolchain-newlib-0_p9093
-
 # Diego Elio Pettenò <flameeyes@gentoo.org> (08 Jul 2012)
 # Dead upstream (domain is gone as well), very bad code.
 # If possible use net-ftp/tftp-hpa; if that is not possible, we're
@@ -219,10 +222,6 @@ dev-python/sexy-python
 # dead on upstream, fails on gcc-4.7
 =media-plugins/vdr-cdda-0.1.0-r1
 
-# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
-# Mask v8 versions used for www-client/chromium dev channel releases.
->=dev-lang/v8-3.12
-
 # Michael Weber <xmw@gentoo.org> (29 Jun 2012)
 # Masking for security reasons (bug 424025, CVE-2012-3366)
 # Users of trigger plugin, update asap.
diff --git a/profiles/updates/3Q-2012 b/profiles/updates/3Q-2012
index bdf96b399ef1..ebfda1caec56 100644
--- a/profiles/updates/3Q-2012
+++ b/profiles/updates/3Q-2012
@@ -38,3 +38,5 @@ move net-wireless/iwl6000-ucode sys-firmware/iwl6000-ucode
 move net-wireless/iwl6005-ucode sys-firmware/iwl6005-ucode
 move net-wireless/iwl6030-ucode sys-firmware/iwl6030-ucode
 move net-wireless/iwl6050-ucode sys-firmware/iwl6050-ucode
+move net-analyzer/nagios-nsca net-analyzer/nsca
+move net-analyzer/nagios-nrpe net-analyzer/nrpe
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 602aed264aa5..9932b8e18e82 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1822,6 +1822,7 @@ dev-vcs/git:blksha1 - Use the new optimized SHA1 implementation.
 dev-vcs/git:cgi - Install gitweb too
 dev-vcs/git:gpg - Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!
 dev-vcs/git:gtk - Include the gitview contrib tool.
+dev-vcs/git:highlight - GitWeb support for app-text/highlight.
 dev-vcs/git:mozsha1 - Makes git use an optimized SHA1 routine from Mozilla that should be fast on non-x86 machines.
 dev-vcs/git:ppcsha1 - Make use of a bundled routine that is optimized for the PPC arch.
 dev-vcs/git:subversion - Include git-svn for dev-vcs/subversion support.
@@ -3529,15 +3530,16 @@ net-analyzer/munin:postgres - Install the packages required for monitoring Postg
 net-analyzer/munin:syslog - Configure the node by default to log on syslog. This requires the presence of virtual/perl-Sys-Syslog. As of version 2.0.2, the master scripts only log to file, and not to syslog.
 net-analyzer/nagios-core:lighttpd - install www-servers/lighttpd config
 net-analyzer/nagios-core:web - enable web interface
-net-analyzer/nagios-nrpe:command-args - allow clients to specify command arguments
-net-analyzer/nagios-nsca:crypt - Build support for crypted communication with nsca, through dev-libs/mcrypt. It's recommended not to disable this flag unless all the communication will be handled in an absolutely safe environment.
 net-analyzer/nagios-plugins:jabber - Install the script for sending IM notifications over Jabber with Nagios.
 net-analyzer/nagios-plugins:nagios-dns - Install net-dns/bind-tools required for monitoring DNS servers. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:nagios-game - Install games-util/qstat required for monitoring FPS servers. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:nagios-ntp - Install net-misc/ntp required for monitoring NTP servers and drifts. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:nagios-ping - Install net-analyzer/fping required for fancy ping monitoring. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:nagios-ssh - Install net-misc/openssh required for monitoring SSH servers. Disabling the flag does not remove any plugin file.
+net-analyzer/nagios-plugins:smart - Install sys-apps/smartmontools required for S.M.A.R.T. disk monitoring. Disabling the flag removes the plugin file. This plugin also requires the sudo flag to be enable.
 net-analyzer/nagios-plugins:snmp - Install dev-perl/Net-SNMP required for monitoring SNMP values. Disabling the flag does not remove any plugin file.
+net-analyzer/nagios-plugins:sudo - Install a file to allow the nagios user to execute some commands via app-admin/sudo, so that the scripts can access devices and features that wouldn't be otherwise allowed by nagios.
+net-analyzer/nagios-plugins:suid - Give root privileges to the ICMP, DHCP and IDE S.M.A.R.T. check binaries. This allows them to ignore the access controls that would disallow the nagios user from running the check.
 net-analyzer/nagios-plugins:ups - Install sys-power/nut required for monitoring compatible UPS units. Disabling the flag does not remove any plugin file.
 net-analyzer/nagvis:automap - Enable automated map generation using media-gfx/graphviz
 net-analyzer/ncrack:ssh - Compile and link against the internal openssh modified library.
@@ -3557,6 +3559,10 @@ net-analyzer/nmap:ncat - Install the ncat utility
 net-analyzer/nmap:ndiff - Install the ndiff utility
 net-analyzer/nmap:nmap-update - Install nmap-update, which uses dev-vcs/subversion to update nmap scripts in your home directory
 net-analyzer/nmap:nping - Install the nping utility
+net-analyzer/nrpe:command-args - Build support for specifying the command-line arguments from the Nagios/Icinga master. Make sure you understand the implications of this flag as it can be a security risk.
+net-analyzer/nrpe:minimal - Only build the check plugins for Nagios/Icinga, and not the daemon.
+net-analyzer/nsca:crypt - Build support for crypted communication with nsca, through dev-libs/mcrypt. It's recommended not to disable this flag unless all the communication will be handled in an absolutely safe environment.
+net-analyzer/nsca:minimal - Only build and install the send_nsca command and not the daemon. This allows a very minimal install with no overhead when setting up a node.
 net-analyzer/pchar:pcap - Use the net-libs/libpcap library
 net-analyzer/pmacct:64bit - Use 64bit counters instead of 32bit ones
 net-analyzer/pmacct:ulog - Enable ULOG support
@@ -4498,6 +4504,7 @@ net-misc/vino:telepathy - Enable desktop sharing through a telepathy client
 net-misc/vpnc:hybrid-auth - Enable hybrid authentication (certificates), only if not redistributed as compiled binary
 net-misc/vpnc:resolvconf - Enable support for DNS managing framework net-dns/openresolv
 net-misc/wget:ntlm - Enable support for NTLM (Windows-based) authorization
+net-misc/wget:uuid - Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)
 net-misc/wicd:ambiance - Install icons from Ubuntu's ambiance theme
 net-misc/wicd:gtk - Installs a gtk UI. This is enabled by default because it is intended behavior. Requires dev-python/pygtk
 net-misc/wicd:ioctl - Installs additional python libraries to use as a backend. This will improve speed but is experimental.
diff --git a/sys-apps/baselayout/baselayout-2.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.1-r1.ebuild
index d3e4569b39ad..317b0026dd35 100644
--- a/sys-apps/baselayout/baselayout-2.1-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1-r1.ebuild,v 1.10 2012/06/17 18:15:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1-r1.ebuild,v 1.11 2012/08/23 21:47:35 vapier Exp $
 
 inherit eutils multilib
 
@@ -85,6 +85,7 @@ multilib_layout() {
 				mkdir -p "${prefix}" || die
 				rm -f "${prefix}lib" || die
 				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
 			fi
 		else
 			# we need to make sure "lib" is a dir
diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild
index 633a4a76b3fd..2e925134a603 100644
--- a/sys-apps/baselayout/baselayout-2.2.ebuild
+++ b/sys-apps/baselayout/baselayout-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/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.1 2012/08/20 20:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.2 2012/08/23 21:47:35 vapier Exp $
 
 inherit eutils multilib
 
@@ -85,6 +85,7 @@ multilib_layout() {
 				mkdir -p "${prefix}" || die
 				rm -f "${prefix}lib" || die
 				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
 			fi
 		else
 			# we need to make sure "lib" is a dir
diff --git a/sys-apps/coreutils/coreutils-8.16.ebuild b/sys-apps/coreutils/coreutils-8.16.ebuild
index 003fb6c00ff0..b405970b0c7e 100644
--- a/sys-apps/coreutils/coreutils-8.16.ebuild
+++ b/sys-apps/coreutils/coreutils-8.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/sys-apps/coreutils/coreutils-8.16.ebuild,v 1.5 2012/08/20 02:51:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.16.ebuild,v 1.6 2012/08/23 21:08:56 maekke Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu-alpha/coreutils/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="acl caps gmp nls selinux static unicode vanilla xattr"
 
 RDEPEND="caps? ( sys-libs/libcap )
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 11ca20d3936a..a4393640959a 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,4 +1,4 @@
-DIST dosfstools-3.0.10.tar.bz2 69718 SHA256 c8f6155c329c90e6bffdb339d702301316aeb6b365d95dcebd1cdc9968ad9162
-DIST dosfstools-3.0.11.tar.bz2 70039 SHA256 94b27a0f53f4aa86b0c049eb26df7a681ec6c31bc352c57d3ac53881bcfcd9a8
-DIST dosfstools-3.0.12.tar.gz 82117 SHA256 5ee889083baf755ae54b9fcfdce30c3dab8038652bd8acc6f2b7382c5fe261e4
+DIST dosfstools-3.0.10.tar.bz2 69718 SHA256 c8f6155c329c90e6bffdb339d702301316aeb6b365d95dcebd1cdc9968ad9162 SHA512 72899d1d2dd94913ba38c7f3e5c4f25801c47e61a61fca88928dd3e08eec89aa599ab49748abaddc2841d893df3cc5e996de5e514d7945d4bc25eee66fca9b0c WHIRLPOOL bef2e6f6df97f4ad9801d8d00de488672720c505714b36d3efcb56ef1eac2afcd31a2068ca8b24090e764e3e79d7e26207fdb58792c0191f9c2e5851006a15cf
+DIST dosfstools-3.0.11.tar.bz2 70039 SHA256 94b27a0f53f4aa86b0c049eb26df7a681ec6c31bc352c57d3ac53881bcfcd9a8 SHA512 e65154218d1b0374334ee1c23022c833440d840d87ca3f81202149d200643755181f0ae13830a5c6c4f5739041f549dd49cbf5464ec68bb65c211975e18f2df7 WHIRLPOOL 65f67ca69f6177e928a85a2acbcc47e1019f1d1b86ca0da56af0cdb06c11b7e50d6371d6c0d5f15ea24ebb141c0c5012b0bac22c0e5d26f753e44574e3cff911
+DIST dosfstools-3.0.12.tar.gz 82117 SHA256 5ee889083baf755ae54b9fcfdce30c3dab8038652bd8acc6f2b7382c5fe261e4 SHA512 14e58cbc0fa8eb6a4b0e8184d8331b01c524a3522c6d3cafa1b8d63b8d076adad71ae65930cd8632ba56d8f9b633a3dd3c8a0bbab32e2937759ce8bf1bb21903 WHIRLPOOL e8d38c19b0731ba228318199f57f2dd9fdb0f467bd2bd34637b412bd2d5eef5a4c898ad0efccab233ebd507e0754b06f596497e79409d101576bd7a125adecb4
 DIST dosfstools-3.0.9.tar.bz2 69186 SHA256 3f63676faeac507e909d84c8920ddb6597da1eb688577c2fc9c756b821d0458f SHA512 d552e9065a5e9315542969eded9872c44c17fd5f3ec901c1341a67040156b2f8288ceb1a940fd91a317ebcf8b48929ce5a5ca32dfe2e7fc8f67b91db2a95c031 WHIRLPOOL 0a26a6d2ff3954ab01a9424f9a384b1f0b670d15c4da9507c0b3e56777e108acceb37d9da47f2fcf25d72788136892911fd30e53cbf2cb13499e9a5fd3085e7a
diff --git a/sys-fs/dosfstools/dosfstools-3.0.12.ebuild b/sys-fs/dosfstools/dosfstools-3.0.12.ebuild
index 8cbe62f195e1..d76eab731365 100644
--- a/sys-fs/dosfstools/dosfstools-3.0.12.ebuild
+++ b/sys-fs/dosfstools/dosfstools-3.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.12.ebuild,v 1.4 2012/08/23 09:02:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.12.ebuild,v 1.7 2012/08/23 21:39:24 vapier Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.daniel-baumann.ch/software/dosfstools/${P}.tar.bz2 -> ${P}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test" # there is no test target #239071
 
@@ -31,4 +31,5 @@ src_install() {
 	dodir /sbin
 	mv "${ED}"/usr/sbin/*fsck* "${ED}"/sbin/ || die
 	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+	prepalldocs
 }
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index afdd0c2873a4..55acaf7f4911 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -23,4 +23,6 @@ DIST patch-3.4.5.bz2 135853 SHA256 c94b8da9442361942a148316d64a26186c994ab0daf76
 DIST patch-3.5-vs2.3.4.diff 740317 SHA256 e8d5ae3b16c814b56600a2400500ec6102baa7f0264d93db0f7ecdb53209b530 SHA512 089bbf6b877ab0b2d51726c1b07c3bae534b946f7f80bfff3cef19b33d6fb45c64d8f763280cab2f9cf68894fecae616e99e994c260c009b5c50776d7ac707f0 WHIRLPOOL 3940ab58b420017e01c66a274effd88cbce5d9ea447c0d44d210d108fdb526d074d3494f73648e93c39b58c11a9bcfdd60666ae28bfbff0e0bfa77b6b210a998
 DIST patch-3.5.1-vs2.3.4.1.diff 745223 SHA256 0670a6a217cb2e5e55698de2d4e942b4fbab2d4faade872a0ca596f4820dc640 SHA512 512d8ea03c02a616fc439393caf30f5ee324edb036fad100d4175be1fd52dcb5e521b3a58b4668715a67d155842f687d27e2c988beba1fc51c36f9fa98c6aa36 WHIRLPOOL c43c7593007a8fcfe9c07e182611684f9f3f7046d95462f2fac9267445bbee40a6b92db44c679fbcd296513e67dfa570370f0807624af696402413c4022a9389
 DIST patch-3.5.1.bz2 47421 SHA256 b2c0e70346981e23b0d2e8fbdf66536837a144b0e2eef3db88fdb47f453a2377 SHA512 75cd1862b2aa9f0e90165c3b129c12061c13624bc20da99b0d80be0e23cabc03ddfb0b792b8829f4ecfcd2cec43f42fdd1e34e644b4cb42ac9cae2e80e9d40e1 WHIRLPOOL e0fad71553b8de5cdd46c6abff1d5cfec637ff6272398cc71c105d0a816763596e5bcf6be70649779dbb7fe038214576722ec26b50b1c24499136943a47c18da
+DIST patch-3.5.2-vs2.3.4.1.diff 745223 SHA256 08ee580c8b8331f85b5c68598b4a8fe40f0b90dfd234fb967b1dd26c3f163fed SHA512 a6eac10ad9a4b6a954610573d842f76d3d9ab0da63a1c472f9cf109a83e4393aad616df9af96dfe1ad845c310e3af480558987c05644d1c3ee23e5d6c88d8903 WHIRLPOOL ff18dfbd1de26956edb436e2618f5a4a4d25452c56eed336160fbf5d0dd1d01a9d9be4ab8fdd42a9cdeb1ba353ed855bd6d2200ab3e3683013f45439fed95ec5
+DIST patch-3.5.2.bz2 73571 SHA256 7de1c37d552ccc8b2e5fa29bbff5f85d9402fcd90c6dd42a1928949b6f9eb7f8 SHA512 4d9c76c07dcee5294cbe64a6849598e4cfb8b94754318f12139346ebce5daca446f06e2f0182fa19df73ef132df787e739316a6bb99ef58bae29d0482fcd8288 WHIRLPOOL b016b49724e1fca09a93b092cdc40ed062efb9f4ab7bf2fe02308951b867fd851cfd31667157cb4cc9eb913afa04b54cddc641dce5638e4a840f8b6e3dab6eff
 DIST vserver-patches-2.6.35_2.3.0.36.32.tar.bz2 139594 SHA256 4cc1ba13d6bb1491d48e53590a8abb2c0e3f2eb8f560ab74800c6cde9bf74b12
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.4.1-r1.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.4.1-r1.ebuild
new file mode 100644
index 000000000000..962cb3ca0205
--- /dev/null
+++ b/sys-kernel/vserver-sources/vserver-sources-2.3.4.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.4.1-r1.ebuild,v 1.1 2012/08/24 03:30:34 patrick Exp $
+
+ETYPE="sources"
+CKV="3.5.2"
+
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
+
+inherit kernel-2
+detect_version
+
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
+HOMEPAGE="http://www.gentoo.org/proj/en/vps/"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
+
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 16f5a3ddb164..73d1ecf89190 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,4 @@
 DIST chromium-21.0.1180.57.tar.bz2 192416785 SHA256 311ba95249ea994747355596885c9ad583e55bcbe7220a47ea096898e7aeb145 SHA512 7ae15bc00c9c215694cbe7aafeade34f295c669c9945f9e59804f7faf591ff717bb1dccf3c45334924d672366e1e3d7b8e30640f87cf5a016a97f3cb8314e9b1 WHIRLPOOL cfc82517caaccafbc2a208ab46b4e91135aae07e42273e8d0e7af941fecb2e0b3de7b64c96a41ab0f7c7ec7438ec97b61cf5180792960ba466d00329e3a43e54
-DIST chromium-21.0.1180.77.tar.bz2 192601532 SHA256 68b4485ed479602c544a7481367dc367d4ad816c65f4ff8a8927e39b10e9dc8d SHA512 4b8ff073e0266c15b44e2df06157a4e4acee12b2dcf6efa093d3b5441c010a09c3a406e0f7b66890a37f8dbd1446da968afa4b7ead07471069128e9c068c9361 WHIRLPOOL 05f183b2bc85a68deedf720a4a7503cd8f801a0695dbaf14dce152264b02cb7d94c7ddb52a02b304c958d5df107e53adbeddf7c58f26a633cfc646c1ec27af93
 DIST chromium-21.0.1180.81.tar.bz2 192602548 SHA256 f436e0383ee2a52b483ed4074d3ad067a51745545e159dfe32a4f77ededfbaac SHA512 7bf271fc7398cdcc12874f6aa226f35569bcc9d1721c6b17578efa9726135392fe6dc77c4d93c8b9064bd46b3f930b70dcfdce3f43bb2b2cadb919dc25d1f923 WHIRLPOOL f8ec4aeac24cdb9b68b030998c242a655a222041f36fbdc0ee0932a0a0a801ad25d2f8fbfc0a6a41763dba6b438aa4ada505111f9d55651930ac63d0e00a45f0
 DIST chromium-22.0.1229.12.tar.bz2 209869596 SHA256 09b5d0b5bc7c1951cc84ceb5a2a1ea6556aabdc9517e3f872979c6e5dd217bc1 SHA512 6672f7112c3c567b9f4c40e3df86eda5cad19498cdc20f58d4d9848c0ec7881574f1f1e6cf75421fa19fdc1afd390e618d9b32b2852c7b22fec578a8fa64d2d7 WHIRLPOOL c977157ed457db27cecc02e317785a8e1f8327e833e733a75c9673f214cc1f8e14c379bbe251864d926e283b85b9ee4f4573f0afe7f9c953967b82cb9969f465
-DIST chromium-22.0.1229.8.tar.bz2 209881553 SHA256 804f7459b068714eb45b492f56af452c83359c88b91a7f50f16483b671254a3d SHA512 13d4d2fd4f4fb9709139d27cb031954c86f9e774408feacc8342403b73ce009d59795d01b47af240b4e4300b0bc5122a2bb6474e732f842553edd711a8b828bc WHIRLPOOL c1f1c972d631626162b561bfc4758e5b09e0f7ccdc0ee589bbd7ee28317cbdc92ea2eb6b634228da70dfd3b0cde7cf753863b4f89b9f8598be48b9dcfcb9db1f
+DIST chromium-22.0.1229.14.tar.bz2 209857785 SHA256 c53635bba0332a3dfc12c7c06b40e64b64ecd3b97660ad955e83905203e3e587 SHA512 38c232f100bf95038fcab27e9913822dcd9189f1aea9aedbd0b034e10005ecdc2e116aa160dc1e07cf25f21b39a5e6ee4f837d9d10d9f7a012736f77f1d0301b WHIRLPOOL 789aa423d8718f5c9c8b74927e72092af55e41992ed12cf7f209f6e775f07f9bcdc63224cbe6215d947447075b7f8ab3bf45831f882ca3aa8fd1734f6a624c28
diff --git a/www-client/chromium/chromium-21.0.1180.77-r1.ebuild b/www-client/chromium/chromium-21.0.1180.77-r1.ebuild
deleted file mode 100644
index 6b005529bc9c..000000000000
--- a/www-client/chromium/chromium-21.0.1180.77-r1.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.77-r1.ebuild,v 1.2 2012/08/13 10:22:21 phajdan.jr Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
-
-RDEPEND="app-arch/bzip2
-	cups? (
-		dev-libs/libgcrypt
-		>=net-print/cups-1.3.11
-	)
-	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat
-	>=dev-libs/icu-49.1.1-r1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng
-	>=media-libs/libwebp-0.2.0_rc1
-	media-libs/speex
-	pulseaudio? ( media-sound/pulseaudio )
-	sys-fs/udev
-	sys-libs/zlib
-	virtual/libusb:1
-	x11-libs/gtk+:2
-	x11-libs/libXinerama
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p7311
-	dev-lang/perl
-	dev-lang/yasm
-	dev-python/ply
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	if ! use selinux; then
-		chromium_suid_sandbox_check_kernel_config
-	fi
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
-
-	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
-	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
-
-	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
-	# Bug 427438.
-	epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jsoncpp/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/libusb.h' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/scons-2.0.1/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/v8-i18n/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webgl_conformance/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	local v8_bundled="$(chromium_bundled_v8_version)"
-	local v8_installed="$(chromium_installed_v8_version)"
-	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable tcmalloc, it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	myconf+=" -Ddisable_glibc=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_vpx
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use selinux selinux)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1"
-
-	if ! use selinux; then
-		# Enable SUID sandbox.
-		myconf+="
-			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	if ! use bindist; then
-		# Enable H.624 support in bundled ffmpeg.
-		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
-	fi
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-	fi
-
-	egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local test_targets
-	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local make_targets="chrome chromedriver"
-	if ! use selinux; then
-		make_targets+=" chrome_sandbox"
-	fi
-	if use test; then
-		make_targets+=$test_targets
-	fi
-
-	# See bug #410883 for more info about the .host mess.
-	emake ${make_targets} BUILDTYPE=Release V=1 \
-		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
-		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
-		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
-		AR.host="$(tc-getAR)" || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	if ! use selinux; then
-		doexe out/Release/chrome_sandbox || die
-		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	fi
-
-	doexe out/Release/chromedriver || die
-
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-	fi
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-21.0.1180.77.ebuild b/www-client/chromium/chromium-21.0.1180.77.ebuild
deleted file mode 100644
index c27172e348d2..000000000000
--- a/www-client/chromium/chromium-21.0.1180.77.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1180.77.ebuild,v 1.1 2012/08/10 03:30:56 floppym Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
-
-RDEPEND="app-arch/bzip2
-	cups? (
-		dev-libs/libgcrypt
-		>=net-print/cups-1.3.11
-	)
-	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
-	dev-libs/elfutils
-	dev-libs/expat
-	>=dev-libs/icu-49.1.1-r1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng
-	media-libs/speex
-	pulseaudio? ( media-sound/pulseaudio )
-	sys-fs/udev
-	sys-libs/zlib
-	virtual/libusb:1
-	x11-libs/gtk+:2
-	x11-libs/libXinerama
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p7311
-	dev-lang/perl
-	dev-lang/yasm
-	dev-python/ply
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	if ! use selinux; then
-		chromium_suid_sandbox_check_kernel_config
-	fi
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
-
-	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
-	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
-
-	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
-	# Bug 427438.
-	epatch "${FILESDIR}/${PN}-bison-2.6-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jsoncpp/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/libusb.h' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/libwebp/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/scons-2.0.1/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/v8-i18n/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webgl_conformance/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	local v8_bundled="$(chromium_bundled_v8_version)"
-	local v8_installed="$(chromium_installed_v8_version)"
-	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable tcmalloc, it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	myconf+=" -Ddisable_glibc=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_vpx
-	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
-	#	   needs to become part of webp release)
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libusb=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use selinux selinux)"
-
-	if ! use selinux; then
-		# Enable SUID sandbox.
-		myconf+="
-			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	if ! use bindist; then
-		# Enable H.624 support in bundled ffmpeg.
-		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
-	fi
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-	fi
-
-	egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local test_targets
-	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local make_targets="chrome chromedriver"
-	if ! use selinux; then
-		make_targets+=" chrome_sandbox"
-	fi
-	if use test; then
-		make_targets+=$test_targets
-	fi
-
-	# See bug #410883 for more info about the .host mess.
-	emake ${make_targets} BUILDTYPE=Release V=1 \
-		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
-		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
-		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
-		AR.host="$(tc-getAR)" || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	if ! use selinux; then
-		doexe out/Release/chrome_sandbox || die
-		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	fi
-
-	doexe out/Release/chromedriver || die
-
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-	fi
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-22.0.1229.8.ebuild b/www-client/chromium/chromium-22.0.1229.14.ebuild
similarity index 99%
rename from www-client/chromium/chromium-22.0.1229.8.ebuild
rename to www-client/chromium/chromium-22.0.1229.14.ebuild
index 018ae378c719..594424b2b2d5 100644
--- a/www-client/chromium/chromium-22.0.1229.8.ebuild
+++ b/www-client/chromium/chromium-22.0.1229.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/www-client/chromium/chromium-22.0.1229.8.ebuild,v 1.1 2012/08/17 19:52:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.14.ebuild,v 1.1 2012/08/23 19:20:30 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 38994574b92a..78d157f71568 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_21.0.1180.81-r151980_amd64.deb 33969630 SHA256 13913c7af8fae251a1e85c21aafc9226176ede82cc944bbc2951c058634b0041 SHA512 74f027d66e2499248bc3188dd1f459ec0259b17564d968ace509edb77c7d5b1614bca95439b3c174cf1393acbbeba25b259adec38998a0c8f3c35e26f56fe5c5 WHIRLPOOL 29d07a8cc247d8eeaf54d153d8fc7047374902fdaf5a95a147eed0b5a14d0e3f363e425f40eb4d7855a1cdff58612335964ef75ef9170f54bcf2570166d1da34
-DIST google-chrome-beta_21.0.1180.81-r151980_i386.deb 32346974 SHA256 b792a0c56cd44f1e312fad2cd28758d1445e30c822400b978a9fc0603e680f16 SHA512 83536ef5a7ae936d8b9c47a15677916e54a2aa2381ef4148fa1c81c3adceb669b3c475c01aa466828f064af26ece833f5d63df1e333793aa7ebee86a15036a20 WHIRLPOOL 07e6bc30627391a05312952ca8677ddf42bd1575d5a4ae134e7ced642ce06fe5f0eb436d4602162f89a3291da22d0ef0ba7f3e5d0d722cc0b4a7a62c5b3d876f
+DIST google-chrome-beta_22.0.1229.14-r152690_amd64.deb 34614668 SHA256 274d3d64e23c9956e93160f31f1ca6f54b231cc05ed9bb48d259e393b36dffc2 SHA512 cf12556b1af8ab7c11585f38e424fed107787022c5eb17ae8c792e1e2d47c638f08d052fb453fe6025c555d11f629666e1442d8e9055163706028c0224ff1891 WHIRLPOOL 755d88a93b0970017f2a3b45f89272f773e8a2a6788b5d97934e9161335c116def325a291fd1f71a4992677f9d706f168ed4c816a3ad84eec3f3b7f99b8d2f72
+DIST google-chrome-beta_22.0.1229.14-r152690_i386.deb 32943712 SHA256 041c871f25adc7943cf90aa858814ec0b7876eb1c884c1eddc97cadc7c4bf33d SHA512 3f533008af6ff64ceb1c674170a7c3c34144dd1126cfaba4b37cd21d29147a8017ee26538c4c6d27f2594f947d97d276aac2f10536779b0d69bfadaf2fc2bab3 WHIRLPOOL d3dc2ac6ff7ea4477577159a89e8081742c2fdf7943463c31fe2b93f07ee599434372fc4770a8f14a7ba4d71e16e66516537a73a4a7b2561dfb53e0747985a45
 DIST google-chrome-stable_21.0.1180.81-r151980_amd64.deb 33971570 SHA256 f5af9619e849ec4287f1cf57f8e9282e06e9ba35c863a5892dc081ffbcf82fc3 SHA512 43d2b183b0e736aaf91aed1b33452ba59cc6d7383937d92c78fc846c69b53e5686997a99b82bc9943a45ec718a3babff3dc39a883e03b5b9d581a69d60985311 WHIRLPOOL 3a0652cda96b2f1b97efacd8b2ec52bfafc8f8aea10ad8b6af2f24cd5f50b20ee9c603c5e456aac35abc7fc90ceffc90e02842cc13a7a34ea20714df05f79895
 DIST google-chrome-stable_21.0.1180.81-r151980_i386.deb 32345214 SHA256 607950769b3753dba79d3957a2d615f94d8785eaded98bb22384b81271f00f1e SHA512 531397c1936b82128f8d1263ce419e411749dbd762fe3e36d27ca0fbdf495080d53de557a0d0625d4f62f630b0dd807f7807142f74418b9a79e384fa1739f038 WHIRLPOOL 50f9ad96dbd032e3b90badd9153175249f3a9d55f5df5dddf26e578f0cfe6fac3729b0998de7b026a04762996cea0211fb226fdd1d44c37b375d1e9513e7f7be
 DIST google-chrome-unstable_22.0.1229.12-r152477_amd64.deb 34487638 SHA256 ef25a8a1c161498ec0286e5ec7c0985130792a096b6b9b80678bff4edfb169b3 SHA512 1043559ce0dcd0fc2a8c6d356bcd24d03dda65e08107afe261ec4adafa5ce7523653f4a2e3b4ee7a47970852abd63bee2e6e26ca0e1f15080a2a68b3e39c116b WHIRLPOOL b910150f3c8bf39ea914312337ffd7acc0dc53f887523dea0582e92e06a82c373d53b781ee9f2a4af1dd4873d7180e5f80afdd8bb8c900035830b597df1e6743
diff --git a/www-client/google-chrome/google-chrome-21.0.1180.81_beta151980.ebuild b/www-client/google-chrome/google-chrome-22.0.1229.14_beta152690.ebuild
similarity index 97%
rename from www-client/google-chrome/google-chrome-21.0.1180.81_beta151980.ebuild
rename to www-client/google-chrome/google-chrome-22.0.1229.14_beta152690.ebuild
index 53a6fd9c7027..7e06d780a604 100644
--- a/www-client/google-chrome/google-chrome-21.0.1180.81_beta151980.ebuild
+++ b/www-client/google-chrome/google-chrome-22.0.1229.14_beta152690.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-21.0.1180.81_beta151980.ebuild,v 1.1 2012/08/17 20:17:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-22.0.1229.14_beta152690.ebuild,v 1.1 2012/08/23 18:05:57 floppym Exp $
 
 EAPI="4"
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 6aefebde36d6..a3542ce65d76 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,2 +1,3 @@
-DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-DIST varnish-3.0.2.tar.gz 1977852 RMD160 6093839815ba72107fa2b52f0a198167a3a6b79b SHA1 906f1536cb7e728d18d9425677907ae723943df7 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
+DIST varnish-2.0.4.tar.gz 786945 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
+DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
+DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
new file mode 100644
index 000000000000..b492e3c080b6
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
@@ -0,0 +1,58 @@
+diff -Naur varnish-3.0.3.orig//configure.ac varnish-3.0.3/configure.ac
+--- varnish-3.0.3.orig//configure.ac	2012-08-20 05:20:40.000000000 -0400
++++ varnish-3.0.3/configure.ac	2012-08-23 15:58:15.000000000 -0400
+@@ -87,15 +87,20 @@
+ 
+ save_LIBS="${LIBS}"
+ LIBS=""
+-AC_SEARCH_LIBS(initscr, [curses ncurses],
+-	[have_curses=yes], [have_curses=no])
+-CURSES_LIBS="${LIBS}"
+-LIBS="${save_LIBS}"
+-AC_SUBST(CURSES_LIBS)
+-if test "$have_curses" = no; then
+-	AC_MSG_WARN([curses not found; some tools will not be built])
+-fi
+-AC_CHECK_HEADERS([ncurses/curses.h curses.h])
++AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools],
++            [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)]))
++
++AS_IF([test "x$with_tools" != "xno"], [
++  AC_SEARCH_LIBS(initscr, [curses ncurses],
++    [have_curses=yes], [have_curses=no])
++  CURSES_LIBS="${LIBS}"
++  LIBS="${save_LIBS}"
++  AC_SUBST(CURSES_LIBS)
++  if test "$have_curses" = no; then
++    AC_MSG_ERROR([curses not found, required to build additional tools])
++  fi
++  AC_CHECK_HEADERS([ncurses/curses.h curses.h])
++])
+ AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
+ 
+ save_LIBS="${LIBS}"
+@@ -147,17 +152,13 @@
+ AC_SUBST(PCRE_CFLAGS)
+ AC_SUBST(PCRE_LIBS)
+ 
+-PKG_CHECK_MODULES([LIBEDIT], [libedit], 
+-	[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
+-	[AC_CHECK_HEADERS([readline/readline.h])
+-	 AC_CHECK_HEADERS([edit/readline/readline.h])
+-	 AC_CHECK_LIB(edit, el_init,
+-	        [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])
+-		  LIBEDIT_CFLAGS=""
+-		  LIBEDIT_LIBS="-ledit ${CURSES_LIBS}"
+-		],
+-               [AC_MSG_WARN([libedit not found, disabling libedit support])],
+-               [${CURSES_LIBS}])])
++AC_ARG_WITH([libedit], AS_HELP_STRING([--with-libedit],
++            [Enable support for libedit in varnishadm (default: disabled)]))
++AS_IF([test "x$with_libedit" = "xyes"], [
++	PKG_CHECK_MODULES([LIBEDIT], [libedit],
++		[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
++		[AC_MSG_ERROR([libedit not found])])
++])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/www-servers/varnish/varnish-3.0.3.ebuild b/www-servers/varnish/varnish-3.0.3.ebuild
new file mode 100644
index 000000000000..c2e8ac5de738
--- /dev/null
+++ b/www-servers/varnish/varnish-3.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.3.ebuild,v 1.1 2012/08/23 20:59:46 blueness Exp $
+
+EAPI="4"
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="http://www.varnish-cache.org/"
+SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="doc libedit static-libs +tools"
+
+CDEPEND="dev-libs/libpcre
+	libedit? ( dev-libs/libedit )
+	tools? ( sys-libs/ncurses )"
+#varnish compiles stuff at run time
+RDEPEND="${CDEPEND}
+	sys-devel/gcc"
+DEPEND="${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+RESTRICT="test" #315725
+
+DOCS=( README doc/changes.rst )
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.3-automagic.patch )
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with libedit)
+		$(use_with tools)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newinitd "${FILESDIR}"/varnishd.initd varnishd
+	newconfd "${FILESDIR}"/varnishd.confd varnishd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/varnishd.logrotate" varnishd
+
+	dodir /var/log/varnish
+
+	use doc && dohtml -r "doc/sphinx/=build/html/"
+}
+
+pkg_postinst () {
+	elog "No demo-/sample-configfile is included in the distribution -"
+	elog "please read the man-page for more info."
+	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
+	elog "   /etc/conf.d/varnishd"
+}