diff --git a/app-admin/eselect-python/eselect-python-20091230.ebuild b/app-admin/eselect-python/eselect-python-20091230.ebuild
index c2ccfd0a2ade..13b74c62d703 100644
--- a/app-admin/eselect-python/eselect-python-20091230.ebuild
+++ b/app-admin/eselect-python/eselect-python-20091230.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20091230.ebuild,v 1.8 2010/02/13 16:35:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20091230.ebuild,v 1.9 2013/03/22 03:09:50 vapier Exp $
 
 EAPI="1"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-admin/eselect-python/eselect-python-20100321.ebuild b/app-admin/eselect-python/eselect-python-20100321.ebuild
index 0964b7b38508..7056c75a4c64 100644
--- a/app-admin/eselect-python/eselect-python-20100321.ebuild
+++ b/app-admin/eselect-python/eselect-python-20100321.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20100321.ebuild,v 1.6 2010/06/19 17:06:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20100321.ebuild,v 1.7 2013/03/22 03:09:50 vapier Exp $
 
 EAPI="1"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-admin/eselect-python/eselect-python-20111108.ebuild b/app-admin/eselect-python/eselect-python-20111108.ebuild
index bfe31c0279c2..3a004a360de8 100644
--- a/app-admin/eselect-python/eselect-python-20111108.ebuild
+++ b/app-admin/eselect-python/eselect-python-20111108.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20111108.ebuild,v 1.2 2012/04/26 14:53:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20111108.ebuild,v 1.3 2013/03/22 03:09:50 vapier Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/eselect-python/eselect-python-99999999.ebuild b/app-admin/eselect-python/eselect-python-99999999.ebuild
index 4111ba186633..7a210211a6af 100644
--- a/app-admin/eselect-python/eselect-python-99999999.ebuild
+++ b/app-admin/eselect-python/eselect-python-99999999.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.7 2012/04/26 14:53:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.9 2013/03/22 03:25:53 vapier Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
 
-ESVN_PROJECT="eselect-python"
-ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/eselect-python/trunk"
-
 if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools subversion
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+	inherit autotools git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="http://www.gentoo.org"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,9 +29,13 @@ else
 fi
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ -x configure ]] || eautoreconf
+	if [[ ${PV} == "99999999" ]] ; then
+		git-2_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${A}
+	fi
 }
 
 src_install() {
@@ -41,16 +43,10 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 }
 
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-20090804" || ! has_version "${CATEGORY}/${PN}"; then
-		run_eselect_python_update="1"
-	fi
-}
-
 pkg_postinst() {
-	if [[ "${run_eselect_python_update}" == "1" ]]; then
-		ebegin "Running \`eselect python update\`"
-		eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
-		eend "$?"
-	fi
+	local ret=0
+	ebegin "Running 'eselect python update'"
+	eselect python update --python2 --if-unset || ret=1
+	eselect python update --python3 --if-unset || ret=1
+	eend ${ret}
 }
diff --git a/app-admin/puppet/files/puppetmaster.init-r1 b/app-admin/puppet/files/puppetmaster.init-r1
new file mode 100644
index 000000000000..f665991b81a6
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init-r1
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+
+depend() {
+	need localmount
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
diff --git a/app-admin/puppet/puppet-3.1.1-r1.ebuild b/app-admin/puppet/puppet-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..b73c47f3a727
--- /dev/null
+++ b/app-admin/puppet/puppet-3.1.1-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r1.ebuild,v 1.1 2013/03/22 13:24:34 flameeyes Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ruby19"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/facter-1.6.2
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch b/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch
new file mode 100644
index 000000000000..163d49e6d3ff
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch
@@ -0,0 +1,11 @@
+--- libipulog/Makefile.in.orig	2013-03-20 19:18:05.000692936 +0400
++++ libipulog/Makefile.in	2013-03-20 19:18:12.987692835 +0400
+@@ -1,7 +1,7 @@
+ #
+ 
+ include @top_srcdir@/Rules.make
+-CFLAGS+=-Iinclude -I/usr/src/linux/include
++CFLAGS+=-Iinclude
+ 
+ libipulog.a: libipulog.o
+ 	$(LD) -i $< -o $@
diff --git a/app-admin/ulogd/ulogd-1.23-r1.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild
index ca00c6b5f43d..743997975bfb 100644
--- a/app-admin/ulogd/ulogd-1.23-r1.ebuild
+++ b/app-admin/ulogd/ulogd-1.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.9 2011/07/02 10:27:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.10 2013/03/21 09:07:11 pinkbyte Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,6 +25,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	EPATCH_OPTS="-F3" \
 		epatch "${WORKDIR}/${PN}-glsa-200701.patch"
+
+	# bug #285376
+	epatch "${FILESDIR}/${P}-fix-include-in-libipulog-Makefile.patch"
 }
 
 src_compile() {
diff --git a/app-admin/ulogd/ulogd-1.24-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild
index 14ca42b1aa21..fc77e9ae4432 100644
--- a/app-admin/ulogd/ulogd-1.24-r2.ebuild
+++ b/app-admin/ulogd/ulogd-1.24-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.6 2012/05/31 03:00:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.7 2013/03/21 09:07:11 pinkbyte Exp $
 
 EAPI="1"
 
@@ -48,6 +48,9 @@ src_unpack() {
 		sed -i -e 's/$(LD)/$(CC) -nostartfiles/' $f || die "failed to update $f"
 	done
 
+	# bug #285376
+	epatch "${FILESDIR}/${PN}-1.23-fix-include-in-libipulog-Makefile.patch"
+
 	eautoconf
 }
 
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index ada80c7051b1..f67f1396ec36 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -2,3 +2,4 @@ DIST phoronix-test-suite-2.8.1.tar.gz 465548 SHA256 395a21147c735b8e8b44294d9d54
 DIST phoronix-test-suite-3.2.1.tar.gz 399167 SHA256 b5c8d35ece50450e5b50e67d3f6bd67cb41821d5e181551a514344afa9b25962 SHA512 2f96e81212d920466ca1edb6f9f43ddc60b68519d62f6441c8c163b769c7bb87110eee47ee3370e010d0868a0fc23d01bdbed8c3a51e8f17d87b2e773f12e002 WHIRLPOOL 13f95c22c01350362b6cad71c411eb0f5a553fa897dc0f52c7ff00f9da824d27ec3430f0901204e2f5ec3fb963351f6e3045512f3cf1fac5ec1decab52e8062d
 DIST phoronix-test-suite-3.8.0.tar.gz 471257 SHA256 951ed041dcf06178b4eb92535b4a6d5c97d62415c85af0feb04a0db3cbb342fb SHA512 74c55145d9fd87c0463307c43f23dee5432193699cb665046b9ccc5c711cef89f9967ca1fa4c6ab236424621e14926e6b7b0e5692829d9efadb8fe3f722713dd WHIRLPOOL c2b94cfaf2b81ae5ec581f1b542c59cc38f37ea5e8aec220fc3aa762ba9e6ca0462290c8293365942d8f37a3262fc812965565778d368ee9c8ab2fc4f172c5da
 DIST phoronix-test-suite-4.0.1.tar.gz 492587 SHA256 2dd463dbaad8763b73170e94f4ecd3c9b9578ad5d3a67ca82855ab0509a5c90a SHA512 4f56edde1bf097d5f04edd5c7576df0403859e6a9c0b9d034381bb2c4a7a40ccd5e465af45ec523ebc5568052147f4770fdf449ae084c000fd4de6597005a4a7 WHIRLPOOL 7ce3f91d9f7282b4d158c81baac4e3e2794bdbdc33169d4741659169fcd4ba1b85784e365e9e4d9b106a541ee4f3a9eb44661c4fa55e973fe9ced6bc78dfa70c
+DIST phoronix-test-suite-4.2.0.tar.gz 499461 SHA256 48ee8ecf73702756c6787f686cf217d5c0ae216b7944b013bc86ab95e9c11912 SHA512 7f087b05738817f597cf4578fee93ca740ae5756ab150c48f141aade0157d63d0db941ab731b24977695df7d0a6c11f9cad20fd6539a3e7818c6d4f33cbe669e WHIRLPOOL 9edff49beebc30fd42208c909cc6ff6e08d84eb5cb8aea681715858fb178b0b16392d638232862d1f7a101134d9403c2fd0e00e3c95bb42098ccb55c9333a64d
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.2.0.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.2.0.ebuild
new file mode 100644
index 000000000000..acc59143d777
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.2.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.2.0.ebuild,v 1.1 2013/03/22 04:32:34 patrick Exp $
+
+EAPI=4
+
+inherit eutils bash-completion
+
+DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
+HOMEPAGE="http://www.phoronix-test-suite.com"
+SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+# php 5.3 doesn't have pcre and reflection useflags anymore
+RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
+	dev-php/pecl-ps"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
+		phoronix-test-suite
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+
+	doman documentation/man-pages/phoronix-test-suite.1
+	dodoc AUTHORS CHANGE-LOG
+	dohtml -r documentation/
+	doicon pts-core/static/images/phoronix-test-suite.png
+	doicon pts-core/static/images/openbenchmarking.png
+	domenu pts-core/static/phoronix-test-suite.desktop
+	rm -f pts-core/static/phoronix-test-suite.desktop
+
+	doins -r pts-core
+	exeinto /usr/bin
+	doexe phoronix-test-suite
+
+	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
+	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
+
+	dobashcompletion pts-core/static/bash_completion ${PN}
+
+	# Need to fix the cli-php config for downloading to work. Very naughty!
+	local slots
+	local slot
+	if [[ "x${PHP_TARGETS}" == "x" ]] ; then
+		ewarn
+		ewarn "PHP_TARGETS seems empty, php.ini file can't be configure."
+		ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
+		ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+		ewarn "for downloading to work properly."
+		ewarn
+	else
+		for slot in ${PHP_TARGETS}; do
+			slots+=" ${slot/-/.}"
+		done
+	fi
+
+	for slot in ${slots}; do
+		local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
+		if [[ -f ${PHP_INI_FILE} ]] ; then
+			dodir $(dirname ${PHP_INI_FILE})
+			cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
+			sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
+		else
+			if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
+				ewarn
+				ewarn "${slot} hasn't a php.ini file."
+				ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+				ewarn "for downloading to work properly."
+				ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
+				ewarn
+			else
+				elog
+				elog "${slot} hasn't a php.ini file."
+				elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
+				elog "for downloading to work properly if you switch to ${slot}"
+				elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
+				elog
+			fi
+		fi
+	done
+
+	ewarn
+	ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
+	ewarn "your tests because"
+	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
+	ewarn "moves to"
+	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
+	ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
+	ewarn "pts-install.xml file."
+	ewarn
+}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
index 96d41a35cc86..d72daa0261df 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3.9999.ebuild,v 1.7 2013/03/21 01:16:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.8 2013/03/21 17:59:56 ulm Exp $
 
 EAPI=5
 
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+IUSE="acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify 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 )"
 
 RDEPEND="sys-libs/ncurses
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 3c76f7a48dd5..b68a93941698 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -30,7 +30,6 @@
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
   <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='inotify'>Enable inotify filesystem monitoring support</flag>
   <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
   <flag name='pax_kernel'>Enable building under a PaX enabled kernel
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
similarity index 73%
rename from app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
rename to app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
index 8c4b1cd1ed04..861bcd21e70d 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68.ebuild,v 1.1 2013/03/20 10:09:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild,v 1.2 2013/03/22 07:04:38 pinkbyte Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils sgml-catalog toolchain-funcs
 
@@ -14,13 +14,11 @@ LICENSE="MIT SGMLUG"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
 
-IUSE=""
-
 DEPEND="app-text/openjade
 	app-text/opensp
 	app-text/sgml-common
 	dev-texlive/texlive-fontsrecommended
-	>=dev-lang/perl-5.004
+	dev-lang/perl
 	sys-apps/gawk
 	sys-apps/groff
 	virtual/latex-base"
@@ -36,15 +34,25 @@ src_prepare() {
 		"${FILESDIR}/${PN}-0.9.21-malloc.patch" \
 		"${FILESDIR}/${P}-compiler.patch" \
 		"${FILESDIR}/${P}-lex.patch"
+
+	# Wrong path for the catalog.
+	sed -i -e \
+		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
+		perl5lib/LinuxDocTools.pm || die 'sed failed'
+
+	# Fix incorrect version string in upstream tarball
+	sed -i -e "s/0.9.66/${PV}/" VERSION || die 'sed on VERSION failed'
+
+	epatch_user
 }
 
 src_configure() {
 	tc-export CC
-	econf --with-installed-iso-entities || die "./configure failed"
+	econf --with-installed-iso-entities
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Compilation failed"
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
@@ -56,18 +64,14 @@ src_install() {
 	export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
 
 	eval `perl -V:installvendorarch`
-	einstall \
-		perl5libdir="${D}${installvendorarch}" \
-		LINUXDOCDOC="${D}/usr/share/doc/${PF}/guide" \
-		|| die "Installation failed"
-
-	# Wrong path for the catalog.
-	sed -i -e \
-		's,/iso-entities-8879.1986/iso-entities.cat,/sgml-iso-entities-8879.1986/catalog,' \
-		/usr/share/linuxdoc-tools/LinuxDocTools.pm || die 'sed failed'
+	emake \
+		DESTDIR="${D}" \
+		perl5libdir="${installvendorarch}" \
+		LINUXDOCDOC="/usr/share/doc/${PF}/guide" \
+		install
 
 	insinto /usr/share/texmf/tex/latex/misc
-	doins "${S}"/lib/*.sty || die
+	doins tex/*.sty
 
-	dodoc ChangeLog README || die
+	dodoc ChangeLog README
 }
diff --git a/app-text/poppler/poppler-0.22.2-r1.ebuild b/app-text/poppler/poppler-0.22.2-r1.ebuild
index 398e4fa628e9..d875774e407f 100644
--- a/app-text/poppler/poppler-0.22.2-r1.ebuild
+++ b/app-text/poppler/poppler-0.22.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2-r1.ebuild,v 1.5 2013/03/17 16:02:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2-r1.ebuild,v 1.6 2013/03/21 16:00:22 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0/35"
 IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
 
diff --git a/dev-db/mongodb/mongodb-2.4.0.ebuild b/dev-db/mongodb/mongodb-2.4.0.ebuild
index c9226f8c109a..108a93feb55b 100644
--- a/dev-db/mongodb/mongodb-2.4.0.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.0.ebuild,v 1.1 2013/03/20 17:30:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.0.ebuild,v 1.2 2013/03/21 09:02:33 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -26,7 +26,8 @@ RDEPEND="
 	dev-libs/libpcre[cxx]
 	dev-util/google-perftools
 	net-libs/libpcap
-	app-arch/snappy"
+	app-arch/snappy
+	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 23abdf38b64e..550757d884b1 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,4 @@
 DIST pgpool-II-3.2.0.tar.gz 1599391 SHA256 2e41ce78154fc7e9e13eb34f0b60e352d6183de08c4040bea9fbdd914e3e28e0 SHA512 9c9d56bed525c3d8508cde32cd6ac8b13df6dd28366b90157c46c2900eef93fa90254de49b1b574f83fe76525f27a2e8c23d7dcec02cad566aaeff62a6b3282d WHIRLPOOL 25e8f086ea48300affe7195ffcbeee1faa8cde344a99d6caccb0041db04e8040bd2750148c1fde94342b4c544c328f9f97d0b1cf9394443cf37a0d003ace0a90
 DIST pgpool-II-3.2.1.tar.gz 1605959 SHA256 015284c4d83cf8367580fb58469e20330330204d914d00df2fe9ee5a57b3055b SHA512 4b7b947e8d8bdbeabf669323f37f05b38a48a1c397b54875547e85e66e4ea9ec13c6bdbe8d5b996b96db4f85640ca0d2cbc62e74ba0fb56d989d916104a0869f WHIRLPOOL b3bff26e44bb7910e2e74e1e2ab377c9e3e868b509cc958133be26b2bc42d1437cd7292506840d0d1f137d42ebd66f751fbab6f5b47508af94ca363df9cd5722
 DIST pgpool-II-3.2.2.tar.gz 1555174 SHA256 307bab80dcefdcc5c1a2a7b2f294d5734d9c258985503e550b3cbf8d1858cfb0 SHA512 e02091ab5aa336d01e3a0d314b856868452880c4f86aa92e4f73105d4e9aa0c21914e18587f06a2f67282e30e3a50ffff0c0b3825efc5f91529de06206dbdfb8 WHIRLPOOL f0dd8ac3ff2a233a1591c34379f9740d39b6ccdb07542bef530fa21413a2ccab5292f69381172b4b5078cf547827e6c15c028bd5eb03b28faf3d93b49fbd0966
+DIST pgpool-II-3.2.3.tar.gz 1563129 SHA256 cb3b62957afe506e4b420bdc0b959f829d62c708fdce1a17d99a8521c586a5e5 SHA512 55748db315bb005efea173586845c0924eb1f4e5597d55a997446b6e9e01219575698b1b0d8de376e3aebc0cf497adbac19429908002f124aafee7e7bd269e01 WHIRLPOOL 0d7620d643924bb9347208abda27a15b62181756bdadea3ba823df8539f8541c6ad136f7301e8c1fd16a3a27a81e512979103e8b8202115b234ef7e4d46f1910
diff --git a/dev-db/pgpool2/pgpool2-3.2.3.ebuild b/dev-db/pgpool2/pgpool2-3.2.3.ebuild
new file mode 100644
index 000000000000..60404b8ce1a1
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.2.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.2.3.ebuild,v 1.1 2013/03/22 05:32:16 patrick Exp $
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+
+ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
+ECVS_MODULE="pgpool-II"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
+inherit base autotools ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+
+IUSE="memcached pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql-base
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser pgpool -1 -1 -1 postgres
+
+	# We need the postgres user as well so we can set the proper
+	# permissions on the sockets without getting into fights with
+	# PostgreSQL's initialization scripts.
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgpool_run_paths.patch"
+
+	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
+	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
+		sed 's|.*\"\(.*\)\"|\1|g')
+	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
+
+	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+
+	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	cd sql
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cd sql
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	# `contrib' moved to `extension' with PostgreSQL 9.1
+	local pgslot=$(postgresql-config show)
+	if [[ ${pgslot//.} > 90 ]] ; then
+		cd "${ED%/}$(pg_config --sharedir)"
+		mv contrib extension || die
+		cd "${S}"
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation
+	dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
+	dohtml -r doc
+
+	# Examples and extras
+	insinto "/usr/share/${PN}"
+	doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fb5a8e94425c..67cf5e5a90a0 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -8,11 +8,9 @@ DIST php-5.4.11.tar.bz2 11147685 SHA256 d4d095a965f015896d25321842da586076aca5fe
 DIST php-5.4.12.tar.bz2 11501953 SHA256 413e5036b2784918922c14e094cbbc6f28289a3e8e559479c688ab07027ef719 SHA512 c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21 WHIRLPOOL 1cf1153f006e1db472d435d344286cc702ab5fab6b3564d981be3406acfb7bdcd7b43ed3536581c2c1f7ea1389b04bb3c5c00814a082cc4c616fbe7b0b13eb77
 DIST php-5.4.13.tar.bz2 11545777 SHA256 f80c9452f63a6d259d4edd5228be2136da98122ffb79cb1d9d6b7f9026e84f00 SHA512 477adf82fcd0ef8c4911e811da25e7d091753289f7887ee76c7f790394497bb71d5e84172d4711888f0194960b3bafc2bcbfb252842cfc4059eb0692e382d6b1 WHIRLPOOL a3a489261f343dd71b6de37c7e3aaa92f5344ca2fc34fdff1f5b08499fa719af7321f5ae6b583aab2be38d9f6c605bc54c435ca341742f1be7ea7f36bee0b6cd
 DIST php-5.4.8.tar.bz2 11056057 SHA256 d02810b7949938ee7190116e7483e1a06b3fa8373d3bbc0ea65a41265afce79f SHA512 e04ee08e7d1b6f80183846206d02576ad22ea3f41e956bab970344b195f1d2267f1ff69439988cea7084c18576d7855383e48094bdb7684d43cb0f78e4a5e7b8 WHIRLPOOL 963153d85236bd105cbf11a89dd0db11e590cc292bb499abaa9271dbb47eeb124ef011af9561cb5569840d32130934c70cd8ebb4d619147892044ab8c3be09bd
-DIST php-5.5.0alpha2.tar.bz2 11572909 SHA256 d618f8f570e3d29fff8f581a1e4228e9c0e3e51ecc6a295621863181822d913c SHA512 24dc24998aa8ecd29075f0c7b8f67b732e9b1aa7a36576a0b1536ff479679e8fb8c78681644be42d5ca948b20ec0a58a14c57f30c888a432daf7a0f5ab582e78 WHIRLPOOL e962d168091c65c957fb1df75cd64349a74e9cab7fc66efa2ab514d44b49bd5a7e28152c9c4e189390dfaff0925ab75583cf0c0286aa14397b8dabc1ced75848
-DIST php-5.5.0alpha4.tar.bz2 11998221 SHA256 6e6000343338bda5f759c4745e0326d2495164779d13c86e7eaa43e4e0503837 SHA512 6fe1acdd5e01fb7c1c411a3abc6b2ea2fbaf894c41e3e457aebd2b0047ee9240194fa125f85bb977ddc773fd5c518216f3d40531d5ac05fadea0d0dc2be45288 WHIRLPOOL b5c5931a4cfc10d4be1be70b5042ef860262e1f40d725ceb4ba54613d8a699507cee7768f850cb78eb8ecf055d9a2f7970b30fcf9e12c5781cc89ee5c06cd93a
-DIST php-5.5.0alpha6.tar.bz2 12026187 SHA256 46d233aed0d45d683a7b7f968ba0453de3756040a2594e261301ef6d731ffbb4 SHA512 5e9d871d1b2ae1399ba7f7d62f6815a36631ec56877af697e9d4b393a96f9f8305f4b7070d206917e4b4260d976f21aba24009b6ddc56aef0b343f101e1958be WHIRLPOOL abfe091020c6309decb9df45642adbebfb26cc310ed2098f5811df9d9012cb7c74c5a38d64d9c37c6d5ca27cb5dcd908e8d54df6685da890dfa37eca341f9771
+DIST php-5.5.0beta1.tar.bz2 12126978 SHA256 ae3febb4e44e4d7da68bed83f7f025af69f896e6e04a7913c2ad580241b9c7fa SHA512 b2332d55663c2b645659a8db430c24c9cec4ff82d15ce57d60bcc2009a393010f1204736dcd5f0377073cf829ac20394c1ee9f7dd5ae76e9a35cbae4b1a0eae7 WHIRLPOOL 2333821915da3afda7fb17ba4947bc8011dcc7b9e95af48c3130cb81140c4d33ef2f45af0d126da595c830feb3cf72118f012fae7f1ae80b07f702dbc199cf46
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.3.18-r0.tar.bz2 7360 SHA256 8e7d449a4ab50dd8da241f2992fdaee012eafe4da6c66609231cff68d84c5c9f SHA512 625f456649964a959c7aa399c6c4fbeff8dd0b45372153819d42b447069e78cce99b4b6c30d89a64b211d230e17ef28e99d5e3b9055dd59e19b8103337de8d09 WHIRLPOOL cb1ae11173fa6d0a0f26a313d036f6f2109bc704531c5db76a584cc243b5f16ccff3c5e0c943196b5f13a7603e222c2f2c0eb393d754faf66fa5d54e5f627fde
 DIST php-patchset-5.4-2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
-DIST php-patchset-5.5-r0.tar.bz2 7407 SHA256 8e7f36c6d625b5d66bc9e61ad20abbea0b58470cfac5605704c281947f9d52fd SHA512 8bac862f53a1ba21d5acc3cbe68d11b55cb75eed841e840a49ab5769cbc1595f2f487c9fabb3c1183916b2911ecefe710625aca83382f4871593cac8cbc5301a WHIRLPOOL 9d0b0a4603d46edcd5bbc98a89eb36ed5310e56f97960e1fe4283258c4d3ac2d15b93c2287e351ae2359bf661f2d131d4176e92e7d078582b4bfa1af37a40c81
+DIST php-patchset-5.5-r1.tar.bz2 916 SHA256 a7543e530c2a1ceea4377560781c14012e9d0977235b324316221779bf34dc31 SHA512 9c3ae69ff17e8822e8dd75f5eb312448c89005ca3882d8fa9f948a88a05edb5ade481001e2c462f15ae73d54c8c1c3b0bc7e0f97ba379bcab1830e0c363ee374 WHIRLPOOL 98a2aa8cef8d41e9e01296e9c7cd864583092dbeb4de9868b6a4380dc02829b7c592fbee28e3e6aa5dd516fdfd865fdb229f33fe90ecbcd8cf6126f8b32062d2
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 06fabeb12ffd..1dd81184f696 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
 		<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
 		<flag name='intl'>Enables the intl extension for extended internalization support</flag>
+		<flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
 		<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
 		<flag name='pdo'>Enable the bundled PDO extensions</flag>
 		<flag name='phar'>Enables the phar extension to provide phar archive support</flag>
diff --git a/dev-lang/php/php-5.5.0_alpha2.ebuild b/dev-lang/php/php-5.5.0_alpha2.ebuild
deleted file mode 100644
index cabe52f44d48..000000000000
--- a/dev-lang/php/php-5.5.0_alpha2.ebuild
+++ /dev/null
@@ -1,875 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha2.ebuild,v 1.1 2013/01/01 13:44:17 olemarkus Exp $
-
-EAPI=4
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="olemarkus"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} 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 selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-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
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "apache2" ]] ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-			"70_mod_php${PHP_MV}.conf"
-	fi
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-        [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
-        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
-		# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-  # Install PHP ini files into /usr/share/php
-	if [[ ${SLOT} == '5.2' ]]; then
-		newdoc php.ini-dist php.ini-development
-		newdoc php.ini-recommended php.ini-production
-	fi
-
-	if [[ ${SLOT} == '5.3' ]]; then
-		dodoc php.ini-development
-		dodoc php.ini-production
-	fi
-
-	if [[ ${SLOT} == '5.4' ]]; then
-		dodoc php.ini-development
-		dodoc php.ini-production
-	fi
-
-}
-
-php_set_ini_dir() {
-        PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-        PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-        PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# kolab support (support for imap annotations)
-	use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch"
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	local ver=$(get_version_component_range 3)
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Apply generic PHP patches
-		EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-	configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	# Suhosin support
-	if [[ -n $SUHOSIN_VERSION ]] ; then
-		if use suhosin ; then
-			epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-		fi
-	else
-		ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension	      USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv )
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xsl xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-	    my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-	    my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-	    my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-	        my_conf+="
-			$(use_with mysql mysql mysqlnd)"
-		else
-	        my_conf+="
-			$(use_with mysql mysql ${EPREFIX}/usr)"
-		fi
-	    my_conf+="
-		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-	    my_conf+="
-		$(use_with mysqli mysqli mysqlnd)"
-	else
-	    my_conf+="
-		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-	    my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-	    my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-	    my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-	    my_conf+="
-		$(use_with mssql pdo-dblib )"
-		if use mysqlnd ; then
-	        my_conf+="
-			$(use_with mysql pdo-mysql mysqlnd)"
-		else
-	        my_conf+="
-			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
-		fi
-	    my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-	        my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-	    my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-	    my_conf+="
-		$(use_enable session session )"
-	fi
-
-	if use pic ; then
-		my_conf="${my_conf} --with-pic"
-	fi
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-    # Fixes bug #14067.
-    # Changed order to run it in reverse for bug #32022 and #12021.
-    replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				into "${PHP_DESTDIR#${EPREFIX}}"
-			    case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-
-	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
-		ewarn
-		ewarn "The suhosin USE flag now only installs the suhosin patch!"
-		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php/suhosin"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	local sapi
-	local slot
-	for sapi in ${SAPIS}; do
-		slot=$(eselect php show $sapi 2> /dev/null)
-		slot=${slot/php/}
-		if [[ $slot == $SLOT ]]; then
-			ewarn "You have removed the active version of the $sapi SAPI"
-			ewarn "Fix the issue using \`eselect php\`"
-		fi
-	done
-}
diff --git a/dev-lang/php/php-5.5.0_alpha4.ebuild b/dev-lang/php/php-5.5.0_alpha4.ebuild
deleted file mode 100644
index 444a957873ee..000000000000
--- a/dev-lang/php/php-5.5.0_alpha4.ebuild
+++ /dev/null
@@ -1,875 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha4.ebuild,v 1.1 2013/02/07 13:58:17 olemarkus Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="olemarkus"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} 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 selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-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
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "apache2" ]] ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-			"70_mod_php${PHP_MV}.conf"
-	fi
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-        [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
-        [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
-		# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-  # Install PHP ini files into /usr/share/php
-	if [[ ${SLOT} == '5.2' ]]; then
-		newdoc php.ini-dist php.ini-development
-		newdoc php.ini-recommended php.ini-production
-	fi
-
-	if [[ ${SLOT} == '5.3' ]]; then
-		dodoc php.ini-development
-		dodoc php.ini-production
-	fi
-
-	if [[ ${SLOT} == '5.4' ]]; then
-		dodoc php.ini-development
-		dodoc php.ini-production
-	fi
-
-}
-
-php_set_ini_dir() {
-        PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-        PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-        PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# kolab support (support for imap annotations)
-	use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch"
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	local ver=$(get_version_component_range 3)
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Apply generic PHP patches
-		EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-	configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	# Suhosin support
-	if [[ -n $SUHOSIN_VERSION ]] ; then
-		if use suhosin ; then
-			epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-		fi
-	else
-		ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension	      USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv )
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xsl xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-	    my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-	    my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-	    my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-	        my_conf+="
-			$(use_with mysql mysql mysqlnd)"
-		else
-	        my_conf+="
-			$(use_with mysql mysql ${EPREFIX}/usr)"
-		fi
-	    my_conf+="
-		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-	    my_conf+="
-		$(use_with mysqli mysqli mysqlnd)"
-	else
-	    my_conf+="
-		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-	    my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-	    my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-	    my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-	    my_conf+="
-		$(use_with mssql pdo-dblib )"
-		if use mysqlnd ; then
-	        my_conf+="
-			$(use_with mysql pdo-mysql mysqlnd)"
-		else
-	        my_conf+="
-			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
-		fi
-	    my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-	        my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-	    my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-	    my_conf+="
-		$(use_enable session session )"
-	fi
-
-	if use pic ; then
-		my_conf="${my_conf} --with-pic"
-	fi
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-    # Fixes bug #14067.
-    # Changed order to run it in reverse for bug #32022 and #12021.
-    replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				into "${PHP_DESTDIR#${EPREFIX}}"
-			    case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-
-	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
-		ewarn
-		ewarn "The suhosin USE flag now only installs the suhosin patch!"
-		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php/suhosin"
-		ewarn
-	fi
-}
-
-pkg_prerm() {
-	local sapi
-	local slot
-	for sapi in ${SAPIS}; do
-		slot=$(eselect php show $sapi 2> /dev/null)
-		slot=${slot/php/}
-		if [[ $slot == $SLOT ]]; then
-			ewarn "You have removed the active version of the $sapi SAPI"
-			ewarn "Fix the issue using \`eselect php\`"
-		fi
-	done
-}
diff --git a/dev-lang/php/php-5.5.0_alpha6.ebuild b/dev-lang/php/php-5.5.0_beta1.ebuild
similarity index 93%
rename from dev-lang/php/php-5.5.0_alpha6.ebuild
rename to dev-lang/php/php-5.5.0_beta1.ebuild
index e73fe70f1589..d853c576a716 100644
--- a/dev-lang/php/php-5.5.0_alpha6.ebuild
+++ b/dev-lang/php/php-5.5.0_beta1.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_alpha6.ebuild,v 1.1 2013/03/15 08:55:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_beta1.ebuild,v 1.1 2013/03/21 13:33:45 olemarkus Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
 
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
@@ -21,9 +19,6 @@ function php_get_uri ()
 		"php")
 			echo "http://www.php.net/distributions/${2}"
 		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
 		"olemarkus")
 			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
 		;;
@@ -46,6 +41,7 @@ PHP_PV="${PHP_PV/_alpha/alpha}"
 PHP_PV="${PHP_PV/_beta/beta}"
 PHP_RELEASE="php"
 [[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
 [[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
 PHP_P="${PN}-${PHP_PV}"
 
@@ -53,35 +49,17 @@ PHP_PATCHSET_LOC="olemarkus"
 
 PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
 
-PHP_PATCHSET="0"
+PHP_PATCHSET="1"
 PHP_PATCHSET_URI="
 	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
 
 PHP_FPM_INIT_VER="4"
 PHP_FPM_CONF_VER="1"
 
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="olemarkus"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
 SRC_URI="
 	${PHP_SRC_URI}
 	${PHP_PATCHSET_URI}"
 
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
 DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
 HOMEPAGE="http://php.net/"
 LICENSE="PHP-3"
@@ -102,15 +80,12 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 	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 +posix postgres qdbm
+	oci8-instant-client odbc opcache pcntl pdo +phar +posix postgres qdbm
 	readline recode selinux +session sharedmem
 	+simplexml snmp soap sockets spell sqlite ssl
 	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
 	+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
 
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
 DEPEND="
 	>=app-admin/eselect-php-0.6.2
 	>=dev-libs/libpcre-8.32[unicode]
@@ -220,9 +195,6 @@ REQUIRED_USE="
 
 RDEPEND="${DEPEND}"
 
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
 RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
 
 DEPEND="${DEPEND}
@@ -233,10 +205,6 @@ DEPEND="${DEPEND}
 # They are in PDEPEND because we need PHP installed first!
 PDEPEND="doc? ( app-doc/php-docs )"
 
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
 # Allow users to install production version if they want to
 
 case "${PHP_INI_VERSION}" in
@@ -369,15 +337,6 @@ src_prepare() {
 			|| die "Failed to fix heimdal crypt library reference"
 	fi
 
-	# Suhosin support
-	if [[ -n $SUHOSIN_VERSION ]] ; then
-		if use suhosin ; then
-			epatch "${WORKDIR}/${SUHOSIN_PATCH}"
-		fi
-	else
-		ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
-	fi
-
 	#Add user patches #357637
 	epatch_user
 
@@ -443,6 +402,7 @@ src_configure() {
 	$(use_enable pcntl pcntl )
 	$(use_enable phar phar )
 	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
 	$(use_with postgres pgsql "${EPREFIX}"/usr)
 	$(use_enable posix posix )
 	$(use_with spell pspell "${EPREFIX}"/usr)
@@ -842,14 +802,6 @@ pkg_postinst() {
 	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
 	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
 	elog
-
-	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
-		ewarn
-		ewarn "The suhosin USE flag now only installs the suhosin patch!"
-		ewarn "If you want the suhosin extension, make sure you install"
-		ewarn " dev-php/suhosin"
-		ewarn
-	fi
 }
 
 pkg_prerm() {
diff --git a/dev-lang/python/python-2.5.4-r5.ebuild b/dev-lang/python/python-2.5.4-r5.ebuild
index ef311bf5379f..10c8d314b7b0 100644
--- a/dev-lang/python/python-2.5.4-r5.ebuild
+++ b/dev-lang/python/python-2.5.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.12 2013/03/19 02:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r5.ebuild,v 1.13 2013/03/21 16:07:07 jer Exp $
 
 EAPI="1"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-2.6.8-r1.ebuild b/dev-lang/python/python-2.6.8-r1.ebuild
index bd2c7740c240..999a8477026c 100644
--- a/dev-lang/python/python-2.6.8-r1.ebuild
+++ b/dev-lang/python/python-2.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.10 2013/03/19 02:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8-r1.ebuild,v 1.11 2013/03/21 16:07:07 jer Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-2.7.3-r3.ebuild b/dev-lang/python/python-2.7.3-r3.ebuild
index ea21d208bd5d..5f7feabbe571 100644
--- a/dev-lang/python/python-2.7.3-r3.ebuild
+++ b/dev-lang/python/python-2.7.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.12 2013/03/19 04:04:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r3.ebuild,v 1.13 2013/03/21 16:07:07 jer Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2"
 SLOT="2.7"
-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="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.1.5-r1.ebuild b/dev-lang/python/python-3.1.5-r1.ebuild
index 445d17b7cd29..d835506784b5 100644
--- a/dev-lang/python/python-3.1.5-r1.ebuild
+++ b/dev-lang/python/python-3.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.10 2013/03/19 02:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5-r1.ebuild,v 1.11 2013/03/21 16:07:07 jer Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.2.3-r2.ebuild b/dev-lang/python/python-3.2.3-r2.ebuild
index e3002a0e70dd..e73d0f9d35f9 100644
--- a/dev-lang/python/python-3.2.3-r2.ebuild
+++ b/dev-lang/python/python-3.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.13 2013/03/19 04:46:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3-r2.ebuild,v 1.14 2013/03/21 16:07:07 jer Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.2"
-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="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index fb9d4a6e590c..b541f6c8a890 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,2 +1,3 @@
 DIST libebml-1.2.1.tar.bz2 60662 SHA256 8f9e06630eab83f337d280d38eff53e41e030530015a4c423d509a20f6ea81b2 SHA512 c8bd4d903fcd6ea70cd6aace2096768c7e62deb8ddd41d354b71527d6f4595f06b86169996f2ed56e1da0531b9f7ebcac4c9ccdd2e208614f7cd3271b8cf0f4d WHIRLPOOL 4d1207143fc618b8c0f3d93aecd9d1f063845486c9ddcdaa7cd697d9e27ff01dcd31526c52b33e46e4fc5191689009e7960ebc384321a90a34e7c4770f1d6b17
 DIST libebml-1.2.2.tar.bz2 60802 SHA256 476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5 SHA512 aa9b446aadbfea6cd7031a08a8cd0251a764febb8ef43ee3ba44d066b945698311bda7db6bb2d983d5f0c1e24f108ae4cf1c6551b04337210b13daf7e2236135 WHIRLPOOL 5bfa5ee38b9e4bb6cbc8bc27e949e64621ecc8fe3cf76a0686c85b53579d80ee53bca520ef70b9af13bbf589fd51e5f20eae908928ee0b651d23951a532777e0
+DIST libebml-1.3.0.tar.gz 70425 SHA256 cd48a6d943905afe877e86f421647092956d71c7345dc9264a5123750ca8b158 SHA512 804b8e9e29add421304ef104f48170ee434cc97d6063dc4338b7fd6ad559733ed1bffd8440146674b70b3d6906f45ded4cc482d606c94c8c04bf424fd85c366e WHIRLPOOL b5656fa835753bee8b4cfa995db220de85d69604d7332e793c6b45c13100e4041e0fee8517940bde600909b529d3eee959340d3f997b174b249f13c4183ed5cd
diff --git a/dev-libs/libebml/files/libebml-1.3.0-makefile.patch b/dev-libs/libebml/files/libebml-1.3.0-makefile.patch
new file mode 100644
index 000000000000..8c6309de4554
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-1.3.0-makefile.patch
@@ -0,0 +1,102 @@
+--- libebml-release-1.3.0/make/linux/Makefile
++++ libebml-release-1.3.0/make/linux/Makefile
+@@ -50,6 +50,8 @@
+ LIBRARY=libebml.a
+ LIBRARY_SO=libebml.so
+ LIBRARY_SO_VER=libebml.so.4
++LIBRARY_DYLIB=libebml.dylib
++LIBRARY_DYLIB_VER=libebml.4.dylib
+ 
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -66,7 +68,7 @@
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+ 
+ ifeq (Darwin,$(shell uname -s))
+-all: staticlib
++all: staticlib macholib
+ else
+ all: staticlib sharedlib
+ endif
+@@ -75,8 +77,10 @@
+ 
+ sharedlib: $(LIBRARY_SO)
+ 
++macholib: $(LIBRARY_DYLIB)
++
+ lib:
+-	@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
++	@echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."
+ 	@false
+ 
+ # Build rules
+@@ -91,15 +95,22 @@
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
++	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+ 	rm -f $(LIBRARY_SO)
+ 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ 
++$(LIBRARY_DYLIB): $(objects_so)
++	$(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)
++	rm -f $(LIBRARY_DYLIB)
++	ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)
++
+ clean:
+ 	rm -f $(objects) $(objects_so)
+ 	rm -f $(LIBRARY)
+ 	rm -f $(LIBRARY_SO)
+ 	rm -f $(LIBRARY_SO_VER)
++	rm -f $(LIBRARY_DYLIB)
++	rm -f $(LIBRARY_DYLIB_VER)
+ 	rm -f CORE
+ 
+ distclean dist-clean: clean
+@@ -116,30 +127,34 @@
+ 	done
+ 
+ ifeq (Darwin,$(shell uname -s))
+-install: install_staticlib install_headers
++install: install_staticlib install_macholib install_headers
+ else
+ install: install_staticlib install_sharedlib install_headers
+ endif
+ 
+ install_headers:
+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
+ 	for i in $(INCLUDE_DIR)/*.h; do \
+-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
++		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
+ 	done
+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
+ 	for i in $(INCLUDE_DIR)/c/*.h; do \
+-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
++		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
+ 	done
+ 
+ install_staticlib: $(LIBRARY)
+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+ 
+ install_sharedlib: $(LIBRARY_SO)
+-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
+-	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+-
++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
++	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
++
++install_macholib: $(LIBRARY_DYLIB)
++	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)
++	ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
diff --git a/dev-libs/libebml/libebml-1.3.0.ebuild b/dev-libs/libebml/libebml-1.3.0.ebuild
new file mode 100644
index 000000000000..f94436324baf
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.3.0.ebuild,v 1.1 2013/03/21 09:10:12 radhermit Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="https://github.com/Matroska-Org/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug static-libs"
+
+S=${WORKDIR}/${PN}-release-${PV}/make/linux
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	sed -i "s:\(DEBUGFLAGS=\)-g :\1:" Makefile || die
+}
+
+src_compile() {
+	local targets
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		targets="sharedlib"
+	else
+		targets="macholib"
+	fi
+	use static-libs && targets+=" staticlib"
+
+	# keep the prefix in here to make sure the binary is built with a correct
+	# install_name on Darwin
+	emake \
+		prefix="${EPREFIX}"/usr \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		$(use debug && echo DEBUG=yes || echo DEBUG=no) \
+		${targets}
+}
+
+src_install() {
+	local targets="install_headers"
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		targets+=" install_sharedlib"
+	else
+		targets+=" install_macholib"
+	fi
+	use static-libs && targets+=" install_staticlib"
+
+	emake \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		${targets}
+
+	dodoc "${WORKDIR}"/${PN}-release-${PV}/ChangeLog
+}
diff --git a/dev-libs/quazip/quazip-0.5.1-r1.ebuild b/dev-libs/quazip/quazip-0.5.1-r1.ebuild
index 6bae45c14f02..b5cbd6ecfaa1 100644
--- a/dev-libs/quazip/quazip-0.5.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.5.1-r1.ebuild,v 1.2 2013/03/09 19:47:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.5.1-r1.ebuild,v 1.3 2013/03/21 16:23:54 jlec Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ PATCHES=(
 
 src_prepare() {
 	sed \
-		-e "1i\PREFIX = \"${PREFIX}/usr/\"" \
+		-e "1i\PREFIX = \"${EPREFIX}/usr/\"" \
 		-e "s:/lib$:/$(get_libdir):g" \
 		-i ${PN}/${PN}.pro || die
 	use test || sed -e 's:qztest::g' -i ${PN}.pro || die
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 29c04095f09d..a8c2428917c1 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,4 +1 @@
-DIST bitstring-2.2.0.zip 584654 SHA256 7c39ffcc2a2d62f6ea5a0114ea903c9bafd05056c94d5385c56d04bb9d0f4a3d SHA512 a8f0908e91bfcb0cc862ab1a7586a7863792dc9e31e7a87a7bc61df701feb8a475391e30c0dfe7999d1c2b856646576b0d25e1336f0d1509ca30e9757c01cd9f WHIRLPOOL 5cf0739b7d5492c3ebea877a588bf4080decdcdb147dc8708fb1a05088394f7879664eedf2959cdc240a3ec87c7b13b726279053cea85361f4917c5c5c306aa1
-DIST bitstring-3.0.1.zip 623680 SHA256 d75d20f1c4c7543cf500e95eab9596877fa1c4d7d9952d7402dae77dc410419e SHA512 9a9728cc513d1692d4f4800b43b5de36841d49620c63cbe637fa06cfb554f23bd6276b51a096a71f649a4adb8b905127332f517e7f214f48a672502611c603da WHIRLPOOL fb8f15991340662cccf8a0e2936e8564734f54d145b6529b91985b6d27441debb2b22e1a197e39216159b93d875bd79106e7e1547462574d2256b72c62031780
-DIST bitstring-3.0.2.zip 618856 SHA256 1ff42c7192b694774e09ad70a6dd40a0e655ec022ed4f090c929ea69f21b8ebc SHA512 6b0f4d926b693a2c9f28a61902000a446ce76778a0e31ea845891fccc3bdbe8b5f369a457fcc653801777c0c83a801a663a77c932fa4d6233976fad142987825 WHIRLPOOL d402b12d4f589bfe256944508fe6d8491f829907f32ac451d560222bded611bbeaf28e36c659e0d5967a2a60bcf1de5e3c8b35f7fba25a98721456beafa0608d
 DIST bitstring-3.1.0.zip 620245 SHA256 a85b382481985e1382de09e9e00fc4e31ef7c2f36c2f0724c4d008a9a0691c3f SHA512 23e4b7584acce15e452900d7354284dc75cccddee3bbedfcfd53c955af3ae701ee2f089dd6f019e3960b9b86f22b80b92786b2e85ededa48ad33bb02c3ff797b WHIRLPOOL a9fa999d832c12d9f29297e1937cea482f2af9841b950dca3ebff906085e4543770292cf1b9b62f50b27b41b1ef1de8d2f8cc80051ae3483414dff861afbd73b
diff --git a/dev-python/bitstring/bitstring-2.2.0.ebuild b/dev-python/bitstring/bitstring-2.2.0.ebuild
deleted file mode 100644
index e5400d613f8a..000000000000
--- a/dev-python/bitstring/bitstring-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-2.2.0.ebuild,v 1.2 2012/02/21 03:38:15 patrick Exp $
-
-EAPI=3
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5"
-inherit distutils
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="http://python-bitstring.googlecode.com/"
-SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-
-src_test() {
-	testing() {
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" test_${PN}.py
-	}
-	pushd test > /dev/null
-	python_execute_function testing
-	popd > /dev/null
-}
diff --git a/dev-python/bitstring/bitstring-3.0.1.ebuild b/dev-python/bitstring/bitstring-3.0.1.ebuild
deleted file mode 100644
index 2b71d7b06fbc..000000000000
--- a/dev-python/bitstring/bitstring-3.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.0.1.ebuild,v 1.2 2012/02/21 03:38:15 patrick Exp $
-
-EAPI=3
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5"
-inherit distutils
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="http://python-bitstring.googlecode.com/"
-SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-
-src_test() {
-	testing() {
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" test_${PN}.py
-	}
-	pushd test > /dev/null
-	python_execute_function testing
-	popd > /dev/null
-}
diff --git a/dev-python/bitstring/bitstring-3.0.2.ebuild b/dev-python/bitstring/bitstring-3.0.2.ebuild
deleted file mode 100644
index cbdb4cbe77c5..000000000000
--- a/dev-python/bitstring/bitstring-3.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.0.2.ebuild,v 1.2 2012/02/21 03:38:15 patrick Exp $
-
-EAPI=3
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5"
-inherit distutils
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="http://python-bitstring.googlecode.com/"
-SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-
-src_test() {
-	testing() {
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" test_${PN}.py
-	}
-	pushd test > /dev/null
-	python_execute_function testing
-	popd > /dev/null
-}
diff --git a/dev-python/bitstring/bitstring-3.1.0-r1.ebuild b/dev-python/bitstring/bitstring-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..e9d34f1b9bd9
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.0-r1.ebuild,v 1.1 2013/03/22 12:30:55 grozin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="http://python-bitstring.googlecode.com/"
+SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	pushd test > /dev/null
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitarray       || die "test_bitarray failed"
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bits           || die "test_bits failed"
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstore       || die "test_bitstore failed"
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstream      || die "test_bitstream failed"
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstring      || die "test_bitstring failed"
+	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_constbitstream || die "test_constbitstream failed"
+	popd > /dev/null
+}
diff --git a/dev-python/kombu/kombu-1.0.4.ebuild b/dev-python/kombu/kombu-1.0.4.ebuild
index f812dad35ad8..d68c7b7bc771 100644
--- a/dev-python/kombu/kombu-1.0.4.ebuild
+++ b/dev-python/kombu/kombu-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-1.0.4.ebuild,v 1.1 2013/01/26 05:27:36 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-1.0.4.ebuild,v 1.2 2013/03/21 18:40:40 prometheanfire Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/anyjson-0.3.3
-	>=dev-python/amqplib-1.0.2"
+	>=dev-python/amqplib-0.6"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
diff --git a/dev-python/milk/Manifest b/dev-python/milk/Manifest
index 7d1aeb09e18c..e46000433636 100644
--- a/dev-python/milk/Manifest
+++ b/dev-python/milk/Manifest
@@ -1,2 +1,2 @@
-DIST milk-0.4.3.tar.gz 83072 SHA256 ac34d688a493ccd7ff45e79b2638fa0b26e4260c725f179d9b3a8f17c2a18fdd SHA512 9350b0e60550bad7dd44b77b252b6a061a693fbd8ad2fa4b5cac66c8b2c59d21e507f71f0f3f7aae626e5ccec8625f050a0cdeb61948efb6bd9a9e4c116f3137 WHIRLPOOL c4de15da8c89b4e55424f3d948d80ec418be838b6063fc8bed7d1bcb0ce1ad324a0e9f9c00136659311ef28b758486b76db3c0e1ac7c7888e9cf9898da5a4edb
+DIST milk-0.5.1.tar.gz 623685 SHA256 f7fedd0f50967130bc0ddd6c1ce99a644305855d1d2d3c5d6d36b103bb749d37 SHA512 3ac6811f4c15b65de87cae0089ce3fd8372d4b349ea9b7e49db581dcd29e27baf6e33ddca9c6d96e832ebe499e9032de253da532d3241fbbaa4ac124d97a8386 WHIRLPOOL 096fee2ab0f5676c1bec9b3876f43a1d12eab215c5931bb2306d77d466924b7f0d3ac3fb026265cbed0123dec2f6eb15f917be060e7ddd5bc677a2c93a7da0da
 DIST milk-0.5.tar.gz 135964 SHA256 69be63eb301873f5dd39a23e669a671ff68ff118f328907637f839445a29bec5 SHA512 b9f818a23bfbd9ef2726bdaba746fcb693af1aaa8471b0211328b4c70e25e01cb95e6c0bc663b49284398d1da1e9ee8c5d073546a331ff11831274cedd1c0e5c WHIRLPOOL 0ed09fead5b4c560ab02b08cb680eb2d4864e38f8be5d902c89927497c02ffda6a325c1a2b2ec5bd9ad7753ace48c861c063b1851104119be22a7f7f07999ce1
diff --git a/dev-python/milk/metadata.xml b/dev-python/milk/metadata.xml
index 5f1b2d1639b3..62f6e4aafbaa 100644
--- a/dev-python/milk/metadata.xml
+++ b/dev-python/milk/metadata.xml
@@ -17,4 +17,7 @@
   most of the performance sensitive code is in C++. This is behind
   Python-based interfaces for convenience.
 </longdescription>
+<upstream>
+  <remote-id type="pypi">milk</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/milk/milk-0.4.3.ebuild b/dev-python/milk/milk-0.5.1.ebuild
similarity index 51%
rename from dev-python/milk/milk-0.4.3.ebuild
rename to dev-python/milk/milk-0.5.1.ebuild
index 39c7cd3448aa..58fb344f01ab 100644
--- a/dev-python/milk/milk-0.4.3.ebuild
+++ b/dev-python/milk/milk-0.5.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/milk/milk-0.4.3.ebuild,v 1.1 2012/11/01 19:40:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/milk/milk-0.5.1.ebuild,v 1.1 2013/03/21 17:35:07 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-pypy-* *-jython"
-DISTUTILS_SRC_TEST="setup.py"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Machine learning toolkit in Python"
 HOMEPAGE="http://luispedro.org/software/milk"
@@ -22,4 +19,5 @@ IUSE="test"
 
 RDEPEND="dev-python/numpy"
 DEPEND="dev-python/setuptools
-	test? ( dev-python/milksets sci-libs/scipy )"
+	dev-cpp/eigen:3
+	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mozrunner/Manifest b/dev-python/mozrunner/Manifest
index 7380fe1784df..31812675ec81 100644
--- a/dev-python/mozrunner/Manifest
+++ b/dev-python/mozrunner/Manifest
@@ -2,4 +2,5 @@ DIST mozrunner-2.5.4.tar.gz 17120 SHA256 33e48ddf35b7717489106aab2f3b06f2db5e6e8
 DIST mozrunner-5.10.tar.gz 6946 SHA256 3b2477a2edbab4a489d922d094669a8cf0482daa5df01f0d9d7ddfcfe96b983e SHA512 0e8a8797129e73b6fabc6719b9a5d26a3d34f2592c2328f608ea567a9e2e167f751bbccd185e4870a4c23260460bfb106cdd43e83faa54ad45dd8c79f2197146 WHIRLPOOL bdd279f3b5a180b4b1a5b066dd350d8bd68bb69ce2b01dcdc7763031300d86bc53adfd47d5b1a8c0e7f068b5acafc8d04f90a824714693d7ed2c2c0594a1823d
 DIST mozrunner-5.12.tar.gz 6933 SHA256 92e46e9128ed65d149ef5ccd7a64db1bbb98b6b2de67ffcd7cacffca3b9c6acd SHA512 649dd14a7f927ada6a42f28021ada961f73f190f79ffbc13f3ab6fb68a3e478b742b31a4590d560e0ae8218964bafb6bc4ffe807d225f41b1f0c254bb74712d0 WHIRLPOOL e108c8bd5594c2a53aeffa3e56e4e23e04682dad063e071238a5d60d511b9c7eafd86818e445f56ab83616cf59162f11b393d02a3469d75338fb9c29bb1674ad
 DIST mozrunner-5.14.tar.gz 6923 SHA256 74ade342bfb17d428e7dd46fd591fbd34345781a6831f627ed09f7dfe33d0fbb SHA512 dcd93476a7ab09a5dc3667c294545c43b22ebe8d5e0f88293468729410c3df0833efdb7f63918bdb66f9c447c2be2aaaaf5cfb6f81a1e3e4d814460f74e0987b WHIRLPOOL d3975ad3b69cbebef5e783855010971c76f649990a118103859546d9e65320797ac8010579c17d981c74ec72cf90f2336317f3b3832a1983c6a740c1804324f9
+DIST mozrunner-5.15.tar.gz 6235 SHA256 9c3d90302b42f04fb728305f67b1812f133c6537d136b8845c4c56db68e77991 SHA512 4b5474c1bc94396e2037344608cf7171cfb38264398ac7efa03bf5c04a81b1d57af0a1d4dee29cacc3c2e4ffed1d38ab1e1d81a8cc9289e5434f5c976b87b36f WHIRLPOOL 2dad473711ec635f330dc281b460fab9d322bff69bffce3fbc9a7637df5334fcdcd8518fc5b8ecd79d3fa9257a6a14aeec54cd6d4d2689abe559aee0c72a5d34
 DIST mozrunner-5.2.tar.gz 6847 SHA256 432c632e954f371a3484e7c1d1532359cd0bb4bd717985e8e565b7fe71e8b3aa SHA512 d521513ec98381c67ab25fbcdcfbf646a39339425c6bebee6bce16969f80a53895f0bb023853fc404dc4ec717568998f906a6a362f45c55e0879141b94688a43 WHIRLPOOL 092ddc5f4d5b8b59da4df4440a0f4f1650a02d4ddb8a765b58de12b1a75f81bf732a6db120b2a0e6d5fd4b321c669148e0fc70cf191623db1d585c127f9c23bc
diff --git a/dev-python/mozrunner/mozrunner-5.15.ebuild b/dev-python/mozrunner/mozrunner-5.15.ebuild
new file mode 100644
index 000000000000..170774264b55
--- /dev/null
+++ b/dev-python/mozrunner/mozrunner-5.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.15.ebuild,v 1.1 2013/03/21 07:36:42 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+DESCRIPTION="Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"
+HOMEPAGE="http://pypi.python.org/pypi/mozrunner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/simplejson
+	>=dev-python/mozinfo-0.3.3
+	>=dev-python/mozprocess-0.7
+	>=dev-python/mozprofile-0.4
+	dev-python/setuptools"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's/\(moz.*\) ==/\1 >=/' -i setup.py
+	distutils_src_prepare
+}
diff --git a/dev-python/prettytable/prettytable-0.6-r1.ebuild b/dev-python/prettytable/prettytable-0.6-r1.ebuild
new file mode 100644
index 000000000000..7eb8f3edf0d8
--- /dev/null
+++ b/dev-python/prettytable/prettytable-0.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.6-r1.ebuild,v 1.1 2013/03/21 19:02:26 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 python3_2 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for easily displaying tabular data in a
+visually appealing ASCII table format."
+HOMEPAGE="https://code.google.com/p/prettytable/"
+SRC_URI="https://prettytable.googlecode.com/files/prettytable-0.6.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 792bc5d2960b..ae8a63a696c2 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,2 +1 @@
-DIST python-keystoneclient-0.2.1.tar.gz 131997 SHA256 ab0bad758450cb50a91eca71cf738b88f4443a7f9aef317ad50447c3caeba692 SHA512 207ac0531d04f5bfd3a0d3e385dff94778c20300c264961fb78fd0f391074892267a844f2a05b48e4a55b58c1748a332231550c876417d133451160b8690c467 WHIRLPOOL 698dc7cbe88cc5208b331282f22695c27925c91921581735a024c729a6232799a2481acc2bae624810f468ec885c5833e604935966c3453ab981472a2f4b4b46
 DIST python-keystoneclient-0.2.2.tar.gz 171725 SHA256 8dc4ec5864c4b72c07f29cf2089f0f394880d8e0b0f420c06479bb268ac0e346 SHA512 edb058f4c390cbb8df3a7bab8ccb6ba05dbb47f936eae09c3a16013174d03151411e6e867377b765246580e6cf72fd5027376ac29df5a868c4879ad6f5d86e86 WHIRLPOOL 39c9ff5d20f8e00d56626b290ef633072f915329892892110d61f33c97cf04bbea17e2630bf9279b2d93e70bf38702e301a0192eb59b69548a13510c06f9df90
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.2.1-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.2.1-r1.ebuild
deleted file mode 100644
index d395091ad275..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.2.1-r1.ebuild,v 1.1 2013/01/11 22:19:40 prometheanfire Exp $
-
-EAPI=5
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8
-RESTRICT="test"
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/python-keystoneclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/httplib2
-		dev-python/prettytable
-		dev-python/requests
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
-#		test? ( dev-python/Babel
-#			dev-python/coverage
-#			dev-python/iso8601
-#			dev-python/keyring
-#			dev-python/mock
-#			dev-python/mox
-#			dev-python/nose
-#			dev-python/nose-exclude		#not packaged
-#			dev-python/nosehtmloutput	#not packaged
-#			>=dev-python/pep8-1.3.3
-#			>=app-misc/sphinx-1.1.2
-#			dev-python/unittest2
-#			>=dev-python/webob-1.0.8 )"
-#
-#python_test() {
-#	"${PYTHON} setup.py nosetests || die
-#}
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
index dc439f7e84f5..3cbebd85b7e2 100644
--- a/dev-python/shiboken/metadata.xml
+++ b/dev-python/shiboken/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+  <herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-python/shiboken/shiboken-1.1.2-r1.ebuild b/dev-python/shiboken/shiboken-1.1.2-r1.ebuild
index 69116d54914e..aa2701389815 100644
--- a/dev-python/shiboken/shiboken-1.1.2-r1.ebuild
+++ b/dev-python/shiboken/shiboken-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.1.2-r1.ebuild,v 1.4 2013/03/07 18:17:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.1.2-r1.ebuild,v 1.5 2013/03/21 10:48:36 jlec Exp $
 
 EAPI=5
 
@@ -52,7 +52,7 @@ src_configure() {
 	configuration() {
 		local mycmakeargs=(
 			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
 			-DPYTHON_SUFFIX="-${EPYTHON}"
 			$(cmake-utils_use_build test TESTS)
 		)
@@ -60,8 +60,8 @@ src_configure() {
 		if [[ ${EPYTHON} == python3* ]]; then
 			mycmakeargs+=(
 				-DUSE_PYTHON3=ON
-				-DPYTHON3_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)"
-				-DPYTHON3_LIBRARY="${EPREFIX}$(python_get_library_path)"
+				-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
+				-DPYTHON3_LIBRARY="$(python_get_library_path)"
 			)
 		fi
 
diff --git a/dev-python/vatnumber/vatnumber-1.0-r1.ebuild b/dev-python/vatnumber/vatnumber-1.0-r1.ebuild
new file mode 100644
index 000000000000..d721da60ebb7
--- /dev/null
+++ b/dev-python/vatnumber/vatnumber-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vatnumber/vatnumber-1.0-r1.ebuild,v 1.1 2013/03/21 16:16:28 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module to validate VAT numbers"
+HOMEPAGE="http://code.google.com/p/vatnumber/"
+SRC_URI="http://vatnumber.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test vies"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/suds )"
+
+PARCHES=( "${FILESDIR}"/${P}-skiptest.patch )
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc COPYRIGHT README CHANGELOG
+}
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..93414920317e
--- /dev/null
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/versiontools/versiontools-1.9.1-r1.ebuild,v 1.1 2013/03/21 14:47:10 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+#DISTUTILS_SRC_TEST=setup.py
+
+inherit distutils-r1
+
+DESCRIPTION="Smart replacement for plain tuple used in __version__"
+HOMEPAGE="http://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..5fb56dffad9f
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild,v 1.1 2013/03/21 13:08:04 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} python{3_1,3_2} )
+
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv."
+HOMEPAGE="http://github.com/edwardgeorge/virtualenv-clone"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/virtualenv/files/virtualenv-1.9.1-pypy.patch b/dev-python/virtualenv/files/virtualenv-1.9.1-pypy.patch
new file mode 100644
index 000000000000..a829ad84b28f
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-1.9.1-pypy.patch
@@ -0,0 +1,51 @@
+mkdtemp works against pypy's libdir
+diff -ur virtualenv-1.9.1.orig/tests/test_virtualenv.py virtualenv-1.9.1/tests/test_virtualenv.py
+--- virtualenv-1.9.1.orig/tests/test_virtualenv.py	2013-03-08 07:14:17.000000000 +0800
++++ virtualenv-1.9.1/tests/test_virtualenv.py	2013-03-21 21:59:59.180297883 +0800
+@@ -97,27 +97,28 @@
+     cop.update_defaults(defaults)
+     assert defaults == {'system_site_packages': 0}
+ 
+-def test_install_python_bin():
+-    """Should create the right python executables and links"""
+-    tmp_virtualenv = tempfile.mkdtemp()
+-    try:
+-        home_dir, lib_dir, inc_dir, bin_dir = \
++if not hasattr(sys, 'pypy_version_info'):
++    def test_install_python_bin():
++        """Should create the right python executables and links"""
++        tmp_virtualenv = tempfile.mkdtemp()
++        try:
++            home_dir, lib_dir, inc_dir, bin_dir = \
+                                 virtualenv.path_locations(tmp_virtualenv)
+-        virtualenv.install_python(home_dir, lib_dir, inc_dir, bin_dir, False,
++            virtualenv.install_python(home_dir, lib_dir, inc_dir, bin_dir, False,
+                                   False)
+ 
+-        if virtualenv.is_win:
+-            required_executables = [ 'python.exe', 'pythonw.exe']
+-        else:
+-            py_exe_no_version = 'python'
+-            py_exe_version_major = 'python%s' % sys.version_info[0]
+-            py_exe_version_major_minor = 'python%s.%s' % (
+-                sys.version_info[0], sys.version_info[1])
+-            required_executables = [ py_exe_no_version, py_exe_version_major,
++            if virtualenv.is_win:
++                required_executables = [ 'python.exe', 'pythonw.exe']
++            else:
++                py_exe_no_version = 'python'
++                py_exe_version_major = 'python%s' % sys.version_info[0]
++                py_exe_version_major_minor = 'python%s.%s' % (
++                    sys.version_info[0], sys.version_info[1])
++                required_executables = [ py_exe_no_version, py_exe_version_major,
+                                      py_exe_version_major_minor ]
+ 
+-        for pth in required_executables:
+-            assert os.path.exists(os.path.join(bin_dir, pth)), ("%s should "
++            for pth in required_executables:
++                assert os.path.exists(os.path.join(bin_dir, pth)), ("%s should "
+                             "exist in bin_dir" % pth)
+-    finally:
+-        shutil.rmtree(tmp_virtualenv)
++        finally:
++            shutil.rmtree(tmp_virtualenv)
diff --git a/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..d698add923dc
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild,v 1.1 2013/03/21 14:18:11 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+#DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv"
+SRC_URI="https://github.com/pypa/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS="docs/index.txt docs/news.txt"
+PYTHON_MODNAME="virtualenv.py virtualenv_support"
+
+# let the python eclass handle script versioning
+PATCHES=( "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
+		"${FILESDIR}"/${P}-pypy.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && dohtml -r docs/_build/html/
+}
+
+python_test() {
+	nosetests "${S}"/tests || die
+}
diff --git a/dev-python/w3lib/w3lib-1.2-r1.ebuild b/dev-python/w3lib/w3lib-1.2-r1.ebuild
new file mode 100644
index 000000000000..fc5eec1e6583
--- /dev/null
+++ b/dev-python/w3lib/w3lib-1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.2-r1.ebuild,v 1.1 2013/03/21 12:49:57 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="http://github.com/scrapy/w3lib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
new file mode 100644
index 000000000000..9e1a157bda1c
--- /dev/null
+++ b/dev-python/webpy/webpy-0.37-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webpy/webpy-0.37-r1.ebuild,v 1.1 2013/03/21 10:59:53 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="web.py"
+
+DESCRIPTION="A small and simple web framework for Python"
+HOMEPAGE="http://www.webpy.org http://pypi.python.org/pypi/web.py"
+SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/web.py-${PV}"
+
+python_test() {
+	local return_status="0" test tests="db http net template utils"
+	for test in ${tests}; do
+		echo "Running doctests in ${test}.py..."
+		"${PYTHON}" web/${test}.py || return_status="$?"
+	done
+		return "${return_status}"
+}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 306c9401940b..cc1e97eb0245 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -5,3 +5,4 @@ DIST WebTest-1.3.tar.gz 76603 SHA256 aba8f6dcf87584c1d05848814cdd6c58fcb4cde1640
 DIST WebTest-1.4.0.tar.gz 82799 SHA256 d4764ae3a63de7775ff3e840a07a8c1d010222b36c7b3d9298046677c8f96297 SHA512 86971167f878d9caa9b8b942add949c2a5a45d89a17d180161ff30df4e0aad72dadf567209f70f301f7055844cb4aa7d744f65994383617498c4ef00e59213dc WHIRLPOOL 634c90bbce71e9fd090c0e5bf6b7a115545c154644b449885bb1ebdd420e314b5361570f2b154d6ddf60fa2f2c2a2466ee1e5556582cacd876da5e2177157541
 DIST WebTest-1.4.3.zip 80008 SHA256 0439d951afdf6c58d19e0a83e30855d0bb7e35ab177d9261add71fc5a724b6ab SHA512 87436f182edc3178481f4ec3d073399784e353d6480790470891a18d3605c2bb5a1f4effe0ffa0ce241f1256e99f1a4e3e5fcd2896acb8931aeb60a88fa2bfa2 WHIRLPOOL e509a71a213b9085473536afb51142c4cd9fe99b52870139498fe5b68e8326e8b23df9af3502f0d3ebffbe0076165564d38ef143d9b229bb94b23bb857ca6fe9
 DIST WebTest-2.0.1.zip 78547 SHA256 cae12f69bb02efe15b2f8eafa380b5d7d32727fc528599d5b6505bc3fa6f77b6 SHA512 8179e4bba69ddb61099da5f4eabad8059e5ef39e4a019314da59f18276bcbb09a1a5f2850a14797d4bce51543988be10a799fda1c31ce4dc33bcd0cc09514053 WHIRLPOOL a3a817168c4b107b8ef919137e9302b7653eab9141ce2f5b272753c2f333f59d4dc735b32f405909a2b0f3e6366f24270e9ef75448edd4b95b720b276be68b1a
+DIST WebTest-2.0.2.zip 78871 SHA256 b42cee18e77662463e7527c63206947a614a383756d257dac3e8f7713038d0fc SHA512 55c82f19114c7c269dc6e4296ada35415e228977bd5c78acbe26397d6c676d224bb76cefe56d8541ec611fa1a2a44bdd4fb18fca9435c4369e070d4d2897df5d WHIRLPOOL 1c81ef24bb6ce4b83b61d29dc5c0d5fd420fd087f33217c0a07aa7bce4d61c8eab56b7d7b755d50a8edd0d6d5b6d3d05545264cb6f14d902fefa296fba18e6cf
diff --git a/dev-python/webtest/webtest-2.0.2.ebuild b/dev-python/webtest/webtest-2.0.2.ebuild
new file mode 100644
index 000000000000..efae31fe38e3
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.2.ebuild,v 1.1 2013/03/21 07:02:59 patrick Exp $
+
+EAPI=5
+
+# sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/webob-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		dev-python/paste
+		dev-python/pastedeploy )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Why is it so?
+	if [[ ${EPYTHON} == python3* ]]; then
+		rm -f "${D}$(python_get_sitedir)"/webtest/lint3.py
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild
index 6dba6ca174c9..0e5d5f8c15ee 100644
--- a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.2 2013/03/03 03:31:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.3 2013/03/22 03:04:56 vincent Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv icu qt3support ssl"
 
diff --git a/dev-tex/luatex/luatex-0.70.1-r2.ebuild b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
index ddd57b3268dc..879d01d342b9 100644
--- a/dev-tex/luatex/luatex-0.70.1-r2.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r2.ebuild,v 1.6 2013/03/17 16:03:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r2.ebuild,v 1.7 2013/03/21 16:00:09 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-libs/zziplib
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
new file mode 100644
index 000000000000..48ddf443092c
--- /dev/null
+++ b/dev-util/molecule-core/Manifest
@@ -0,0 +1 @@
+DIST molecule-core-1.0.1.tar.bz2 31571 SHA256 293fc2fb91b13b385bc4c48c8fa1c1dfd1223cac137801ed43e656d9b0a2cf9c SHA512 b13aa69149f84972752bf688fe29943a9f8161ba1b1ae09aecba72fa9044731ce29025cfa81d737ad5d046803056a2c70f20c29227fb20e86bd943bef4ed932b WHIRLPOOL e5ff0964678a5c520d4db2523c757c5f07bacce821a7ba614a36095f913a08d8170fafc8e152d5542d0e2fc7b9621704a6b9bd9f709112809384ef1faa111c9d
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
new file mode 100644
index 000000000000..35e5f4052d96
--- /dev/null
+++ b/dev-util/molecule-core/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<longdescription lang="en">
+		Molecule is a build tool that can build, rebuild or extend Sabayon Linux or
+		Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
+		It doesn't contain any specific package manager bit and can work with
+		your favourite one. The philosophy of Molecule is simple: ease of use and
+		modularity.
+		Just like Catalyst, Molecule uses its own .spec file format and learning
+		how to write one is just about reading examples provided at
+		http://git.sabayon.org/molecules.git/.
+		You can tweak your ISO image or create one off your chroot (stage4) in no
+		time. Molecule uses a plugin-based system to implement support for new
+		execution patterns (like ISO to ISO, ISO to Tar, Chroot to ISO, etc).
+		Molecule is born inside Sabayon and is used in its release cycle for both
+		daily(live) and versioned ISO images.
+		Molecule developers are looking for help for writing user docs and HOWTOs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-util/molecule-core/molecule-core-1.0.1.ebuild b/dev-util/molecule-core/molecule-core-1.0.1.ebuild
new file mode 100644
index 000000000000..eb4f32cc56fa
--- /dev/null
+++ b/dev-util/molecule-core/molecule-core-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/molecule-core/molecule-core-1.0.1.ebuild,v 1.2 2013/03/21 13:31:56 lxnay Exp $
+
+EAPI="5"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="Sabayon distro-agnostic images build tool"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="!<dev-util/molecule-1.0
+	sys-process/lsof"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
new file mode 100644
index 000000000000..823783f4dea0
--- /dev/null
+++ b/dev-util/molecule-plugins/Manifest
@@ -0,0 +1 @@
+DIST molecule-plugins-1.0.1.tar.bz2 35623224 SHA256 a39e8639aa25e8c086a4de1a3dbd1d4f9abe86ab8684916aca4d88c2941ebe91 SHA512 2a54b43aa496ba39e555564428d7ee6d542e95240a5be60204de871e4f3e4a39354cd0c8e9b9e31f54bba1a14046041ef432e4d2793961cefc815b52df5bc9c2 WHIRLPOOL 65049e5a0fe5177b253c5006f6843c2a98d732f4a2b588d844d0c846f54fbdd3c9a97be0f362ff820e17821dc9acf08faf83c160084a99c6fe23f510ce0a941e
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/molecule-plugins/metadata.xml
new file mode 100644
index 000000000000..084e4ee0d117
--- /dev/null
+++ b/dev-util/molecule-plugins/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.1.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.1.ebuild
new file mode 100644
index 000000000000..4c9761adc1d7
--- /dev/null
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/molecule-plugins/molecule-plugins-1.0.1.ebuild,v 1.1 2013/03/21 13:06:37 lxnay Exp $
+
+EAPI="5"
+PYTHON_DEPEND="*"
+
+inherit python
+
+DESCRIPTION="A set fo base plugins for Molecule"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="~dev-util/molecule-core-${PV} !<dev-util/molecule-1.0"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/rsync
+	sys-fs/squashfs-tools
+	sys-process/lsof
+	virtual/cdrtools"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
+		PREFIX="/usr" SYSCONFDIR="/etc" install \
+		|| die "emake install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/molecule"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/molecule"
+}
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
index 1dd663e437e4..25eddff37146 100644
--- a/dev-util/molecule/metadata.xml
+++ b/dev-util/molecule/metadata.xml
@@ -5,20 +5,7 @@
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
-	<longdescription lang="en">
-		Metro is a build tool that can build, rebuild or extend Sabayon Linux or
-		Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
-		It doesn't contain any specific package manager bit and can work with
-		your favourite one. The philosophy of Molecule is simple: ease of use and
-		modularity.
-		Just like Catalyst, Molecule uses its own .spec file format and learning
-		how to write one is just about reading examples provided inside
-		/usr/share/molecule/examples.
-		You can tweak your ISO image or create one off your chroot (stage4) in no
-		time. Molecule uses a plugin-based system to implement support for new
-		execution patterns (like ISO to ISO, ISO to Tar, Chroot to ISO, etc).
-		Molecule is born inside Sabayon and is used in its release cycle for both
-		daily(live) and versioned ISO images.
-		Molecule developers are looking for help for writing user docs and HOWTOs.
-	</longdescription>
+	<use>
+		<flag name='plugins'>Add plugins provided by dev-util/molecule-plugins</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/molecule/molecule-1.ebuild b/dev-util/molecule/molecule-1.ebuild
new file mode 100644
index 000000000000..06a6e42011f6
--- /dev/null
+++ b/dev-util/molecule/molecule-1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/molecule/molecule-1.ebuild,v 1.1 2013/03/21 13:14:38 lxnay Exp $
+
+EAPI="5"
+
+DESCRIPTION="Meta package for dev-util/molecule-core and dev-util/molecule-plugins"
+HOMEPAGE="http://www.sabayon.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins"
+
+DEPEND=""
+RDEPEND=">=dev-util/molecule-core-1.0.1
+	plugins? ( >=dev-util/molecule-plugins-1.0.1 )"
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 1cd561ccc482..a40d5103fdc3 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -2,3 +2,4 @@ DIST plan9port-20130119.tgz 54176486 SHA256 d63733c4396e2569a04131517e86f253e270
 DIST plan9port-20130131.tgz 54178455 SHA256 ece69e2e4b0f46e8bafef1ea77dbbb616e3b5af0ae0f617e1aa5470fe4351110 SHA512 a8169ffd6f0f469e6c31e62b0b7ead6a31d05a4d3f73cff108c6dd5728ad84f05de88c82b9cd135d8c16b541e38f472413da69e4f9d7aebc6ad91a5be89c390d WHIRLPOOL 0598d959a69a474967458b0e471c32742c676d714b734200ae63624c6f114991616c8fa78fe5c02c45f74b8f3edc50759df547118cc9ef136dd093307aa35a56
 DIST plan9port-20130209.tgz 54179646 SHA256 39d1cd0b09444b19351bd52b1f0574be14a6faffae57e9673bed48d168952da7 SHA512 21f3cf29b517a43cba5871e8c007a81b88f87aeed8b89ff5a395af0d84bce77f873186e54c09a3acdd9e15649ea432bebb2032ec120074c450d3b7b44f79c531 WHIRLPOOL 49769f370b18fc809b61959655c2e2e28f865fa2f02fec09f21b29d0f4d60535ef5f0c554e38059936594c0e95223a5cdf9475ae609fdcea2836d4e995ff03de
 DIST plan9port-20130308.tgz 54181899 SHA256 a3757adcdf922c7660342f5690b9d7ec2cd0fed259a9e58a2169e0be0de995ee SHA512 1df8fcf1a6f2a8c8a5a7a1073b4bfd1ce855b8edba9ca933cb2c28891e5db70934958dad530807ec0167f2badf51be897d367b05844c75200a04a465989260aa WHIRLPOOL 55e1ceeaed3f19ca8b666aa2741f9e59e633968089e47cd90b194909772f4fbde2f3e179d25d145b282e79101b4c9805d9e4f09528f00734b5007603817bd23a
+DIST plan9port-20130320.tgz 54184719 SHA256 d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512 fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7 WHIRLPOOL 5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f
diff --git a/dev-util/plan9port/plan9port-20130320.ebuild b/dev-util/plan9port/plan9port-20130320.ebuild
new file mode 100644
index 000000000000..156b1043e320
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20130320.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130320.ebuild,v 1.1 2013/03/22 12:06:39 blueness Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-apps/xauth"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags}".patch"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	grep  --null -l -r '/usr/local/plan9' |
+	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+}
+
+src_compile() {
+	# Convert -j5 to NPROC=5 for mk
+	export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')"
+
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	./INSTALL -b
+}
+
+src_install() {
+	dodir "${PLAN9}"
+
+	# P9P's man does not handle compression
+	docompress -x $PLAN9/man
+
+	# do* plays with the executable bit, and we should not modify them
+	cp -a * "${D}/${PLAN9}"
+
+	# build the environment variables and install them in env.d
+	cat > "${T}/30plan9" <<-EOF
+		PLAN9="${PLAN9}"
+		PATH="${PLAN9}/bin"
+		ROOTPATH="${PLAN9}/bin"
+		MANPATH="${PLAN9}/man"
+	EOF
+	doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+	elog "Plan 9 from User Space has been successfully installed into"
+	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "also been appropriately set, please use env-update and"
+	elog "source /etc/profile to bring that into immediate effect."
+	elog
+	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+	elog "versions of common UNIX tools, use the absolute path:"
+	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog
+	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
diff --git a/games-action/beathazardultra/Manifest b/games-action/beathazardultra/Manifest
new file mode 100644
index 000000000000..59ff987f1f80
--- /dev/null
+++ b/games-action/beathazardultra/Manifest
@@ -0,0 +1 @@
+DIST beathazard-installer_03-08-13 183569201 SHA256 ba5d67d820b3367b7080cd73f433d13964285904a55d5be6578bbe9966963faa SHA512 273f550034473d43ac4ceb41018b540f6518393606249de490642a4e6f0dfb5f0b860d3a633db0f90f3b9fce1dc156cf4bd80d383f7e6eae91a5e7bd9e9427d4 WHIRLPOOL 91032365fce84eff65361397935f9e36eae8740f5ae947c976e2e30e76396e55423d8d959ce4476688d8c77d92b57c951c581023e675b1c59f8c286172ff5ec3
diff --git a/games-action/beathazardultra/beathazardultra-20130308.ebuild b/games-action/beathazardultra/beathazardultra-20130308.ebuild
new file mode 100644
index 000000000000..e6370e06fb07
--- /dev/null
+++ b/games-action/beathazardultra/beathazardultra-20130308.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/beathazardultra/beathazardultra-20130308.ebuild,v 1.1 2013/03/21 21:53:04 hasufell Exp $
+
+# TODO: unbundle allegro on amd64 when multilib support
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="Intense music-driven arcade shooter powered by your music"
+HOMEPAGE="http://www.coldbeamgames.com/"
+SRC_URI="beathazard-installer_03-08-13"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/BeatHazard_Linux2
+	${MYGAMEDIR#/}/hge_lib/*"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		!bundled-libs? (
+			media-libs/allegro:5
+			media-libs/libpng:1.2
+			virtual/jpeg
+			x11-libs/gtk+:2
+		)
+	)"
+
+S=${WORKDIR}/data
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unzip -q "${DISTDIR}"/${A}
+	[[ $? -gt 1 ]] && die "unpacking failed"
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		use x86 && { rm -v all/hge_lib/liballegro* || die ; }
+		rm -v all/hge_lib/libjpeg.so* all/hge_lib/libpng12.so*
+	fi
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r all/*
+
+	dodoc Linux.README
+
+	newicon SmileLogo.png ${PN}.png
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./BeatHazard_Linux2" "${MYGAMEDIR}" "${MYGAMEDIR}/hge_lib"
+
+	fperms +x "${MYGAMEDIR}"/BeatHazard_Linux2
+	prepgamesdirs
+}
diff --git a/games-action/beathazardultra/metadata.xml b/games-action/beathazardultra/metadata.xml
new file mode 100644
index 000000000000..c5d01479ca26
--- /dev/null
+++ b/games-action/beathazardultra/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/solar2/Manifest b/games-action/solar2/Manifest
new file mode 100644
index 000000000000..00928ef42962
--- /dev/null
+++ b/games-action/solar2/Manifest
@@ -0,0 +1,2 @@
+DIST solar2-linux-1.10.tar.gz 106202569 SHA256 33211605946741db730082478c4a408547a89facfc2e3535b124c6706809d8b2 SHA512 68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d WHIRLPOOL 86d0ed2c7a28e498323949e871f7ba8f1714f39f98ab625f6dddb0249af7c1e653264ebc4b76cc9be5579f99395e2c578363effcd2c97bb27690b05ec4e73a4e
+DIST solar2.png 6478 SHA256 ab62168651de322dc68a9094baf1ba92524d2d9e76b1650eef60527cd7e3f611 SHA512 b1110d19d62274ac90391f9611fc8efaa1c2ca70cf62f146969768ed2dd76e013054b1a9dfdb123b56536f5ba7788971747219485811eeb6652f22e0867348d9 WHIRLPOOL 358a3fb56c13710abf4ac3115c968579c787ed67f4c8672e0236ce379a56d6540f8c5ad6f8ca16370c0b080ae2763ec2256cbcd1ff2bb0765a7dc5164fc39972
diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-action/solar2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild
new file mode 100644
index 000000000000..183c41db63f8
--- /dev/null
+++ b/games-action/solar2/solar2-1.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/solar2/solar2-1.10.ebuild,v 1.1 2013/03/21 21:55:36 hasufell Exp $
+
+# TODO: - unbundle libmono for 64bit
+#       - unbundling libSDL_mixer breaks the game
+#       - provide icon
+#       - test useflags for libsdl on x86
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
+HOMEPAGE="http://murudai.com/solar/"
+GAMEBALL="${PN}-linux-${PV}.tar.gz"
+ICONFILE="http://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+SRC_URI="${GAMEBALL} ${ICONFILE}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Solar2.bin.x86"
+
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-medialibs
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-soundlibs
+	)
+	x86? (
+		media-libs/flac
+		media-libs/libsdl[X,audio,video,joystick]
+		media-libs/libvorbis
+		!bundled-libs? (
+			dev-lang/mono
+			media-libs/libmad
+			media-libs/libmikmod
+			media-libs/openal
+			media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis]
+		)
+	)"
+
+S=${WORKDIR}/Solar2
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${GAMEBALL} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "Also download ${ICONFILE}"
+	einfo "and move both to ${DISTDIR}"
+	einfo
+}
+
+src_prepare() {
+	# remove unused files
+	rm solar2.sh || die
+
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		if use amd64 ; then
+			# no mono 32bit libs on amd64 yet
+			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* || die
+		else
+			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* lib/libmono.so* || die
+		fi
+	fi
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	games_make_wrapper ${PN} "./Solar2.bin.x86" "${MYGAMEDIR}"
+	make_desktop_entry ${PN}
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+
+	fperms +x "${MYGAMEDIR}"/Solar2.bin.x86
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/super-hexagon/Manifest b/games-action/super-hexagon/Manifest
new file mode 100644
index 000000000000..c62cc64e5a1b
--- /dev/null
+++ b/games-action/super-hexagon/Manifest
@@ -0,0 +1 @@
+DIST super-hexagon-linux-15-bin 27381384 SHA256 3dbcf28ca1e67f2d61c1e1038947ef176f4f17b90688a24605794a08f06379b3 SHA512 f6734db0126e1937b694326885eb6dab639cd96217ac8734f2be59966a0a9ac52274affdb3472871e0067d2ecba8f184720ab6fdf15f2048f86395b539570a60 WHIRLPOOL 07c2007c5ab2cb0c550ce54d84ec519ecd6431fd9bdcf4c6475083f1c41562a47c8d95d33c9dbd82793abdcb10c6613520a1944499f57babde0bd4e722e37c9a
diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml
new file mode 100644
index 000000000000..d9b2211adcb3
--- /dev/null
+++ b/games-action/super-hexagon/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+		<flag name='bundled-glew'>
+			Use the upstream provided bundled glew.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-action/super-hexagon/super-hexagon-15.ebuild b/games-action/super-hexagon/super-hexagon-15.ebuild
new file mode 100644
index 000000000000..320697f5ee6c
--- /dev/null
+++ b/games-action/super-hexagon/super-hexagon-15.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/super-hexagon/super-hexagon-15.ebuild,v 1.1 2013/03/21 21:58:14 hasufell Exp $
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="A minimal action game by Terry Cavanagh, with music by Chipzel"
+HOMEPAGE="http://www.superhexagon.com/"
+SRC_URI="${PN}-linux-${PV}-bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs +bundled-glew"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/x86/*
+	${MYGAMEDIR#/}/x86_64/*"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	!bundled-libs? (
+		media-libs/freeglut
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+	)
+	!bundled-glew? ( ~media-libs/glew-1.6.0 )"
+
+S=${WORKDIR}/data
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unzip -q "${DISTDIR}"/${A}
+	[[ $? -gt 1 ]] && die "unpacking failed"
+}
+
+src_prepare() {
+	einfo "removing ${ARCH} unrelated files"
+	rm -r $(usex amd64 "x86" "x86_64") || die
+
+	if ! use bundled-libs ; then
+		einfo "removing bundled-libs..."
+		cd $(usex amd64 "x86_64" "x86") || die
+		rm libglut.so* libogg.so* libopenal.so* libstdc++.so*\
+			libvorbis.so* libvorbisfile.so* \
+			$(usex bundled-glew "" "libGLEW.so.1.6") || die
+	fi
+}
+
+src_install() {
+	local myarch=$(usex amd64 "x86_64" "x86")
+
+	insinto "${MYGAMEDIR}"
+	doins -r data ${myarch}
+
+	dodoc Linux.README
+
+	newicon SuperHexagon.png ${PN}.png
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./${myarch}/superhexagon.${myarch}" "${MYGAMEDIR}" "${MYGAMEDIR}/${myarch}"
+
+	fperms +x "${MYGAMEDIR}/${myarch}/superhexagon.${myarch}"
+	prepgamesdirs
+}
diff --git a/games-action/swordandsworcery/Manifest b/games-action/swordandsworcery/Manifest
new file mode 100644
index 000000000000..a38a1603b279
--- /dev/null
+++ b/games-action/swordandsworcery/Manifest
@@ -0,0 +1 @@
+DIST swordandsworcery_1.02.tar.gz 325277619 SHA256 e7be30816059d5fa0bda2378d06f51984de13a17abd835cdc015e591354f59de SHA512 1178492628e8b8196bbb57b3d4d7526d5545bd31d0da34bcbed92150753fbb768c8682f071e2a473b95f1b6ee7c3efb30ccb9fce2e3e319d76673b79617e47c0 WHIRLPOOL 9ec0365372a62b7fadfa6b68e945918a1a2ade3c5e7bae561e16251ed0bf4e76b176bfed31e30b259e9a569858d1ae0b07a83067375ca26fe2da049602a570fd
diff --git a/games-action/swordandsworcery/files/swordandsworcery-wrapper b/games-action/swordandsworcery/files/swordandsworcery-wrapper
new file mode 100644
index 000000000000..ce668c71843a
--- /dev/null
+++ b/games-action/swordandsworcery/files/swordandsworcery-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Get game directory
+GAMEDIR="@GAMEDIR@"
+LIB=$GAMEDIR/lib
+BIN=$GAMEDIR/bin
+
+# Ensure the log directory exists
+LOGDIR=~/.capy/SwordAndSworcery
+[ -e ~/.capy ] || mkdir ~/.capy
+[ -e ~/.capy/SwordAndSworcery ] || mkdir ~/.capy/SwordAndSworcery
+
+# For multi-monitor displays, choose a screen to display on to avoid having
+# the game be displayed in the middle across both screens in fullscreen mode
+#export SDL_VIDEO_FULLSCREEN_DISPLAY=0
+
+# Modify library paths here
+export LD_LIBRARY_PATH="$LIB:$LD_LIBRARY_PATH"
+
+# Run the game and try to log any errors if any
+cd "$BIN"
+exec ./swordandsworcery $@ 2>&1 | tee -a $LOGDIR/log.txt
+
+exit
diff --git a/games-action/swordandsworcery/metadata.xml b/games-action/swordandsworcery/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-action/swordandsworcery/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
new file mode 100644
index 000000000000..bd2829814557
--- /dev/null
+++ b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.1 2013/03/21 21:49:24 hasufell Exp $
+
+# TODO: unbundle liblua-5.1 when available for multilib
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="An exploratory action adventure game with an emphasis on audiovisual style"
+HOMEPAGE="http://www.swordandsworcery.com/"
+SRC_URI="${PN}_${PV}.tar.gz"
+
+LICENSE="CAPYBARA-EULA LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/bin/*
+	${MYGAMEDIR#/}/lib/*"
+
+# linked to pulseaudio
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+		app-emulation/emul-linux-x86-opengl
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-soundlibs[alsa]
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		dev-libs/openssl
+		media-libs/alsa-lib
+		media-libs/flac
+		media-libs/libogg
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/pulseaudio
+		sys-libs/zlib
+		virtual/glu
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXtst
+		!bundled-libs? (
+			net-misc/curl
+			media-libs/libsdl[X,audio,video,opengl,joystick]
+		)
+	)"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs..."
+		rm -v lib/libcurl.so* lib/libSDL-1.2.so* \
+			lib/libstdc++.so* || die
+	fi
+
+	sed \
+		-e "s#@GAMEDIR@#${MYGAMEDIR}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r bin lib res
+
+	dogamesbin "${T}"/${PN}
+	make_desktop_entry ${PN}
+
+	dohtml README.html
+
+	fperms +x "${MYGAMEDIR}"/bin/${PN}
+	prepgamesdirs
+}
diff --git a/games-arcade/dynamitejack/Manifest b/games-arcade/dynamitejack/Manifest
new file mode 100644
index 000000000000..19448ceb83bb
--- /dev/null
+++ b/games-arcade/dynamitejack/Manifest
@@ -0,0 +1 @@
+DIST dynamitejack-1.0.23.tgz 54195417 SHA256 aa5fbc27d6931753373e7af99a9521e335a4a5b38a7be0fc8e82c2191b3302e2 SHA512 57897194244ded8d41ef0e7704fd973a58fe52dbc01b7dceed2a47694f7cc3e75d732547532bc7be4dd7d510572dedb85188da413b5857f52182799427243c4d WHIRLPOOL 78d09068461ff8d11cb1a73ec94d160e085636f3d6f1933f0210b12505319c74a0d23daf66814fc23ad0c1c6e1a1dc6cb45adf783376d5573a949d5c3f9a1f4d
diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild
new file mode 100644
index 000000000000..42b098add362
--- /dev/null
+++ b/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/dynamitejack-1.0.23.ebuild,v 1.1 2013/03/21 22:00:46 hasufell Exp $
+
+# TODO: icon
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="A stealth game with bombs in glorious 2D"
+HOMEPAGE="http://www.galcon.com/dynamitejack/"
+SRC_URI="${P}.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/bin/*"
+
+# linked to pulseaudio
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-opengl
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-soundlibs[alsa]
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		media-libs/alsa-lib
+		media-libs/flac
+		media-libs/libogg
+		media-libs/libsdl[X,audio,joystick,opengl,video]
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/pulseaudio
+		virtual/glu
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXtst
+	)"
+
+S=${WORKDIR}/${PN}
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	rm run_me || die
+	mv LINUX.txt "${T}"/ || die
+}
+
+src_install() {
+	dodoc "${T}"/LINUX.txt
+
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	games_make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin"
+	make_desktop_entry ${PN}
+
+	fperms +x "${MYGAMEDIR}"/bin/main
+	prepgamesdirs
+}
diff --git a/games-arcade/dynamitejack/metadata.xml b/games-arcade/dynamitejack/metadata.xml
new file mode 100644
index 000000000000..e52db06ebd8c
--- /dev/null
+++ b/games-arcade/dynamitejack/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/games-engines/love/love-0.7.2-r1.ebuild b/games-engines/love/love-0.7.2-r1.ebuild
index c50d6ad9fe0b..a48a3e18ad61 100644
--- a/games-engines/love/love-0.7.2-r1.ebuild
+++ b/games-engines/love/love-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.7.2-r1.ebuild,v 1.2 2012/09/25 11:21:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.7.2-r1.ebuild,v 1.3 2013/03/21 13:43:22 chithanh Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-games/physfs
-	dev-lang/lua
+	dev-lang/lua[deprecated]
 	media-libs/devil[mng,png,tiff]
 	media-libs/freetype
 	media-libs/libmodplug
diff --git a/games-engines/love/love-0.8.0.ebuild b/games-engines/love/love-0.8.0.ebuild
index 4c4e3de9f14f..9ac4619b63ad 100644
--- a/games-engines/love/love-0.8.0.ebuild
+++ b/games-engines/love/love-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.7 2012/11/21 13:37:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-0.8.0.ebuild,v 1.8 2013/03/21 13:43:21 chithanh Exp $
 
 EAPI=3
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="dev-games/physfs
-	dev-lang/lua
+	dev-lang/lua[deprecated]
 	media-libs/devil[mng,png,tiff]
 	media-libs/freetype
 	media-libs/libmodplug
diff --git a/games-engines/love/love-9999.ebuild b/games-engines/love/love-9999.ebuild
index 95a297340834..52b8851e9ccb 100644
--- a/games-engines/love/love-9999.ebuild
+++ b/games-engines/love/love-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-9999.ebuild,v 1.6 2012/09/25 11:21:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/love/love-9999.ebuild,v 1.7 2013/03/21 14:02:27 chithanh Exp $
 
-EAPI=3
+EAPI=5
 
 inherit base games
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="dev-games/physfs
-	dev-lang/lua
+	dev-lang/lua[deprecated]
 	media-libs/devil[mng,png,tiff]
 	media-libs/freetype
 	media-libs/libmodplug
@@ -42,6 +42,8 @@ DOCS=( "readme.md" "changes.txt" )
 src_prepare() {
 	if [[ ${PV} == 9999* ]]; then
 		sh platform/unix/gen-makefile || die
+		cp platform/unix/Makefile.am . || die
+		cp platform/unix/configure.ac . || die
 		mkdir platform/unix/m4 || die
 		eautoreconf
 	fi
diff --git a/games-kids/crayon-physics/Manifest b/games-kids/crayon-physics/Manifest
new file mode 100644
index 000000000000..c84d9520f0dd
--- /dev/null
+++ b/games-kids/crayon-physics/Manifest
@@ -0,0 +1 @@
+DIST crayon_physics_deluxe-linux-release55.tar.gz 33236439 SHA256 1a8f29fc298abea8fdde2b926d33e00e88500f2a8eef5d78c97355b5483d4a8b SHA512 1840cabba5b922f155b90c4442c460e7dc5c63aa2e1348a5f175211d5264c645c08af9a3bd43861aa8497e111678a7314b94d2ba0035b2e07e811200f1af07eb WHIRLPOOL 4413692ea91a09f0e87c56e2eb030e2e5874a3994579bd744bc0c3d10a2919db1780ff16d0073ae9fc56f1fc8bed264b947f02396c306d7f70b497b19da1ac9e
diff --git a/games-kids/crayon-physics/crayon-physics-55.ebuild b/games-kids/crayon-physics/crayon-physics-55.ebuild
new file mode 100644
index 000000000000..2f000a0f6f12
--- /dev/null
+++ b/games-kids/crayon-physics/crayon-physics-55.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/crayon-physics/crayon-physics-55.ebuild,v 1.1 2013/03/21 22:03:58 hasufell Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="2D physics puzzle/sandbox game with drawing"
+HOMEPAGE="http://www.crayonphysics.com/"
+SRC_URI="crayon_physics_deluxe-linux-release${PV}.tar.gz"
+
+LICENSE="CRAYON-PHYSICS"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/crayon
+	${MYGAMEDIR#/}/lib32/*"
+
+# fuck this pulseaudio linkage
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-opengl
+		app-emulation/emul-linux-x86-qtlibs
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-soundlibs
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		media-sound/pulseaudio
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		virtual/glu
+		x11-libs/libX11
+		!bundled-libs? (
+			media-libs/libmikmod
+			media-libs/libsdl[X,audio,video,opengl,joystick]
+			media-libs/libvorbis
+			media-libs/sdl-image[png,jpeg,tiff]
+			media-libs/sdl-mixer[vorbis,wav]
+			media-libs/smpeg[X,opengl]
+			media-libs/tiff:0
+			virtual/jpeg
+		)
+	)"
+
+S=${WORKDIR}/CrayonPhysicsDeluxe
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_prepare() {
+	if use bundled-libs ; then
+		mv lib32/_libSDL-1.2.so.0 lib32/libSDL-1.2.so.0 || die
+	fi
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	use bundled-libs && doins -r lib32
+	doins -r cache data crayon autoexec.txt version.xml
+
+	newicon -s 256 icon.png ${PN}.png
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./crayon" "${MYGAMEDIR}" "${MYGAMEDIR}/lib32"
+
+	dodoc changelog.txt linux_hotfix_notes.txt
+	dohtml readme.html
+
+	fperms +x "${MYGAMEDIR}"/crayon
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-kids/crayon-physics/metadata.xml b/games-kids/crayon-physics/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-kids/crayon-physics/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
new file mode 100644
index 000000000000..b91b0bb4c5fc
--- /dev/null
+++ b/games-puzzle/nightsky/Manifest
@@ -0,0 +1 @@
+DIST nightskyhd-linux-1324519044.tar.gz 123971537 SHA256 def2b3b42239f9e786472a88d85ae739790f6675b8eadffe9941350d2100e9d0 SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e WHIRLPOOL b7aeef90eadaa47498da4d3cefd10c3f0c5ec8262ea9cf0125280aed6848ae5c8f05e591ccdedfa9a11f161f4abbb5ee03844ddee1a1c252cb61d53c5103cd0c
diff --git a/games-puzzle/nightsky/files/nightsky-wrapper b/games-puzzle/nightsky/files/nightsky-wrapper
new file mode 100644
index 000000000000..be838c7432cc
--- /dev/null
+++ b/games-puzzle/nightsky/files/nightsky-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+HOMEDIR="${HOME}/.nightsky"
+GAMEDIR="@GAMES_PREFIX_OPT@/nightsky"
+
+# create root config dir
+[ -e "${HOMEDIR}" ] || mkdir "${HOMEDIR}"
+
+# symlink game data
+for i in `cd "${GAMEDIR}" || exit 1 ; ls -d *` ; do
+	[ -e "${HOMEDIR}/${i}" ] || ln -sf "${GAMEDIR}/${i}" "${HOMEDIR}/${i}"
+done
+# create empty Settings dir
+[ -e "${HOMEDIR}/Settings" ] || mkdir "${HOMEDIR}/Settings"
+
+cd "${HOMEDIR}"
+
+# start architecture dependent binary
+if [ -e "${HOMEDIR}/NightSkyHD_64" ] ; then
+	exec ./NightSkyHD_64 "$@"
+else
+	exec ./NightSky "$@"
+fi
diff --git a/games-puzzle/nightsky/metadata.xml b/games-puzzle/nightsky/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-puzzle/nightsky/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
new file mode 100644
index 000000000000..c9a04814e8c2
--- /dev/null
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/nightsky/nightsky-20111222.ebuild,v 1.1 2013/03/21 22:08:02 hasufell Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
+HOMEPAGE="http://www.nicalis.com/nightsky/"
+SRC_URI="nightskyhd-linux-1324519044.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/NightSky*
+	${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/lib64/*"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXxf86vm
+	!bundled-libs? (
+		media-libs/freealut
+		media-libs/freeglut
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		sys-libs/zlib
+	)"
+
+S=${WORKDIR}/NightSky
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	einfo "removing ${ARCH} unrelated files..."
+	rm -v NightSkyHD$(usex amd64 "" "_64") || die
+	rm -rv lib$(usex amd64 "" "64") || die
+
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs..."
+		rm -rv lib* || die
+	fi
+
+	# empty dir, we create symlink here later
+	rm -r Settings || die
+
+	sed \
+		-e "s#@GAMES_PREFIX_OPT@#${GAMES_PREFIX_OPT}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+}
+
+src_install() {
+	dogamesbin "${T}"/${PN}
+
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	newicon -s 128 "World/The Void/Physical"/Circle72.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	echo
+	elog "Saves and Settings are in ~/.nightsky/Settings"
+	echo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
new file mode 100644
index 000000000000..dde80364af67
--- /dev/null
+++ b/games-puzzle/splice/Manifest
@@ -0,0 +1 @@
+DIST splice-linux-1353389454.tar.gz 305838859 SHA256 5016610688f06fcc478b8669a0537614478e68077e044f21530066649830d331 SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44 WHIRLPOOL 9139a3077c78331989128bfe6771c8bfe8c7f8af57712139df8ffd60d295a7bed8dd9dca0a09a35f96cb70407505f7d7b8137caa619f99d226735e37477fc1d6
diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
new file mode 100644
index 000000000000..e52db06ebd8c
--- /dev/null
+++ b/games-puzzle/splice/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
new file mode 100644
index 000000000000..f3c1f0fe88fc
--- /dev/null
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/splice/splice-20121120.ebuild,v 1.1 2013/03/21 22:05:56 hasufell Exp $
+
+# TODO: unbundle mono? (seems hardcoded)
+#       icon
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
+HOMEPAGE="http://www.cipherprime.com/games/splice/"
+SRC_URI="splice-linux-1353389454.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/Splice*
+	${MYGAMEDIR#/}/Splice_Data/Mono/*"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext"
+
+S=${WORKDIR}/Linux
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	einfo "removing ${ARCH} unrelated files..."
+	rm -v Splice.x86$(usex amd64 "" "_64") || die
+	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
+
+	rm README~ || die
+	mv README "${T}"/ || die
+}
+
+src_install() {
+	dodoc "${T}"/README
+
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
+
+	fperms +x "${MYGAMEDIR}"/Splice.x86$(usex amd64 "_64" "")
+	prepgamesdirs
+}
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
new file mode 100644
index 000000000000..350d44e061f2
--- /dev/null
+++ b/games-rpg/bastion/Manifest
@@ -0,0 +1 @@
+DIST Bastion-HIB-2012-06-20.sh 1055161705 SHA256 f1e67f8e8dd0ba823cab0f16f2269dc8d9230ebca7a304927ff540320169c431 SHA512 e81b5dfa6f61ec2b35b30693c156a612cd3242c2169f4414b6d66839b7d8cc2e6ea8776f55baae67fa8131ee96bc221e1a15004410612eecaa9f7204dcc673ad WHIRLPOOL 2ec712724f263d9cbd181a128a0adc22f38465447db03f1d382aa231bad98e637b27ec2e73b2acf66a5775f53b0406c82cf0cd36befdc13f6afc5434887ac040
diff --git a/games-rpg/bastion/bastion-20120620.ebuild b/games-rpg/bastion/bastion-20120620.ebuild
new file mode 100644
index 000000000000..95312df886f0
--- /dev/null
+++ b/games-rpg/bastion/bastion-20120620.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/bastion/bastion-20120620.ebuild,v 1.1 2013/03/21 22:17:15 hasufell Exp $
+
+# TODO: - unbundle mono when multilib
+#       - unbundle fmodex when multilib
+
+EAPI=5
+
+inherit eutils gnome2-utils check-reqs unpacker games
+
+TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
+DESCRIPTION="An original action role-playing game set in a lush imaginative world"
+HOMEPAGE="http://supergiantgames.com/?page_id=242"
+SRC_URI="Bastion-HIB-${TIMESTAMP}.sh"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/Bastion.bin.x86
+	${MYGAMEDIR#/}/lib/*"
+
+# mono shit: vague dependencies
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-soundlibs
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		media-libs/freealut
+		media-libs/openal
+		media-libs/sdl-gfx
+		media-libs/sdl-image
+		media-libs/sdl-mixer
+		media-libs/sdl-net
+		media-libs/sdl-ttf
+		media-libs/smpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		!bundled-libs? (
+			dev-lang/mono
+			media-libs/fmod:1
+			media-libs/libsdl[X,audio,video,opengl,joystick]
+		)
+	)"
+
+CHECKREQS_DISK_BUILD="2400M"
+
+pkg_pretend() {
+	if has splitdebug ${FEATURES}; then
+		eerror "FEATURES=splitdebug is broken for this package, disable it locally"
+		die "FEATURES=splitdebug is broken for this package, disable it locally"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	local myarch=$(usex amd64 "x86" "x86_64")
+
+	unpack_makeself
+
+	mv instarchive_all{,.tar.lzma} || die
+	mv instarchive_linux_${myarch}{,.tar.lzma} || die
+
+	mkdir ${P} || die
+	cd ${P} || die
+
+	unpack ./../instarchive_{all,linux_${myarch}}.tar.lzma
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundles libs..."
+		rm -v lib/libSDL-1.2.so* || die
+		use x86 && { rm -v lib/libmono-2.0.so* lib/libfmodex.so* || die ;}
+	fi
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	newicon -s 256 Bastion.png ${PN}.png
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./Bastion.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+
+	fperms +x "${MYGAMEDIR}"/Bastion.bin.x86
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "If you are using opensource drivers you should consider installing:"
+	elog "    media-libs/libtxc_dxtn"
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-rpg/bastion/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-rpg/dungeon-defenders/Manifest b/games-rpg/dungeon-defenders/Manifest
new file mode 100644
index 000000000000..f09fc5970a84
--- /dev/null
+++ b/games-rpg/dungeon-defenders/Manifest
@@ -0,0 +1 @@
+DIST dundef-linux-03052013.mojo.run 5384683543 SHA256 bc81021859871169285111ef7b1806952dcc17b128f3e387d9b5072918490c61 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca WHIRLPOOL a5d75261ad542cf182829d6bd9cb053696d2228e44a6560a400e26f0697d9993037410cb9a2311e882b5076aefc612ba4b490d709ee281a6422b122e2a644402
diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
new file mode 100644
index 000000000000..1ea87dc20481
--- /dev/null
+++ b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild,v 1.1 2013/03/21 22:15:12 hasufell Exp $
+
+# TODO: unbundle SDL-2 when it gets released
+
+EAPI=5
+
+inherit check-reqs eutils gnome2-utils games
+
+TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
+MY_PN="DungeonDefenders"
+DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG"
+HOMEPAGE="http://dungeondefenders.com/"
+SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/UDKGame/Binaries/${MY_PN}-x86
+	${MYGAMEDIR#/}/UDKGame/Binaries/libSDL2-2.0.so.0"
+CHECKREQS_DISK_BUILD="5916M"
+
+# linked against pulseaudio
+# without SDL-2 only linkage: opengl, openal
+DEPEND="app-arch/unzip"
+RDEPEND="
+	x11-misc/xdg-utils
+	virtual/opengl
+	amd64? (
+		app-emulation/emul-linux-x86-soundlibs[alsa]
+		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-xlibs
+	)
+	x86? (
+		media-libs/alsa-lib
+		media-sound/pulseaudio
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+		!bundled-libs? ( media-libs/openal )
+	)"
+
+S=${WORKDIR}/data
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unzip -q "${DISTDIR}"/${A}
+	[[ $? -gt 1 ]] && die "unpacking failed"
+}
+
+src_prepare() {
+	# https://bugzilla.icculus.org/show_bug.cgi?id=5894
+	sed -i \
+		-e 's/LobbyLevel_Valentines2013.udk/LobbyLevel.udk/' \
+		UDKGame/Config/DefaultDunDef.ini || die
+
+	# Remove the binaries that we're unbundling and unnecessary stuff
+	rm -v UDKGame/Binaries/xdg-open || die
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		rm -v UDKGame/Binaries/libopenal.so.1 || die
+	fi
+}
+
+src_install() {
+	# Move the data rather than copying. The game consumes over 5GB so
+	# a needless copy should really be avoided!
+	dodir "${MYGAMEDIR}"
+	mv -v Engine UDKGame "${D}${MYGAMEDIR}" || die
+
+	# use system xdg-open script, location is hardcoded
+	dosym /usr/bin/xdg-open "${MYGAMEDIR}"/UDKGame/Binaries/xdg-open
+
+	newicon -s 48 DunDefIcon.png ${PN}.png
+	make_desktop_entry "${PN}" "Dungeon Defenders"
+	games_make_wrapper ${PN} "./${MY_PN}-x86" "${MYGAMEDIR}/UDKGame/Binaries"
+
+	dodoc README-linux.txt
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
new file mode 100644
index 000000000000..d647e74d87ea
--- /dev/null
+++ b/games-rpg/dungeon-defenders/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/licenses/CAPYBARA-EULA b/licenses/CAPYBARA-EULA
new file mode 100644
index 000000000000..82f967828034
--- /dev/null
+++ b/licenses/CAPYBARA-EULA
@@ -0,0 +1,42 @@
+CAPYBARA GAMES INC.
+End User License Agreement
+
+THIS END USER LICENSE AGREEMENT ("EULA") IS A BINDING LEGAL AGREEMENT BETWEEN CAPYBARA GAMES INC ("CAPYBARA") AND YOU AND, IF APPLICABLE, THE COMPANY OR OTHER LEGAL ENTITY YOU REPRESENT (COLLECTIVELY, "YOU" AND "YOUR") REGARDING THE GAME SOFTWARE THAT YOU ARE INSTALLING, INCLUDING ANY ACCOMPANYING MANUAL OR OTHER RELATED MATERIAL PROVIDED BY CAPYBARA AS PART OF, OR IN CONNECTION, THEREWITH (COLLECTIVELY, THE "GAME").
+
+BY CLICKING THE "I AGREE" BUTTON BELOW, OR BY OTHERWISE CONTINUING TO INSTALL, DOWNLOAD, COPY, ACCESS OR USE THE GAME, YOU ACKNOWLEDGE THAT YOU UNDERSTAND AND AGREE TO BE BOUND BY THE TERMS OF THIS EULA.  IF YOU DO NOT AGREE, YOU MUST SELECT THE "I DON'T AGREE" BUTTON AND YOU MAY NOT CONTINUE TO INSTALL, DOWNLOAD, COPY, ACCESS OR USE THE GAME.
+
+1. 	LICENSE GRANT AND RESTRICTIONS.
+
+	1.1	License Grant. CAPYBARA hereby grants to you a non-exclusive license to use a single copy of the object code version of the Game for your personal, non-commercial home entertainment use on one personal computer or other compatible electronic device.  You may sell or transfer your copy of the Game to another person along with, and subject to, your rights under this EULA, only if you do not retain any copies.
+
+	1.2	Restrictions. You may not (i) decompile, disassemble or reverse engineer the Game or otherwise attempt to gain access to its source code, except to the extent that such restrictions are expressly prohibited by law; (ii) copy, offer for public display or create derivative works thereof, except to the extent that such restrictions are expressly prohibited by law; (iii) rent, lease, loan, sublicense or distribute the Game, or offer it on a pay-per-play, coin-op or other for charge (or free) basis; (iv) use the Game to infringe the copyrights or other intellectual property rights of others in any way; (v) modify or delete the copyright and other proprietary rights notices on or in the Game.
+
+	1.3  	Additional Restrictions for Trial Versions. If the Game was provided to you for trial use for a limited period of time and/or number of uses, you agree not to use the Game beyond the expiration or termination of the trial period.  You acknowledge and agree that the Game may include code designed to prevent you from exceeding these limits, and that such code may remain on your computer or device after deletion of the Game to prevent you from installing another copy of the Game and repeating the trial.
+
+	1.4  	Game Specific Terms and Conditions. For additional terms and conditions that may apply to the Game, such as third-party copyright notices and license information, please review the About screen included in the Game.  The About screen for the Game is hereby incorporated into this EULA by this reference.
+
+2.  	TERMINATION. This EULA is effective until terminated. You may terminate this EULA at any time by uninstalling the Game and destroying all copies of the Game in your possession or control.  CAPYBARA may terminate this EULA immediately upon notice to you if you breach any of its terms or conditions.  Upon termination of this EULA, you agree to immediately uninstall the Game and destroy all copies of the Game.
+
+3.  	GAME OWNERSHIP. The Game is the copyrighted proprietary material of CAPYBARA, Superbrothers Inc. and/or its third-party licensors and is subject to copyright protection under Canadian copyright law and international copyright treaties, as well as other intellectual property laws and treaties. CAPYBARA, Superbrothers Inc. and/or its third-party licensors retain all right, title, and interest in the Game (and any copies thereof) and specifically reserve all rights not expressly granted under this EULA.
+
+4.  LIMITED WARRANTIES BY CAPYBARA.
+
+	4.1 	Limited Warranty. CAPYBARA WARRANTS TO YOU, THE ORIGINAL PURCHASER OF THE GAME, THAT THE GAME WILL BE FREE FROM DEFECTS IN MATERIALS AND WORKMANSHIP FOR A PERIOD OF NINETY (90) DAYS FROM THE DATE OF PURCHASE (THE "WARRANTY PERIOD").  THIS LIMITED WARRANTY IS VOID IF THE GAME HAS BEEN SUBJECT TO MISUSE, DAMAGE OR IF YOU HAVE VIOLATED THIS EULA. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL OTHER WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, OR WARRANTIES THAT THE GAME WILL BE ERROR-FREE, SECURE OR VIRUS-FREE, ARE HEREBY EXPRESSLY DISCLAIMED.
+
+	4.2 	Additional Warranty for Retail Product. IF YOU PURCHASED THE GAME ON A DISC OR OTHER RECORDING MEDIUM, THEN YOU MUST MAKE ANY WARRANTY CLAIM TO THE RETAILER FROM WHICH YOU PURCHASED THE GAME BY PROVIDING A COPY OF YOUR ORIGINAL SALES RECEIPT AND ANY OTHER DETAILS REQUIRED BY THE RETAILER. THE RETAILER, AT ITS OPTION, MAY REFUND YOUR PURCHASE PRICE, REPAIR OR REPLACE THE DISC OR OTHER MEDIA CONTAINING THE GAME. ANY REPLACEMENT WILL BE WARRANTED FOR THE REMAINDER OF THE ORIGINAL WARRANTY PERIOD OR THIRTY (30) DAYS, WHICHEVER IS LONGER. YOUR EXCLUSIVE REMEDY, AND THE ENTIRE LIABILITY OF CAPYBARA, ITS AFFILIATES, LICENSORS AND SUPPLIERS (COLLECTIVELY, "THE CAPYBARA PARTIES"), FOR BREACH OF THIS WARRANTY, SHALL BE THE REFUND, REPAIR OR REPLACEMENT DESCRIBED ABOVE.
+
+5. LIMITATION OF LIABILITY. NO PROVISIONS OF THIS EULA SHALL APPLY TO LIMIT LIABILITY ARISING FROM DEATH OR PERSONAL INJURY CAUSED BY NEGLIGENCE OR FOR FRAUD. OTHERWISE, IN NO EVENT WILL THE CAPYBARA PARTIES' TOTAL AGGREGATE LIABILITY TO YOU FOR DIRECT DAMAGES, LOSSES, AND CAUSES OF ACTION ARISING OUT OF OR RELATING TO THIS EULA AND/OR YOUR USE OF THE GAME EXCEED THE AMOUNT PAID BY YOU FOR THE GAME.  IN NO EVENT WILL THE CAPYBARA PARTIES BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR ANY OTHER TYPE OF DAMAGES (INCLUDING WITHOUT LIMITATION DAMAGES RELATING TO LOST PROFITS, LOSS OF DATA, PRIVACY, NEGLIGENCE OR OTHER DUTY OF CARE), EVEN IF ONE OR MORE OF THE CAPYBARA PARTIES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6. BASIS OF THE BARGAIN; EXCLUSIONS. The disclaimers of warranties and limitations of liability set forth above are fundamental elements of the basis of the agreement between you and CAPYBARA.  You understand and agree that CAPYBARA would not be able to economically or reasonably provide the Game to you without these limitations. HOWEVER, SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES AND/OR THE LIMITATION OF INDIRECT DAMAGES AS SET FORTH IN SECTIONS 4 AND 5 ABOVE, SO THE ABOVE EXCLUSIONS AND LIMITATIONS MAY NOT APPLY TO YOU.
+
+7. INDEMNIFICATION.  You agree to indemnify, defend and hold harmless the CAPYBARA Parties, including their respective employees, officers, directors and personnel from any claims, losses, damages, liabilities, including attorneys' fees, arising out of your violation of this EULA and/or your use or misuse of the Game.
+
+8. EXPORT CONTROL.  The Game originates in Canada and is subject to Canadian export laws and regulations. You may not export or re-export, in whole or in part, the Game to certain countries, persons or entities prohibited from receiving exports from Canada.  Additionally, the Game may be subject to the import and export laws of other countries, and you agree that you will comply with any such foreign import and export laws, as applicable.
+
+9. MISCELLANEOUS.  You agree to comply with all Canadian and foreign laws related to your use of the Game.  This is the entire agreement between you and CAPYBARA relating to the subject matter herein and replaces any and all previous representations, agreements, understandings or communications, whether written or oral.  This EULA may not be modified except in writing, signed by both parties. If a court of competent jurisdiction declares any provision of this EULA to be void or unenforceable, then such provision will be interpreted, construed or reformed to the extent reasonably required to render it valid, enforceable and consistent with the original intent underlying such provision, and such invalidity or unenforceability will not affect any other provision of this EULA.  The English language version of this EULA will control its interpretation.
+
+10.  GOVERNING LAW AND VENUE.
+
+This EULA will be governed by and construed in accordance with the laws of the Province of Ontario, Canada, excluding its conflicts of law rules and specifically excluding the United Nations Convention on Contracts for the International Sale of Goods.  Venue for any action hereunder shall lie exclusively in the courts located in Toronto, Ontario, Canada and you hereby consent and submit to the personal jurisdiction of such courts.
+
+11.  NOTICES; HOW TO CONTACT CAPYBARA.  The Game is made available to you by CAPYBARA GAMES INC.  CAPYBARA may be contacted via its website (http://www.capybaragames.com).  Superbrothers Inc. may be contacted via its website (www.superbrothers.ca)
diff --git a/licenses/CRAYON-PHYSICS b/licenses/CRAYON-PHYSICS
new file mode 100644
index 000000000000..6da1f2e7d6f4
--- /dev/null
+++ b/licenses/CRAYON-PHYSICS
@@ -0,0 +1,17 @@
+Crayon Physics Deluxe Licence Agreement
+
+This software is provided "as-is", without any express or implied warranty. In
+no event shall the author be held liable for any damages arising from the use
+of this software.
+
+You may not copy or redistribute this software.
+
+You may not reverse engineer or create derivative works based on this software.
+
+Running this software constitutes agreement with the terms of the licence.
+
+This software is protected by copyright laws and international treaties.
+
+
+Copyright (c) 2007 - 2011 Kloonigames Ltd. All rights reserved.
+http://www.kloonigames.com/
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index b0f9f488f8dd..2124e7ba7bf9 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,2 +1,3 @@
 DIST opendkim-2.7.4.tar.gz 1158496 SHA256 fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76 SHA512 f897cea21832355cac5421a96a906f67aaff1bcc0ceb5e027c73845d7c0cd27ec12862a826534b01339571533cba061b86e1a1bad91c405488bada729e2846cb WHIRLPOOL afe329829211cedacc7d27b5a4d03469e1fe8935cabc0b51158a69862ef993d6438499a206628dafc31c7904b9b95d1eeb31edf6583249cf54396793af68bdbc
 DIST opendkim-2.8.0.tar.gz 1175377 SHA256 a7b369b2182031d53257cbbac7ed99d70b00ebc442dfb832dc7d78d5d7b0c31c SHA512 35730e100307e5bdca9fd1c79e13371bd46e73b6a97f7244edaa4fe1bc693a0825ed2bab349155af11d472da7e0635e558f1c755468efdddeef073b3abc0041b WHIRLPOOL a85a69e31eef3eb4e37cc5c6285ef189367d4d4e3ceef6966ccde008d99d897ca862950316cec9e42ad0566fc9814e2cbd6a9f7dbfc2fdc2cf6909bfd83699b8
+DIST opendkim-2.8.1.tar.gz 1176501 SHA256 4fefda01a7fd7ecf37d3cd309c05ba714d97ac61a4eda145b6213bf8e4b536e8 SHA512 c6970ef51a822a6ae2eecca6704f95a307319dd087d9e1b4930f1a7b1f7db49043930f5ef1a62aaf3af0a366094339b2b811b2f585f9f4601c95cb382dc21af3 WHIRLPOOL 5d5ae9e703bbbddf6e0779f9625ed807074affffec03e07e32d41926fe5e1079f6928e4a937f38b7cef3950354fc4a3496dd237917a3e37aa9dd43f95448ea7d
diff --git a/mail-filter/opendkim/opendkim-2.8.1.ebuild b/mail-filter/opendkim/opendkim-2.8.1.ebuild
new file mode 100644
index 000000000000..f928e61fa43e
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.8.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.1.ebuild,v 1.1 2013/03/22 10:08:04 eras Exp $
+
+EAPI=5
+inherit eutils db-use autotools user
+
+# for betas
+#MY_P=${P/_b/.B}
+#S=${WORKDIR}/${PN}-2.8.0
+#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
+
+DESCRIPTION="A milter-based application to provide DKIM signing and verification"
+HOMEPAGE="http://opendkim.org"
+SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	ssl? ( >=dev-libs/openssl-0.9.8 )
+	berkdb? ( >=sys-libs/db-3.2 )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
+	!unbound? ( net-libs/ldns )
+	gnutls? ( >=net-libs/gnutls-2.11.7 )"
+
+RDEPEND="${DEPEND}
+	sys-process/psmisc"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+pkg_setup() {
+	enewgroup milter
+	# mail-milter/spamass-milter creates milter user with this home directory
+	# For consistency reasons, milter user must be created here with this home directory
+	# even though this package doesn't need a home directory for this user (#280571)
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
+	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
+	       -e 's:/etc/mail:/etc/opendkim:g' \
+	       -e 's:mailnull:milter:g' \
+	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		   stats/opendkim-reportstats || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	# don't go over the sock length and fail
+	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
+		opendkim/tests/t-sign-ss-macro-value-file.lua || die
+
+	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf=$(db_includedir)
+		myconf="--with-db-incdir=${myconf#-I}"
+		myconf+=" --enable-popauth"
+		myconf+=" --enable-query_cache"
+		myconf+=" --enable-stats"
+	fi
+	if use unbound; then
+		myconf+=" --with-unbound"
+	else
+		myconf+=" --with-ldns"
+	fi
+	if use ldap; then
+		myconf+=" $(use_with sasl)"
+	fi
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_enable poll) \
+		$(use_enable static-libs static) \
+		$(use_with gnutls) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--enable-adsp_lists \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-rpath \
+		--disable-live-testing \
+		--with-test-socket=/tmp/opendkim-S
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dosbin stats/opendkim-reportstats
+	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
+	dodir /etc/opendkim /var/lib/opendkim
+	fowners milter:milter /var/lib/opendkim
+
+	# default configuration
+	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+			> "${D}"/etc/opendkim/opendkim.conf
+		if use unbound; then
+			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
+		fi
+		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
+		if use berkdb; then
+			echo Statistics /var/lib/opendkim/stats.dat >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSION} ]]; then
+		elog "If you want to sign your mail messages and need some help"
+		elog "please run:"
+		elog "  emerge --config ${CATEGORY}/${PN}"
+		elog "It will help you create your key and give you hints on how"
+		elog "to configure your DNS and MTA."
+
+		ewarn "Make sure your MTA has r/w access to the socket file."
+		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
+		ewarn "to milter group or you can simply set UMask to 000."
+	fi
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector=${HOSTNAME}
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# generate the private and public keys
+		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+			-s ${selector} -d '(your domain)' && \
+			chown milter:milter \
+			"${ROOT}"etc/opendkim/"${selector}".private || \
+				{ eerror "Failed to create private and public keys." ; return 1; }
+		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /etc/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}"etc/opendkim/${selector}.txt
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+	einfo
+	einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 647699ec4d70..9954c970a7d4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,5 +1,5 @@
 DIST postfix-2.10.0.tar.gz 3826655 SHA256 4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b SHA512 88689c2b18aeecd6e363525955c8e3506acf7702eb7fabe148b72a149020c29a76b3f6ed57109380ebb2106cf798a0ce78d470bc4a104a8ecde6c1c4cd0da07e WHIRLPOOL b47559ff91651c699581757976628ab87ffda91ef85f2ccb86ddc4982de68fe7f6dedc419a2708e879969081a7d54681f88763500cd816aed51958bbe0880b70
-DIST postfix-2.11-20130317.tar.gz 3854685 SHA256 e66ce8dcc65960b5063f638b500ba70a8b38c991c4c49f2f4524f3e11265ddff SHA512 18c4ce438f7e7eb9ae4eebdab8fb18e86d01f16d8f3e435103cf1bca997746568696cf9d4cf1ff8369cbe58119de8e53a8035512253c2576c47751bca7725b7f WHIRLPOOL 10043a30dce6e00914e67b8946cc7e16c10a110bb112545cd98943200e0ba58a0fa6e47ff6de7b21165b41420623acbcf17c9fc1a6900279053911513a6c6b5d
+DIST postfix-2.11-20130319.tar.gz 3856178 SHA256 caaefe73cc6cddfe8b883723560b92c8271cf35abd8f7f103b91501c06aaee81 SHA512 2da1ede616440445e7e27b0516de52f58875d7ddc26e964fb748f41ae91342fe46b5920abaa2e25e8a07aa2f239a495391373b076f35e42e84fc7ba086a122d4 WHIRLPOOL c013cefe37cb03a4e7f8fa187836c6428d301541a9e138f4979364102a1d71fb22cfd9534cafea79e4cdb05a542b94228a042bd212b4d7a93e47a78177d0b58b
 DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 SHA512 f8932ae510805261b4a6c204bd4bba41d50e1833f87326b986ef174b51eb695cf0588d7d98850bb7b83ba56f1257406da072c423cc768f68d3723daf645b9490 WHIRLPOOL 7d7d619e0fa8375f1b653b9e1a0a2fa723929ab87db05445f2c2a73c213e91476d202806a439dd9792499e6a4d43c86f84133e90ffbd3bc9828ba1a925d8d11c
 DIST postfix-2.9.5.tar.gz 3761272 SHA256 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 SHA512 935f0eb653169d77d5902e1046d195d412a6c83271376b6450ddd647d250cc85d5ccd2427ad581f0d65bc57840db4c98f4976faedbe596573be590ea7433a1d4 WHIRLPOOL d57c29683ce389452c55d26ff8f2245f361a9cf6284ce6c2475fd2da1cdea7b9f9ca18376fef8c17f53e19cd29ce624dfd2b0eb5ff3983445ce4de8ea2fb736f
 DIST postfix-2.9.6.tar.gz 3767309 SHA256 790542a238f64d2620c26e787c98b07fb6e75a7620ce0584a7932b089dc5367c SHA512 ed53d835814368de9c6de7fe6d24cea36890273acbe62bbbb2c0b4a730765cf5662e8886d6095d8915d1774004c6b5cb278f640c81c63b564a8bfa3bee736912 WHIRLPOOL 24bbacada140e413ca628d9ad8b5eb55a0e3258dc9cef4bf407ebd8b8aac670379a785e60acd14c08f7a94f5058de899014e273634cd52a15a4c8003375a687d
diff --git a/mail-mta/postfix/postfix-2.11_pre20130317.ebuild b/mail-mta/postfix/postfix-2.11_pre20130319.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-2.11_pre20130317.ebuild
rename to mail-mta/postfix/postfix-2.11_pre20130319.ebuild
index 6250db9fa2d5..c3687ab6ce1e 100644
--- a/mail-mta/postfix/postfix-2.11_pre20130317.ebuild
+++ b/mail-mta/postfix/postfix-2.11_pre20130319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11_pre20130317.ebuild,v 1.1 2013/03/18 07:02:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11_pre20130319.ebuild,v 1.1 2013/03/22 10:00:18 eras Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
diff --git a/media-gfx/fbgrab/fbgrab-1.0-r1.ebuild b/media-gfx/fbgrab/fbgrab-1.0-r1.ebuild
new file mode 100644
index 000000000000..07a6794eca0f
--- /dev/null
+++ b/media-gfx/fbgrab/fbgrab-1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0-r1.ebuild,v 1.1 2013/03/21 21:27:08 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Framebuffer screenshot utility"
+HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
+SRC_URI="http://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libpng
+	 sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s/gcc/\$(CC)/" \
+		-e "s/-g//" \
+		-e "s/splint/#splint/" \
+		-e "s/-Wall/-Wall ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}/" \
+		Makefile || die "sed failed"
+
+		epatch "${FILESDIR}/${P}-zlib_h.patch"
+		epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.1.man ${PN}.1
+}
diff --git a/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch b/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
index 8318ab468994..c5eb2571c052 100644
--- a/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
+++ b/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
@@ -1,10 +1,10 @@
---- fbgrab.c
-+++ fbgrab.c
-@@ -22,6 +22,7 @@
- 
- #include <getopt.h>
+--- fbgrab.c.origin	2013-03-20 12:10:03.000000000 +0400
++++ fbgrab.c	2013-03-20 12:11:51.000000000 +0400
+@@ -24,6 +24,7 @@
  #include <sys/vt.h>   /* to handle vt changing */
-+#include <zlib.h>     /* Z_BEST_COMPRESSION */
  #include <png.h>      /* PNG lib */
  #include <linux/fb.h> /* to handle framebuffer ioctls */
++#include <zlib.h> /* Z_BEST_COMPRESSION */
  
+ #define	VERSION	"1.0 beta 1"
+ #define	DEFAULT_FB	"/dev/fb0"
diff --git a/media-gfx/fbgrab/metadata.xml b/media-gfx/fbgrab/metadata.xml
index d9cd2cad66c2..7db7ab9d1747 100644
--- a/media-gfx/fbgrab/metadata.xml
+++ b/media-gfx/fbgrab/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+<email>zlog.gentoo@gmail.com</email>
+<name>Mikle "Zlogene" Kolyada</name>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/fotoxx/files/fotoxx-13.03.patch b/media-gfx/fotoxx/files/fotoxx-13.03.patch
index ddfe81f7a7bf..5d38be124cb4 100644
--- a/media-gfx/fotoxx/files/fotoxx-13.03.patch
+++ b/media-gfx/fotoxx/files/fotoxx-13.03.patch
@@ -1,6 +1,6 @@
-diff -r -U1 fotoxx-12.11.orig/Makefile fotoxx-12.11/Makefile
---- fotoxx-12.11.orig/Makefile	2012-11-01 17:20:02.000000000 +0700
-+++ fotoxx-12.11/Makefile	2012-11-03 22:19:23.000000000 +0700
+diff -r -U1 fotoxx-13.03.orig/Makefile fotoxx-13.03/Makefile
+--- fotoxx-13.03.orig/Makefile	2013-03-01 13:33:56.000000000 +0700
++++ fotoxx-13.03/Makefile	2013-03-22 12:47:39.000000000 +0700
 @@ -5,4 +5,4 @@
  # defaults for parameters that may be pre-defined
 -CXXFLAGS ?= -O3 -g -Wall 
@@ -8,30 +8,32 @@ diff -r -U1 fotoxx-12.11.orig/Makefile fotoxx-12.11/Makefile
 +CXXFLAGS += -Wall -Wno-deprecated-declarations
 +LDFLAGS += -rdynamic
  PREFIX ?= /usr
-@@ -14,3 +14,3 @@
+@@ -15,3 +15,3 @@
  LOCALESDIR = $(SHAREDIR)/locales
 -DOCDIR = $(PREFIX)/share/doc/fotoxx
 +DOCDIR = $(PREFIX)/share/doc/$(PF)
  MANDIR = $(PREFIX)/share/man/man1
-@@ -18,3 +18,3 @@
+@@ -19,4 +19,4 @@
  
 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
+-LIBS = `pkg-config --libs gtk+-3.0`
 +CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
-@@ -75,5 +75,2 @@
++LIBS = `pkg-config --libs gtk+-3.0` -lpthread
+ 
+@@ -84,5 +84,2 @@
  	rm -f fotoxx.1.gz
 -	# menu (desktop) file
 -	cp -f desktop $(DESTDIR)$(MENUFILE)
 -	xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
  
-@@ -84,3 +81,2 @@
+@@ -93,3 +90,2 @@
  	rm -f  $(DESTDIR)$(MANDIR)/fotoxx.1.gz
 -	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
  	rm -f  $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-12.11.orig/zfuncs.cc fotoxx-12.11/zfuncs.cc
---- fotoxx-12.11.orig/zfuncs.cc	2012-11-01 17:20:02.000000000 +0700
-+++ fotoxx-12.11/zfuncs.cc	2012-11-03 22:21:34.000000000 +0700
-@@ -3278,3 +3278,3 @@
+diff -r -U1 fotoxx-13.03.orig/zfuncs.cc fotoxx-13.03/zfuncs.cc
+--- fotoxx-13.03.orig/zfuncs.cc	2013-03-01 13:33:56.000000000 +0700
++++ fotoxx-13.03/zfuncs.cc	2013-03-22 12:46:16.000000000 +0700
+@@ -3917,3 +3917,3 @@
     strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
 -   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
 +   strncatv(zdocdir,199,work,"/share/doc/",PF,null);                       //  /prefix/share/doc/$(PF)
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index c389f84ce855..1c81a101b0a9 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -1,2 +1,3 @@
 DIST pinta-1.3.tar.gz 1131567 SHA256 514103d11c6fe8de5f09c45de77d5c8c5403d13198fd7716930abb08e9d0b5a2 SHA512 107f3cb26ea8aa0ccf53ba6ccf817243b94fb2019aa687186fe7be118a2967f4cb9dae5fd84aab1943ef108553d23e5f9c500dc00df59e1974ddccde51f799b3 WHIRLPOOL cb70c83e98bf1950da7d9c64e332a217ce972c9f27c05c2bde05c63fa15bc9de5388cd7190d3f0ae32734f4fe86362634d080ae875afa74126ffdcda65b81314
 DIST pinta-1.4.tar.gz 1230765 SHA256 fde40f78560aab5a891bf499396db099b86bbd365c1eb81df480b35b4d37d8bb SHA512 7a1abd62a10569aa572ab956a860d1813104e4cc35c800798d78085ff2c66f4bf0583f8270d279d1342959c86cdc9383b93e004e1ee8e96cfc99de45bc9fe79f WHIRLPOOL 71101a513748d8cdd0a46ab2c115b1719cb987d5efc6c1ceb24e4a8a0b12e898218209f310887564279065ac8c69a6e349799c7300f1f0bc2a53e8e15ba9d401
+DIST pinta-1.5-preview-20121118.tar.gz 2373151 SHA256 b7ee93a171d24a37237e5d975a2756bd566b5f2c7e5666e591cf42b1aa278c4d SHA512 a954a7556e7e852e3d7bb6eb6dfcf207ed5b22a42d7f278c38815be2d6feacfd006e945f675d86ca923c4cddbf4b2e39e85e1b24bb7d84be6d87397c1e29a604 WHIRLPOOL fa848ef794fb7c5a90fac2d7a6ad3d5e4fe4f3c1d4ca38fcbabbdedc481058fc90836e8e777f8bc76faec0a864dd86834784ed846838f390bf598be8b659348d
diff --git a/media-gfx/pinta/pinta-1.5_pre20121118.ebuild b/media-gfx/pinta/pinta-1.5_pre20121118.ebuild
new file mode 100644
index 000000000000..d82c9d801448
--- /dev/null
+++ b/media-gfx/pinta/pinta-1.5_pre20121118.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-1.5_pre20121118.ebuild,v 1.1 2013/03/21 17:03:38 hasufell Exp $
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils mono
+
+DESCRIPTION="Simple Painting for Gtk"
+HOMEPAGE="http://pinta-project.com"
+SRC_URI="mirror://github/PintaProject/Pinta/${P/_pre/-preview-}.tar.gz"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-dotnet/atk-sharp:2
+	dev-dotnet/gdk-sharp:2
+	dev-dotnet/glib-sharp:2
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/mono-addins[gtk]
+	dev-dotnet/pango-sharp:2
+	dev-lang/mono"
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[X]
+	x11-libs/gdk-pixbuf[X,jpeg,tiff]
+	x11-themes/gnome-icon-theme"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P%_pre*}
+
+src_prepare() {
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/po ; echo *.po) ; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				sed -i -e "/po\/${i%.po}.po/{N;N;d;}" Pinta.Install.proj || die
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/pinta/pinta-9999.ebuild b/media-gfx/pinta/pinta-9999.ebuild
index c74ecea91194..f1e3d2b0d13c 100644
--- a/media-gfx/pinta/pinta-9999.ebuild
+++ b/media-gfx/pinta/pinta-9999.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-9999.ebuild,v 1.5 2013/02/07 22:27:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-9999.ebuild,v 1.6 2013/03/21 17:03:38 hasufell Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools fdo-mime git-2 mono
+inherit autotools fdo-mime gnome2-utils git-2 mono
 
 DESCRIPTION="Simple Painting for Gtk"
 HOMEPAGE="http://pinta-project.com"
-SRC_URI=""
-
 EGIT_REPO_URI="git://github.com/PintaProject/Pinta.git"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
 COMMON_DEPEND="dev-dotnet/atk-sharp:2
 	dev-dotnet/gdk-sharp:2
@@ -30,20 +27,32 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	virtual/pkgconfig"
 
 src_prepare() {
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/po ; echo *.po) ; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				sed -i -e "/po\/${i%.po}.po/{N;N;d;}" Pinta.Install.proj || die
+			fi
+		done
+	fi
 	eautoreconf
-	intltoolize --copy --automake --force || die "intltoolize failed"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-gfx/shotwell/shotwell-0.14.0.ebuild b/media-gfx/shotwell/shotwell-0.14.0-r1.ebuild
similarity index 97%
rename from media-gfx/shotwell/shotwell-0.14.0.ebuild
rename to media-gfx/shotwell/shotwell-0.14.0-r1.ebuild
index 7071643c42c5..a7779b1dfee0 100644
--- a/media-gfx/shotwell/shotwell-0.14.0.ebuild
+++ b/media-gfx/shotwell/shotwell-0.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.14.0.ebuild,v 1.1 2013/03/19 12:20:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.14.0-r1.ebuild,v 1.1 2013/03/21 16:39:47 jlec Exp $
 
 EAPI=5
 
@@ -63,6 +63,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		--disable-desktop-update
 		--disable-icon-update
+		--prefix=/usr
 		--lib=$(get_libdir)"
 }
 
diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild
index ca58b0d2865b..c46856e30eb9 100644
--- a/media-libs/freeimage/freeimage-3.15.4.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.1 2013/02/19 20:01:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.2 2013/03/21 15:48:09 bicatali Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch b/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch
new file mode 100644
index 000000000000..83cae475cd10
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.0.0-underlinking.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/462494
+
+--- IlmBase/IlmThread/Makefile.am
++++ IlmBase/IlmThread/Makefile.am
+@@ -14,7 +14,7 @@
+ if LIB_SUFFIX_EXISTS
+ libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@
+ endif
+-libIlmThread_la_LIBADD = ../Iex/libIex.la
++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS)
+ 
+ libIlmThreadincludedir = $(includedir)/OpenEXR
+ 
diff --git a/media-libs/ilmbase/ilmbase-2.0.0.ebuild b/media-libs/ilmbase/ilmbase-2.0.0.ebuild
index 800f451b9885..5cbb1e858125 100644
--- a/media-libs/ilmbase/ilmbase-2.0.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ilmbase-2.0.0.ebuild,v 1.3 2013/03/21 03:43:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ilmbase/ilmbase-2.0.0.ebuild,v 1.4 2013/03/21 15:49:17 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils #libtool
@@ -18,6 +18,7 @@ S=${WORKDIR}/openexr-${PV}/IlmBase
 
 src_prepare() {
 	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	epatch "${FILESDIR}"/${P}-underlinking.patch
 	eautoreconf
 #	elibtoolize
 }
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 92a947ceb417..aec3d683c2ca 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,2 +1,3 @@
 DIST libmatroska-1.2.0.tar.bz2 80394 SHA256 8b68ed72c4563363fc17517d0fe0862d6a51747870f51ee7d1bb362274a5d44f SHA512 59fe80146dbd287f435fb477f2e589b8e5659fe5abb1a0869b1f6ca4b85e281431b7a18f1e3728d2b406b141039ab1b5e6a1a247a2bc23a7e64e7b5e67e29374 WHIRLPOOL e6706ca647306784a4e056e49db86375b48968e05fe77b7bfbea54c3c2d22adf28c52b88a9604ea9f1251f9f050e3b34cedbe2d415a01b8b216a52064c1934e9
 DIST libmatroska-1.3.0.tar.bz2 80542 SHA256 5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69 SHA512 adbb5f85b0e55e39b6a5f629bac82041fc8d1ac0cdf8aecc6ea9966320c35aee4fe9437ca620229b7e15d3d8f7c2d4cf1beb71280789e1e6700087b4d2ec0c8a WHIRLPOOL 341e5b7568f1d609c98e1b164ca5eb4b1a27db33e1218982a48197975b66c46614a2d76b659a094d6a878f491a1a2400bef44ccceb19ca1fd10bdecc4a471fc2
+DIST libmatroska-1.4.0.tar.gz 98007 SHA256 62c907e7b57ef0748faa1c6304fd91a977de489896bd16c05e918f6e35247c25 SHA512 e35d1b4a0fee7e51cce353705bed81cdfc09b7212b3add4eaa1dc4b0ac606bcd3977bef47e62a96b8e9c76050aa927c841813b6c6224a9fbcef2f329649414ac WHIRLPOOL 2463f6f7da27f1460582e8e5a8018259c23560abbe054e68432a63dfef4f1f3238d26862d4cfbd82380843df21c92d265fd93f104ea2848c38f43be3ee23a8fa
diff --git a/media-libs/libmatroska/libmatroska-1.4.0.ebuild b/media-libs/libmatroska/libmatroska-1.4.0.ebuild
new file mode 100644
index 000000000000..db983b0f95bc
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.4.0.ebuild,v 1.1 2013/03/21 09:11:22 radhermit Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
+SRC_URI="https://github.com/Matroska-Org/libmatroska/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/6" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND=">=dev-libs/libebml-1.3.0:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-release-${PV}/make/linux
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.0-respectflags.patch"
+}
+
+src_compile() {
+	local targets="sharedlib"
+	use static-libs && targets+=" staticlib"
+
+	#fixes locale for gcc3.4.0 to close bug 52385
+	append-flags $(test-flags -finput-charset=ISO8859-15)
+
+	emake PREFIX="${EPREFIX}"/usr \
+		LIBEBML_INCLUDE_DIR="${EPREFIX}"/usr/include/ebml \
+		LIBEBML_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		${targets}
+}
+
+src_install() {
+	local targets="install_sharedlib install_headers"
+	use static-libs && targets+=" install_staticlib"
+
+	emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) ${targets}
+	dodoc "${WORKDIR}"/${PN}-release-${PV}/ChangeLog
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.1.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..b4a94414d0d4
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.1.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.1.0-r1.ebuild,v 1.1 2013/03/21 09:25:13 radhermit Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="bzip2 debug lzo pch qt4 wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.3.0:=
+	>=media-libs/libmatroska-1.4.0:=
+	>=dev-libs/boost-1.46.0
+	dev-libs/pugixml
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	>=sys-devel/gcc-4.6
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	lzo? ( dev-libs/lzo )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	# http://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
+		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use wxwidgets ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable bzip2 bz2) \
+		$(use_enable debug) \
+		$(use_enable lzo) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwidgets) \
+		$(usex pch "" --disable-precompiled-headers) \
+		${myconf} \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--without-curl
+}
+
+src_compile() {
+	./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}
diff --git a/media-video/mplayer/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild
index bac6122c93b3..276e9500a12f 100644
--- a/media-video/mplayer/mplayer-1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.20 2013/02/08 13:41:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.21 2013/03/21 07:08:36 ssuominen Exp $
 
 EAPI=4
 
@@ -273,6 +273,9 @@ src_prepare() {
 			"${FILESDIR}/${P}-planaraudio.patch" \
 			"${FILESDIR}/${P}-missingbreak.patch"
 	fi
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
 }
 
 src_configure() {
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 8afc5edae071..4f1dddeb6c5d 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.140 2013/02/14 21:01:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.141 2013/03/21 07:08:36 ssuominen Exp $
 
 EAPI=4
 
@@ -254,6 +254,9 @@ src_prepare() {
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
 
 	base_src_prepare
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
 }
 
 src_configure() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f562cc3e9514..d41389bd2e8a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 21 Mar 2013 06:36:53 +0000
+Fri, 22 Mar 2013 15:36:56 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f562cc3e9514..d41389bd2e8a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 21 Mar 2013 06:36:53 +0000
+Fri, 22 Mar 2013 15:36:56 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-python-20091230 b/metadata/md5-cache/app-admin/eselect-python-20091230
index 87b226991f7e..31c7a18a6895 100644
--- a/metadata/md5-cache/app-admin/eselect-python-20091230
+++ b/metadata/md5-cache/app-admin/eselect-python-20091230
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst preinst setup unpack
 DEPEND=>=app-admin/eselect-1.2.3 sys-devel/autoconf >=sys-devel/gcc-3.4
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=1
-HOMEPAGE=http://www.gentoo.org
+HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-python-20091230.tar.bz2
 _eclasses_=multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=4ceb784821a0b06ea1d2fb866c708572
+_md5_=ccc3665e0bd7baf11fa9824bf73ed266
diff --git a/metadata/md5-cache/app-admin/eselect-python-20100321 b/metadata/md5-cache/app-admin/eselect-python-20100321
index 1d848031a22e..1cd14f1a4253 100644
--- a/metadata/md5-cache/app-admin/eselect-python-20100321
+++ b/metadata/md5-cache/app-admin/eselect-python-20100321
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst preinst setup unpack
 DEPEND=>=app-admin/eselect-1.2.3 sys-devel/autoconf >=sys-devel/gcc-3.4
 DESCRIPTION=Eselect module for management of multiple Python versions
 EAPI=1
-HOMEPAGE=http://www.gentoo.org
+HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-python-20100321.tar.bz2
 _eclasses_=multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=0c526d77eb02783dc3bbe8963f14a878
+_md5_=806175a18a881d0ef9dba43c6e0df5f6
diff --git a/metadata/md5-cache/app-admin/eselect-python-20111108 b/metadata/md5-cache/app-admin/eselect-python-20111108
index 7d72c0df28ee..47b832c2414b 100644
--- a/metadata/md5-cache/app-admin/eselect-python-20111108
+++ b/metadata/md5-cache/app-admin/eselect-python-20111108
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst preinst unpack
 DESCRIPTION=Eselect module for management of multiple Python versions
-HOMEPAGE=http://www.gentoo.org
+HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-python-20111108.tar.bz2
-_md5_=1140d775f2e121d6f0ce104037e6510d
+_md5_=d448a7a2bddaf29a1662e3405476f35c
diff --git a/metadata/md5-cache/app-admin/eselect-python-99999999 b/metadata/md5-cache/app-admin/eselect-python-99999999
index 9b2ba65f1cbe..5571ac32a32e 100644
--- a/metadata/md5-cache/app-admin/eselect-python-99999999
+++ b/metadata/md5-cache/app-admin/eselect-python-99999999
@@ -1,9 +1,9 @@
-DEFINED_PHASES=install postinst preinst unpack
-DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+DEFINED_PHASES=install postinst unpack
+DEPEND=sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=Eselect module for management of multiple Python versions
-HOMEPAGE=http://www.gentoo.org
+HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44c5323bd563a93330f46f75b6311999
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=336b8f196174eec5248e9f489f47f4a1
diff --git a/metadata/md5-cache/app-admin/puppet-3.1.1-r1 b/metadata/md5-cache/app-admin/puppet-3.1.1-r1
new file mode 100644
index 000000000000..a01401ea3bb8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-3.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/hiera[ruby_targets_ruby18] >=dev-ruby/facter-1.6.2[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DESCRIPTION=A system automation and configuration management software
+EAPI=4
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ruby_targets_ruby18? ( dev-ruby/hiera[ruby_targets_ruby18] >=dev-ruby/facter-1.6.2[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.1.1.tar.gz
+_eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_md5_=afde9a9fcf4df5ccf525c1964688ead5
diff --git a/metadata/md5-cache/app-admin/ulogd-1.23-r1 b/metadata/md5-cache/app-admin/ulogd-1.23-r1
index 02ebf68b49ac..8093e604023b 100644
--- a/metadata/md5-cache/app-admin/ulogd-1.23-r1
+++ b/metadata/md5-cache/app-admin/ulogd-1.23-r1
@@ -9,4 +9,4 @@ RDEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgr
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-1.23.tar.bz2 mirror://gentoo/ulogd-glsa-200701.patch.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4cfe36a7b7363a0008d0abd82bd203b8
+_md5_=13543669fc7cd64322a907d6f9ed1b93
diff --git a/metadata/md5-cache/app-admin/ulogd-1.24-r2 b/metadata/md5-cache/app-admin/ulogd-1.24-r2
index 76d83f54a912..cfe088d55080 100644
--- a/metadata/md5-cache/app-admin/ulogd-1.24-r2
+++ b/metadata/md5-cache/app-admin/ulogd-1.24-r2
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgr
 SLOT=0
 SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-1.24.tar.bz2 mirror://gentoo/ulogd-glsa-200805.patch.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9dabbefe2b5adb1c50a416d40bdd25af
+_md5_=7030205d6f4e4f60e4d0b28b0cf2b9ef
diff --git a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.2.0 b/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.2.0
new file mode 100644
index 000000000000..215b2683db1c
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DESCRIPTION=Phoronix's comprehensive, cross-platform testing and benchmark suite
+EAPI=4
+HOMEPAGE=http://www.phoronix-test-suite.com
+IUSE=bash-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+PDEPEND=bash-completion? ( app-shells/bash-completion )
+RDEPEND=dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip] dev-php/pecl-ps bash-completion? ( app-admin/eselect )
+SLOT=0
+SRC_URI=http://www.phoronix-test-suite.com/download.php?file=phoronix-test-suite-4.2.0 -> phoronix-test-suite-4.2.0.tar.gz
+_eclasses_=bash-completion	003731da0df19d26955927bd534f3058	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=880cd0389165d23ad3cfd2e87b0080e8
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999 b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
index 40d672b5c5f4..7b1fb8d9707f 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-g
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm
+IUSE=acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND 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 ) acl? ( virtual/acl ) 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? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	bzr	876798528c0cd872742b74bf784738cf	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1247b6be577dbae48bf5aa24c32f8992
+_md5_=4f6b8ef280f84e1875ca0ee7a56c6077
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.68 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.68-r1
similarity index 71%
rename from metadata/md5-cache/app-text/linuxdoc-tools-0.9.68
rename to metadata/md5-cache/app-text/linuxdoc-tools-0.9.68-r1
index 1866e7b1a260..629b4e6fb3a7 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.68
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.68-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=app-text/openjade app-text/opensp app-text/sgml-common dev-texlive/texlive-fontsrecommended >=dev-lang/perl-5.004 sys-apps/gawk sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r2
+DEPEND=app-text/openjade app-text/opensp app-text/sgml-common dev-texlive/texlive-fontsrecommended dev-lang/perl sys-apps/gawk sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
-EAPI=2
+EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/l/linuxdoc-tools.html
 KEYWORDS=~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd
 LICENSE=MIT SGMLUG
-RDEPEND=app-text/openjade app-text/opensp app-text/sgml-common dev-texlive/texlive-fontsrecommended >=dev-lang/perl-5.004 sys-apps/gawk sys-apps/groff virtual/latex-base
+RDEPEND=app-text/openjade app-text/opensp app-text/sgml-common dev-texlive/texlive-fontsrecommended dev-lang/perl sys-apps/gawk sys-apps/groff virtual/latex-base
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.68.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cdcd4d3727a4ca1a951caab02e6d7058
+_md5_=5878b7b3e2a6cd1c401e64bc22eb3694
diff --git a/metadata/md5-cache/app-text/poppler-0.22.2-r1 b/metadata/md5-cache/app-text/poppler-0.22.2-r1
index 6507f0f669c1..2af4f1bfa854 100644
--- a/metadata/md5-cache/app-text/poppler-0.22.2-r1
+++ b/metadata/md5-cache/app-text/poppler-0.22.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=5
 HOMEPAGE=http://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) lcms? ( media-libs/lcms:2 ) png? ( >=media-libs/libpng-1.4:0 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) tiff? ( media-libs/tiff:0 ) !dev-libs/poppler !dev-libs/poppler-glib !dev-libs/poppler-qt3 !dev-libs/poppler-qt4 !app-text/poppler-utils cjk? ( >=app-text/poppler-data-0.4.4 )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=http://poppler.freedesktop.org/poppler-0.22.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=69bd80e66a99c97c7bc4790cc148d97c
+_md5_=d7b3a2d4379e2c70d23d81c0e0a2633b
diff --git a/metadata/md5-cache/dev-db/mongodb-2.4.0 b/metadata/md5-cache/dev-db/mongodb-2.4.0
index 206b94fd2319..588044bbecfd 100644
--- a/metadata/md5-cache/dev-db/mongodb-2.4.0
+++ b/metadata/md5-cache/dev-db/mongodb-2.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=dev-lang/v8 >=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools net-libs/libpcap app-arch/snappy sys-libs/readline sys-libs/ncurses >=dev-util/scons-1.2.0
+DEPEND=dev-lang/v8 >=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools net-libs/libpcap app-arch/snappy ssl? ( dev-libs/openssl ) sys-libs/readline sys-libs/ncurses >=dev-util/scons-1.2.0
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=4
 HOMEPAGE=http://www.mongodb.org
@@ -7,8 +7,8 @@ IUSE=mms-agent sharedclient spidermonkey ssl static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 Apache-2.0
 PDEPEND=mms-agent? ( dev-python/pymongo )
-RDEPEND=dev-lang/v8 >=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools net-libs/libpcap app-arch/snappy
+RDEPEND=dev-lang/v8 >=dev-libs/boost-1.50[threads(+)] dev-libs/libpcre[cxx] dev-util/google-perftools net-libs/libpcap app-arch/snappy ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://downloads.mongodb.org/src/mongodb-src-r2.4.0.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20130319-10gen-mms-agent.zip )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cf29ccb3e31ad59d7d83c6509ed31a3a
+_md5_=90f487363045f557da0fa60ee586cb8a
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.2.3 b/metadata/md5-cache/dev-db/pgpool2-3.2.3
new file mode 100644
index 000000000000..a8e4104f495b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-3.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=dev-db/postgresql-base memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl ) sys-devel/bison !!dev-db/pgpool || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=4
+HOMEPAGE=http://www.pgpool.net/
+IUSE=memcached pam ssl static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-db/postgresql-base memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.2.3.tar.gz -> pgpool-II-3.2.3.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b49b1d2aef3aae5d4358f7047d72329e
diff --git a/metadata/md5-cache/dev-lang/php-5.5.0_alpha2 b/metadata/md5-cache/dev-lang/php-5.5.0_alpha2
deleted file mode 100644
index 4108557a9601..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.0_alpha2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-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=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-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 selinux +session sharedmem +simplexml snmp soap sockets spell sqlite 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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-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 ) sqlite? ( >=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 fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://downloads.php.net/dsp/php-5.5.0alpha2.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.5-r0.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	cf83655b19ed98f9ea3b44f4572b51a3	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=729d4b01f0a4c48c92e828ce8f65038a
diff --git a/metadata/md5-cache/dev-lang/php-5.5.0_alpha4 b/metadata/md5-cache/dev-lang/php-5.5.0_alpha4
deleted file mode 100644
index a162c2b4dbc4..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.0_alpha4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-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 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-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=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-EAPI=5
-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 selinux +session sharedmem +simplexml snmp soap sockets spell sqlite 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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-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 ) sqlite? ( >=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 fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://downloads.php.net/dsp/php-5.5.0alpha4.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.5-r0.tar.bz2
-_eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	cf83655b19ed98f9ea3b44f4572b51a3	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=49be15cce48409d3fd70ff26c476a6d7
diff --git a/metadata/md5-cache/dev-lang/php-5.5.0_alpha6 b/metadata/md5-cache/dev-lang/php-5.5.0_beta1
similarity index 93%
rename from metadata/md5-cache/dev-lang/php-5.5.0_alpha6
rename to metadata/md5-cache/dev-lang/php-5.5.0_beta1
index 066a48ab8a43..b9e50fa65102 100644
--- a/metadata/md5-cache/dev-lang/php-5.5.0_alpha6
+++ b/metadata/md5-cache/dev-lang/php-5.5.0_beta1
@@ -3,13 +3,13 @@ DEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.32[unicode] apache2? (
 DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
 EAPI=5
 HOMEPAGE=http://php.net/
-IUSE=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 +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
+IUSE=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 opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite 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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.32[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 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-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 fpm? ( selinux? ( sec-policy/selinux-phpfpm ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.5
-SRC_URI=http://downloads.php.net/dsp/php-5.5.0alpha6.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.5-r0.tar.bz2
+SRC_URI=http://downloads.php.net/dsp/php-5.5.0beta1.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.5-r1.tar.bz2
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	cf83655b19ed98f9ea3b44f4572b51a3	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=88742bcff7c33d701aad4beefddc99b8
+_md5_=4954d0cd5f6841f71279669fbdc0df24
diff --git a/metadata/md5-cache/dev-lang/python-2.5.4-r5 b/metadata/md5-cache/dev-lang/python-2.5.4-r5
index 336504fe85ee..4e5268b56c0d 100644
--- a/metadata/md5-cache/dev-lang/python-2.5.4-r5
+++ b/metadata/md5-cache/dev-lang/python-2.5.4-r5
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=1
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2.2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=>=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) doc? ( dev-python/python-docs:2.5 ) !build? ( app-misc/mime-types )
 SLOT=2.5
 SRC_URI=http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2 mirror://gentoo/python-gentoo-patches-2.5.4-r3.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6a73cb510ad134af51a775df6fe6cbd3
+_md5_=c8269317c4df6d9b18a8c19bde68ee78
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8-r1 b/metadata/md5-cache/dev-lang/python-2.6.8-r1
index 60bbae07dc56..eaaccd121f4e 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.8-r1
+++ b/metadata/md5-cache/dev-lang/python-2.6.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=2
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 )
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ec4d9bc0f10e8e89d1eb0054372948a8
+_md5_=9cfdfa47cd08bf504dac6c23a0a5b6f2
diff --git a/metadata/md5-cache/dev-lang/python-2.7.3-r3 b/metadata/md5-cache/dev-lang/python-2.7.3-r3
index 43cd79418f79..6135600959ab 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.3-r3
+++ b/metadata/md5-cache/dev-lang/python-2.7.3-r3
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=2
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2 mirror://gentoo/python-gentoo-patches-2.7.3-1.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d4ee1389ae2e16baf419582e5e73468
+_md5_=3c9099f7f0dcc34976370281bc4afc89
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5-r1 b/metadata/md5-cache/dev-lang/python-3.1.5-r1
index 7021fd297a41..3b801514ecb5 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.1.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=3
 HOMEPAGE=http://www.python.org/
 IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 )
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1da0e178d1c644557dda9c1eb5220b10
+_md5_=e673f8320c8ec924f98c9b1ab2760e60
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3-r2 b/metadata/md5-cache/dev-lang/python-3.2.3-r2
index a5c9553acd00..52c9d25421de 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3-r2
+++ b/metadata/md5-cache/dev-lang/python-3.2.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=3
 HOMEPAGE=http://www.python.org/
 IUSE=build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/eselect-python app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 )
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16abfc9bf2fe4668103b183013f3fc32
+_md5_=64d9a7fef15496d18955c4ff08cb92c5
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.0 b/metadata/md5-cache/dev-libs/libebml-1.3.0
new file mode 100644
index 000000000000..a0b4d0901253
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Extensible binary format library (kinda like XML)
+EAPI=5
+HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libebml/
+IUSE=debug static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2.1
+SLOT=0/4
+SRC_URI=https://github.com/Matroska-Org/libebml/archive/release-1.3.0.tar.gz -> libebml-1.3.0.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6a64538f1404ca3637c70fb9c4309ed0
diff --git a/metadata/md5-cache/dev-libs/quazip-0.5.1-r1 b/metadata/md5-cache/dev-libs/quazip-0.5.1-r1
index c840b22141f5..dc663e0e7e27 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.5.1-r1
+++ b/metadata/md5-cache/dev-libs/quazip-0.5.1-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib[minizip] dev-qt/qtcore:4
 SLOT=0
 SRC_URI=mirror://sourceforge/quazip/quazip-0.5.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5ae8b8a527ecf895bdbd72bc27b12adc
+_md5_=1e788818318f3aa2ff3fd4ca58071d51
diff --git a/metadata/md5-cache/dev-python/bitstring-2.2.0 b/metadata/md5-cache/dev-python/bitstring-2.2.0
deleted file mode 100644
index 226cde12fc2c..000000000000
--- a/metadata/md5-cache/dev-python/bitstring-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=app-arch/unzip dev-lang/python
-DESCRIPTION=A pure Python module for creation and analysis of binary data
-EAPI=3
-HOMEPAGE=http://python-bitstring.googlecode.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/unzip dev-lang/python
-SLOT=0
-SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-2.2.0.zip
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=7e6c0bd9832bcac873227b40c868cc7c
diff --git a/metadata/md5-cache/dev-python/bitstring-3.0.1 b/metadata/md5-cache/dev-python/bitstring-3.0.1
deleted file mode 100644
index 6fd351ce8f63..000000000000
--- a/metadata/md5-cache/dev-python/bitstring-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=app-arch/unzip dev-lang/python
-DESCRIPTION=A pure Python module for creation and analysis of binary data
-EAPI=3
-HOMEPAGE=http://python-bitstring.googlecode.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/unzip dev-lang/python
-SLOT=0
-SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-3.0.1.zip
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=fbb5b126da6c0846cd4caf8725de0d5d
diff --git a/metadata/md5-cache/dev-python/bitstring-3.0.2 b/metadata/md5-cache/dev-python/bitstring-3.0.2
deleted file mode 100644
index bb003379549a..000000000000
--- a/metadata/md5-cache/dev-python/bitstring-3.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=app-arch/unzip dev-lang/python
-DESCRIPTION=A pure Python module for creation and analysis of binary data
-EAPI=3
-HOMEPAGE=http://python-bitstring.googlecode.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/unzip dev-lang/python
-SLOT=0
-SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-3.0.2.zip
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=f14836555b0957e8f48da7b0a8ed5cce
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.0-r1 b/metadata/md5-cache/dev-python/bitstring-3.1.0-r1
new file mode 100644
index 000000000000..abfcfffd75c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DESCRIPTION=A pure Python module for creation and analysis of binary data
+EAPI=5
+HOMEPAGE=http://python-bitstring.googlecode.com/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-3.1.0.zip
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b0a4b48054ee0fad434e92a1d612b661
diff --git a/metadata/md5-cache/dev-python/kombu-1.0.4 b/metadata/md5-cache/dev-python/kombu-1.0.4
index 7ca171363c8e..20a87b9dd8f9 100644
--- a/metadata/md5-cache/dev-python/kombu-1.0.4
+++ b/metadata/md5-cache/dev-python/kombu-1.0.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/anyjson-0.3.3 >=dev-python/amqplib-1.0.2 test? ( dev-python/nose-cover3 dev-python/mock virtual/python-unittest2 dev-python/simplejson dev-python/anyjson dev-python/redis-py dev-python/pymongo dev-python/msgpack ) doc? ( dev-python/sphinx dev-python/django dev-python/beanstalkc dev-python/couchdb-python ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
+DEPEND=>=dev-python/anyjson-0.3.3 >=dev-python/amqplib-0.6 test? ( dev-python/nose-cover3 dev-python/mock virtual/python-unittest2 dev-python/simplejson dev-python/anyjson dev-python/redis-py dev-python/pymongo dev-python/msgpack ) doc? ( dev-python/sphinx dev-python/django dev-python/beanstalkc dev-python/couchdb-python ) dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* ) test? ( dev-python/nose )
 DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=4
 HOMEPAGE=http://pypi.python.org/pypi/kombu https://github.com/celery/kombu
 IUSE=doc examples test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/anyjson-0.3.3 >=dev-python/amqplib-1.0.2 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
+RDEPEND=>=dev-python/anyjson-0.3.3 >=dev-python/amqplib-0.6 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-1.0.4.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=13b1b2da3474bba692e4f80c888558ee
+_md5_=d5b5f35a69e10bb3f95837780a5c5543
diff --git a/metadata/md5-cache/dev-python/milk-0.4.3 b/metadata/md5-cache/dev-python/milk-0.4.3
deleted file mode 100644
index e275087349d9..000000000000
--- a/metadata/md5-cache/dev-python/milk-0.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools test? ( dev-python/milksets sci-libs/scipy ) =dev-lang/python-2*
-DESCRIPTION=Machine learning toolkit in Python
-EAPI=4
-HOMEPAGE=http://luispedro.org/software/milk
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/numpy =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/m/milk/milk-0.4.3.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=53354cdd0646b9b284d5a3e2aeba6042
diff --git a/metadata/md5-cache/dev-python/milk-0.5.1 b/metadata/md5-cache/dev-python/milk-0.5.1
new file mode 100644
index 000000000000..e3d7510efb64
--- /dev/null
+++ b/metadata/md5-cache/dev-python/milk-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools dev-cpp/eigen:3 test? ( dev-python/milksets sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Machine learning toolkit in Python
+EAPI=5
+HOMEPAGE=http://luispedro.org/software/milk
+IUSE=test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/numpy python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://pypi/m/milk/milk-0.5.1.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1f5471f0b365e38df9b87aa5e943a181
diff --git a/metadata/md5-cache/dev-python/mozrunner-5.15 b/metadata/md5-cache/dev-python/mozrunner-5.15
new file mode 100644
index 000000000000..cc0def0f8e35
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mozrunner-5.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-python/simplejson >=dev-python/mozinfo-0.3.3 >=dev-python/mozprocess-0.7 >=dev-python/mozprofile-0.4 dev-python/setuptools =dev-lang/python-2*
+DESCRIPTION=Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)
+EAPI=3
+HOMEPAGE=http://pypi.python.org/pypi/mozrunner
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-python/simplejson >=dev-python/mozinfo-0.3.3 >=dev-python/mozprocess-0.7 >=dev-python/mozprofile-0.4 dev-python/setuptools =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/m/mozrunner/mozrunner-5.15.tar.gz
+_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=6cb728881976a1070f5e7b5812d07f01
diff --git a/metadata/md5-cache/dev-python/prettytable-0.6-r1 b/metadata/md5-cache/dev-python/prettytable-0.6-r1
new file mode 100644
index 000000000000..43f3aa3978da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prettytable-0.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DESCRIPTION=A Python library for easily displaying tabular data in a visually appealing ASCII table format.
+EAPI=5
+HOMEPAGE=https://code.google.com/p/prettytable/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/setuptools python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=https://prettytable.googlecode.com/files/prettytable-0.6.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=20d8c144f860e3ae4b584d60810a4e15
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-0.2.1-r1 b/metadata/md5-cache/dev-python/python-keystoneclient-0.2.1-r1
deleted file mode 100644
index d1967df115a7..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-0.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=A client for the OpenStack Keystone API
-EAPI=5
-HOMEPAGE=https://github.com/openstack/python-keystoneclient
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/httplib2 dev-python/prettytable dev-python/requests dev-python/simplejson[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-0.2.1.tar.gz
-_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d79f2daef62d5afa645daf36dd8cdfda
diff --git a/metadata/md5-cache/dev-python/shiboken-1.1.2-r1 b/metadata/md5-cache/dev-python/shiboken-1.1.2-r1
index 8a1b60d60df1..129f86cf3062 100644
--- a/metadata/md5-cache/dev-python/shiboken-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/shiboken-1.1.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtcore-4.7.
 SLOT=0
 SRC_URI=http://www.pyside.org/files/shiboken-1.1.2.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=14fa60404300ef1392571e6d893c8b0c
+_md5_=478fe18bfa6f91aa8e2dbb6c7687eb6f
diff --git a/metadata/md5-cache/dev-python/vatnumber-1.0-r1 b/metadata/md5-cache/dev-python/vatnumber-1.0-r1
new file mode 100644
index 000000000000..2631771a8e69
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vatnumber-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=vies? ( dev-python/suds ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( dev-python/suds ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Module to validate VAT numbers
+EAPI=5
+HOMEPAGE=http://code.google.com/p/vatnumber/
+IUSE=test vies python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=vies? ( dev-python/suds ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=http://vatnumber.googlecode.com/files/vatnumber-1.0.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3d00468c9e7f42c0a6cc990045fb83ac
diff --git a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1 b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
new file mode 100644
index 000000000000..a2df6f19fe61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Smart replacement for plain tuple used in __version__
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=mirror://pypi/v/versiontools/versiontools-1.9.1.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=13778a275f9f787517c0bf99b800e51d
diff --git a/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1 b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
new file mode 100644
index 000000000000..9b43e4e4c881
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] doc? ( dev-python/sphinx[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) test? ( dev-python/mock[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Virtual Python Environment builder
+EAPI=5
+HOMEPAGE=http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv
+IUSE=doc test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=https://github.com/pypa/virtualenv/tarball/1.9.1 -> virtualenv-1.9.1.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
+_md5_=3224c4cfb8928a56495ec07348c48514
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1 b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1
new file mode 100644
index 000000000000..1b8b2dcbd1be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+DESCRIPTION=A script for cloning a non-relocatable virtualenv.
+EAPI=5
+HOMEPAGE=http://github.com/edwardgeorge/virtualenv-clone
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.2.4.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6859e749423151b60b3421a2a9de0087
diff --git a/metadata/md5-cache/dev-python/w3lib-1.2-r1 b/metadata/md5-cache/dev-python/w3lib-1.2-r1
new file mode 100644
index 000000000000..68685ae1965c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/w3lib-1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Python library of web-related functions
+EAPI=5
+HOMEPAGE=http://github.com/scrapy/w3lib
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=mirror://pypi/w/w3lib/w3lib-1.2.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=60b0ceb37e40753430a21a841b8979e4
diff --git a/metadata/md5-cache/dev-python/webpy-0.37-r1 b/metadata/md5-cache/dev-python/webpy-0.37-r1
new file mode 100644
index 000000000000..933df66b7163
--- /dev/null
+++ b/metadata/md5-cache/dev-python/webpy-0.37-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A small and simple web framework for Python
+EAPI=5
+HOMEPAGE=http://www.webpy.org http://pypi.python.org/pypi/web.py
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=http://www.webpy.org/static/web.py-0.37.tar.gz
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a22e7665ee6cb9ba1b32865ec2bdb048
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.2 b/metadata/md5-cache/dev-python/webtest-2.0.2
new file mode 100644
index 000000000000..77be68db6c0d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/webtest-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] app-arch/unzip dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pyquery[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/waitress[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/wsgiproxy2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/paste dev-python/pastedeploy ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Helper to test WSGI applications
+EAPI=5
+HOMEPAGE=http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.2.zip
+_eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8dde6531e4faac8dc5c18f0a5c8d4b40
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.4-r4 b/metadata/md5-cache/dev-qt/qtcore-4.8.4-r4
index bccc23c869f0..b52f1e901684 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.4-r4
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.4-r4
@@ -4,11 +4,11 @@ DESCRIPTION=The Qt toolkit is a comprehensive C++ application development framew
 EAPI=5
 HOMEPAGE=http://qt-project.org/ http://qt.digia.com/
 IUSE=+glib iconv icu qt3support ssl aqua debug pch c++0x +exceptions
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 PDEPEND=qt3support? ( ~dev-qt/qtgui-4.8.4[aqua=,debug=,glib=,qt3support] )
 RDEPEND=sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49:= ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2
 SLOT=4
 SRC_URI=http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.4.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	qt4-build	a83ef3edbc5b18f7e5d7448ac5a51ac6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=70584b4d32cf9c8e4b87b4fca0ea4598
+_md5_=0a2d6576fb9558254d168270e947ebfa
diff --git a/metadata/md5-cache/dev-tex/luatex-0.70.1-r2 b/metadata/md5-cache/dev-tex/luatex-0.70.1-r2
index 0a881af9eadf..bf209191cb5a 100644
--- a/metadata/md5-cache/dev-tex/luatex-0.70.1-r2
+++ b/metadata/md5-cache/dev-tex/luatex-0.70.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=An extended version of pdfTeX using Lua as an embedded scripting lan
 EAPI=5
 HOMEPAGE=http://www.luatex.org/
 IUSE=doc
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/zziplib >=media-libs/libpng-1.4 app-text/poppler:=[xpdf-headers(+)] sys-libs/zlib >=dev-libs/kpathsea-6.0.1_p20110627
 SLOT=0
 SRC_URI=http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-0.70.1.tar.bz2 http://foundry.supelec.fr/gf/download/frsrelease/392/1732/luatex-beta-0.70.1-doc.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e101e5928933c17b81fa4d0acf97d6aa
+_md5_=069d2a649a0d8529b9af10b81a6044a4
diff --git a/metadata/md5-cache/dev-util/molecule-1 b/metadata/md5-cache/dev-util/molecule-1
new file mode 100644
index 000000000000..4fd98c0b3f49
--- /dev/null
+++ b/metadata/md5-cache/dev-util/molecule-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for dev-util/molecule-core and dev-util/molecule-plugins
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+plugins
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/molecule-core-1.0.1 plugins? ( >=dev-util/molecule-plugins-1.0.1 )
+SLOT=0
+_md5_=c0ed20c45cd29cbcce0d241c7ddff9ad
diff --git a/metadata/md5-cache/dev-util/molecule-core-1.0.1 b/metadata/md5-cache/dev-util/molecule-core-1.0.1
new file mode 100644
index 000000000000..c8120a7cc732
--- /dev/null
+++ b/metadata/md5-cache/dev-util/molecule-core-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=dev-util/intltool sys-devel/gettext dev-lang/python
+DESCRIPTION=Sabayon distro-agnostic images build tool
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<dev-util/molecule-1.0 sys-process/lsof dev-lang/python
+SLOT=0
+SRC_URI=mirror://sabayon/dev-util/molecule-core-1.0.1.tar.bz2
+_eclasses_=multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=936104aa4459ff66bf6a6a2164f67fc7
diff --git a/metadata/md5-cache/dev-util/molecule-plugins-1.0.1 b/metadata/md5-cache/dev-util/molecule-plugins-1.0.1
new file mode 100644
index 000000000000..27195bb7a094
--- /dev/null
+++ b/metadata/md5-cache/dev-util/molecule-plugins-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1.0 dev-lang/python
+DESCRIPTION=A set fo base plugins for Molecule
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1.0 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools dev-lang/python
+SLOT=0
+SRC_URI=mirror://sabayon/dev-util/molecule-plugins-1.0.1.tar.bz2
+_eclasses_=multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=c1f1246770bdeb8f687c484f80a40110
diff --git a/metadata/md5-cache/dev-util/plan9port-20130320 b/metadata/md5-cache/dev-util/plan9port-20130320
new file mode 100644
index 000000000000..3b59e792419a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/plan9port-20130320
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=x11-apps/xauth
+DESCRIPTION=Port of many Plan 9 programs and libraries
+EAPI=4
+HOMEPAGE=http://swtch.com/plan9port/
+KEYWORDS=~amd64 ~x86
+LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
+RDEPEND=x11-apps/xauth
+SLOT=0
+SRC_URI=http://plan9port.googlecode.com/files/plan9port-20130320.tgz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b42738d78fba1adfb05800c29198b6a2
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308 b/metadata/md5-cache/games-action/beathazardultra-20130308
new file mode 100644
index 000000000000..d7ea44efaf7e
--- /dev/null
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare pretend setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Intense music-driven arcade shooter powered by your music
+EAPI=5
+HOMEPAGE=http://www.coldbeamgames.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-xlibs ) x86? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr !bundled-libs? ( media-libs/allegro:5 media-libs/libpng:1.2 virtual/jpeg x11-libs/gtk+:2 ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=beathazard-installer_03-08-13
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b70d8c6f52dfcc81000adbaea705233a
diff --git a/metadata/md5-cache/games-action/solar2-1.10 b/metadata/md5-cache/games-action/solar2-1.10
new file mode 100644
index 000000000000..cd3b72d1ce22
--- /dev/null
+++ b/metadata/md5-cache/games-action/solar2-1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=An open-world, sandbox game set in an infinite abstract universe
+EAPI=5
+HOMEPAGE=http://murudai.com/solar/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-medialibs app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs ) x86? ( media-libs/flac media-libs/libsdl[X,audio,video,joystick] media-libs/libvorbis !bundled-libs? ( dev-lang/mono media-libs/libmad media-libs/libmikmod media-libs/openal media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis] ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=solar2-linux-1.10.tar.gz http://dev.gentoo.org/~hasufell/distfiles/solar2.png
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6dc669508ebd8f61d7e4e733f2eff7a
diff --git a/metadata/md5-cache/games-action/super-hexagon-15 b/metadata/md5-cache/games-action/super-hexagon-15
new file mode 100644
index 000000000000..a3d5cf4cc32d
--- /dev/null
+++ b/metadata/md5-cache/games-action/super-hexagon-15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare pretend setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=A minimal action game by Terry Cavanagh, with music by Chipzel
+EAPI=5
+HOMEPAGE=http://www.superhexagon.com/
+IUSE=bundled-libs +bundled-glew
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm !bundled-libs? ( media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal ) !bundled-glew? ( ~media-libs/glew-1.6.0 )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=super-hexagon-linux-15-bin
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8a99fde150de3e697d7133351bae92bf
diff --git a/metadata/md5-cache/games-action/swordandsworcery-1.02 b/metadata/md5-cache/games-action/swordandsworcery-1.02
new file mode 100644
index 000000000000..f0557a3984d0
--- /dev/null
+++ b/metadata/md5-cache/games-action/swordandsworcery-1.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare pretend setup unpack
+DESCRIPTION=An exploratory action adventure game with an emphasis on audiovisual style
+EAPI=5
+HOMEPAGE=http://www.swordandsworcery.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CAPYBARA-EULA LGPL-3
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs[alsa] app-emulation/emul-linux-x86-xlibs ) x86? ( dev-libs/openssl media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio sys-libs/zlib virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst !bundled-libs? ( net-misc/curl media-libs/libsdl[X,audio,video,opengl,joystick] ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=swordandsworcery_1.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a83de2b81be5c3898ee2e4ac5eb3d1db
diff --git a/metadata/md5-cache/games-arcade/dynamitejack-1.0.23 b/metadata/md5-cache/games-arcade/dynamitejack-1.0.23
new file mode 100644
index 000000000000..f904cd2b70bb
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/dynamitejack-1.0.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare pretend setup unpack
+DESCRIPTION=A stealth game with bombs in glorious 2D
+EAPI=5
+HOMEPAGE=http://www.galcon.com/dynamitejack/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs[alsa] app-emulation/emul-linux-x86-xlibs ) x86? ( media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsdl[X,audio,joystick,opengl,video] media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=dynamitejack-1.0.23.tgz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9ead8e076e2c71bd101a2db2f55414fc
diff --git a/metadata/md5-cache/games-engines/love-0.7.2-r1 b/metadata/md5-cache/games-engines/love-0.7.2-r1
index d848aeb955bd..f1db88a55306 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r1
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
+DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=3
 HOMEPAGE=http://love2d.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
-RDEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0.7
 SRC_URI=mirror://bitbucket/rude/love/downloads/love-0.7.2-linux-src.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5c3db2faa97033aa6f5015989d4a2f6d
+_md5_=1bd10341dc5e3893b9f0bc2820238a0d
diff --git a/metadata/md5-cache/games-engines/love-0.8.0 b/metadata/md5-cache/games-engines/love-0.8.0
index f071f8ffd1a3..47755f7f3120 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0
+++ b/metadata/md5-cache/games-engines/love-0.8.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
+DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=3
 HOMEPAGE=http://love2d.org/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=ZLIB
-RDEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
 SRC_URI=mirror://bitbucket/rude/love/downloads/love-0.8.0-linux-src.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=41f60e0e5af2e57a1c703b8fbab1de5e
+_md5_=b7e9be00199ac6a434a1a6eb882ecf59
diff --git a/metadata/md5-cache/games-engines/love-9999 b/metadata/md5-cache/games-engines/love-9999
index b1e166c11424..76e94854ee3c 100644
--- a/metadata/md5-cache/games-engines/love-9999
+++ b/metadata/md5-cache/games-engines/love-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
+DEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
 DESCRIPTION=A framework for 2D games in Lua
-EAPI=3
+EAPI=5
 HOMEPAGE=http://love2d.org/
 LICENSE=ZLIB
-RDEPEND=dev-games/physfs dev-lang/lua media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+RDEPEND=dev-games/physfs dev-lang/lua[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	libtool	2b273eea1976cfaed3449345d94331ac	mercurial	7e8c2c49cfd90701e20a78850f066802	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=81c5da8807a2ad90fe6a015c4aa03c5e
+_md5_=6a5ac7709ede93402f844dc8f69ed190
diff --git a/metadata/md5-cache/games-kids/crayon-physics-55 b/metadata/md5-cache/games-kids/crayon-physics-55
new file mode 100644
index 000000000000..bd673bbc4965
--- /dev/null
+++ b/metadata/md5-cache/games-kids/crayon-physics-55
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=2D physics puzzle/sandbox game with drawing
+EAPI=5
+HOMEPAGE=http://www.crayonphysics.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CRAYON-PHYSICS
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-qtlibs app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs app-emulation/emul-linux-x86-xlibs ) x86? ( media-sound/pulseaudio dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/glu x11-libs/libX11 !bundled-libs? ( media-libs/libmikmod media-libs/libsdl[X,audio,video,opengl,joystick] media-libs/libvorbis media-libs/sdl-image[png,jpeg,tiff] media-libs/sdl-mixer[vorbis,wav] media-libs/smpeg[X,opengl] media-libs/tiff:0 virtual/jpeg ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=crayon_physics_deluxe-linux-release55.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a93929c65a2da3765437a250bf7be017
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222 b/metadata/md5-cache/games-puzzle/nightsky-20111222
new file mode 100644
index 000000000000..d76609bb40ae
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
+EAPI=5
+HOMEPAGE=http://www.nicalis.com/nightsky/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=nightskyhd-linux-1324519044.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aa7abdab41fa72cd72436d89ec6e1042
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120 b/metadata/md5-cache/games-puzzle/splice-20121120
new file mode 100644
index 000000000000..5aa166721fdd
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/splice-20121120
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DESCRIPTION=An experimental and artistic puzzler set in a microbial world
+EAPI=5
+HOMEPAGE=http://www.cipherprime.com/games/splice/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=splice-linux-1353389454.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e402bb3f984ef6d6d89ce982bdda453e
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620 b/metadata/md5-cache/games-rpg/bastion-20120620
new file mode 100644
index 000000000000..7eacdf43ec77
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/bastion-20120620
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=An original action role-playing game set in a lush imaginative world
+EAPI=5
+HOMEPAGE=http://supergiantgames.com/?page_id=242
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl amd64? ( app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-soundlibs app-emulation/emul-linux-x86-xlibs ) x86? ( media-libs/freealut media-libs/openal media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf media-libs/smpeg x11-libs/libX11 x11-libs/libXft !bundled-libs? ( dev-lang/mono media-libs/fmod:1 media-libs/libsdl[X,audio,video,opengl,joystick] ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=Bastion-HIB-2012-06-20.sh
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e25f05c682afe86d7c1c7d93cb321b69
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
new file mode 100644
index 000000000000..80ef452d12ad
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG
+EAPI=5
+HOMEPAGE=http://dungeondefenders.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=x11-misc/xdg-utils virtual/opengl amd64? ( app-emulation/emul-linux-x86-soundlibs[alsa] app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-xlibs ) x86? ( media-libs/alsa-lib media-sound/pulseaudio x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm !bundled-libs? ( media-libs/openal ) )
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=dundef-linux-03052013.mojo.run
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7e576755c88974aae22c7dc4811643c6
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.8.1 b/metadata/md5-cache/mail-filter/opendkim-2.8.1
new file mode 100644
index 000000000000..030d937ee99c
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/opendkim-2.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A milter-based application to provide DKIM signing and verification
+EAPI=5
+HOMEPAGE=http://opendkim.org
+IUSE=+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound
+KEYWORDS=~amd64 ~x86
+LICENSE=Sendmail-Open-Source BSD
+RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc
+REQUIRED_USE=sasl? ( ldap )
+SLOT=0
+SRC_URI=mirror://sourceforge/opendkim/opendkim-2.8.1.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=a1fee104f1b8d3968225324b156e3cb1
diff --git a/metadata/md5-cache/mail-mta/postfix-2.11_pre20130317 b/metadata/md5-cache/mail-mta/postfix-2.11_pre20130319
similarity index 95%
rename from metadata/md5-cache/mail-mta/postfix-2.11_pre20130317
rename to metadata/md5-cache/mail-mta/postfix-2.11_pre20130319
index 574253a3c725..81378e71485f 100644
--- a/metadata/md5-cache/mail-mta/postfix-2.11_pre20130317
+++ b/metadata/md5-cache/mail-mta/postfix-2.11_pre20130319
@@ -9,6 +9,6 @@ LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.11-20130317.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.5.patch )
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.11-20130319.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v11-2.9.5.patch )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d73ea1225cee4190d11dcbb95c52578d
+_md5_=ce749e006a9eeca1679ef921be6feb5c
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.0-r1 b/metadata/md5-cache/media-gfx/fbgrab-1.0-r1
new file mode 100644
index 000000000000..6dd88da496e0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libpng sys-libs/zlib
+DESCRIPTION=Framebuffer screenshot utility
+EAPI=5
+HOMEPAGE=http://hem.bredband.net/gmogmo/fbgrab/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng sys-libs/zlib
+SLOT=0
+SRC_URI=http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a5c0737eb367f75580334af19a671bcf
diff --git a/metadata/md5-cache/media-gfx/pinta-1.5_pre20121118 b/metadata/md5-cache/media-gfx/pinta-1.5_pre20121118
new file mode 100644
index 000000000000..9137a5416bec
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pinta-1.5_pre20121118
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Simple Painting for Gtk
+EAPI=5
+HOMEPAGE=http://pinta-project.com
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT CC-BY-3.0
+RDEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/gnome-icon-theme
+SLOT=0
+SRC_URI=mirror://github/PintaProject/Pinta/pinta-1.5-preview-20121118.tar.gz
+_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=0344d16302e948ed24b50f4ee3b19548
diff --git a/metadata/md5-cache/media-gfx/pinta-9999 b/metadata/md5-cache/media-gfx/pinta-9999
index 777bad65a8be..ca27ab2e1226 100644
--- a/metadata/md5-cache/media-gfx/pinta-9999
+++ b/metadata/md5-cache/media-gfx/pinta-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=postinst postrm prepare unpack
-DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool virtual/pkgconfig 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 dev-vcs/git
+DEFINED_PHASES=postinst postrm preinst prepare unpack
+DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/git
 DESCRIPTION=Simple Painting for Gtk
-EAPI=4
+EAPI=5
 HOMEPAGE=http://pinta-project.com
 LICENSE=MIT CC-BY-3.0
 RDEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/gnome-icon-theme
 SLOT=0
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=90efa7a7efc37876232a107cbab623c6
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=f055a5b49dadb1b0d5053046f7299f11
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.14.0 b/metadata/md5-cache/media-gfx/shotwell-0.14.0-r1
similarity index 98%
rename from metadata/md5-cache/media-gfx/shotwell-0.14.0
rename to metadata/md5-cache/media-gfx/shotwell-0.14.0-r1
index 075a464be816..c9db76aec2a0 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.14.0
+++ b/metadata/md5-cache/media-gfx/shotwell-0.14.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0
 SLOT=0
 SRC_URI=http://www.yorba.org/download/shotwell/stable/shotwell-0.14.0.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vala	ad1e7234faa2244a7e10f1c864371475	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d20399b1cc2999b12f9f2b1961bb515e
+_md5_=8c0405e8ed37b26a605122c14b0fd4f4
diff --git a/metadata/md5-cache/media-libs/freeimage-3.15.4 b/metadata/md5-cache/media-libs/freeimage-3.15.4
index c1d6701c7fb6..6f3461386d91 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.15.4
+++ b/metadata/md5-cache/media-libs/freeimage-3.15.4
@@ -4,10 +4,10 @@ DESCRIPTION=Image library supporting many formats
 EAPI=4
 HOMEPAGE=http://freeimage.sourceforge.net/
 IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 FIPL-1.0 )
 RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) mng? ( media-libs/libmng ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libraw ) tiff? ( media-libs/ilmbase media-libs/tiff )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeimage/FreeImage3154.zip mirror://sourceforge/freeimage/FreeImage3154.pdf
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8be5357bcb224757cfdb17bf09c7f0f7
+_md5_=1236cbd3863da146e682d83a48306b95
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.0.0 b/metadata/md5-cache/media-libs/ilmbase-2.0.0
index 96b3ca85c2d7..0b7aa709ae4d 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.0.0
+++ b/metadata/md5-cache/media-libs/ilmbase-2.0.0
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0/10
 SRC_URI=http://dev.gentoo.org/~ssuominen/openexr-2.0.0.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=854181315f1e8d2fe5af3847f53840d9
+_md5_=780ee16f453fb1af970d998a8d9658a5
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.4.0 b/metadata/md5-cache/media-libs/libmatroska-1.4.0
new file mode 100644
index 000000000000..663f7c3ea7d7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmatroska-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-libs/libebml-1.3.0:=
+DESCRIPTION=Extensible multimedia container format based on EBML
+EAPI=5
+HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libebml-1.3.0:=
+RESTRICT=test
+SLOT=0/6
+SRC_URI=https://github.com/Matroska-Org/libmatroska/archive/release-1.4.0.tar.gz -> libmatroska-1.4.0.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=87a5d25c5edb2b44d84c1bd029dce1e8
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1 b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1
new file mode 100644
index 000000000000..44e03992fa99
--- /dev/null
+++ b/metadata/md5-cache/media-video/mkvtoolnix-6.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend
+DEPEND=>=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.0:= >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-lang/ruby 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=Tools to create, alter, and inspect Matroska files
+EAPI=5
+HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
+IUSE=bzip2 debug lzo pch qt4 wxwidgets
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libebml-1.3.0:= >=media-libs/libmatroska-1.4.0:= >=dev-libs/boost-1.46.0 dev-libs/pugixml media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file >=sys-devel/gcc-4.6 sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+SLOT=0
+SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-6.1.0.tar.xz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_md5_=27e0acdcf9ab07ac5f611da2f0ebbfaa
diff --git a/metadata/md5-cache/media-video/mplayer-1.1-r1 b/metadata/md5-cache/media-video/mplayer-1.1-r1
index 915e879296e4..b8646422ffa8 100644
--- a/metadata/md5-cache/media-video/mplayer-1.1-r1
+++ b/metadata/md5-cache/media-video/mplayer-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.1.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4058fe930da28d56563f321dcdf2be5b
+_md5_=cc2eb7c747639eb07746231b58145c8c
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index 115ef4078587..8e29187fe0e1 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=bindist? ( !faac !win32codecs ) dvdnav? ( dvd ) libass? ( truetype
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9ce214c45d728eca2e90fc442b4fcb8b
+_md5_=6374b1a209bb9d1a688b441d5c26894f
diff --git a/metadata/md5-cache/net-firewall/shorewall-4.5.11.2 b/metadata/md5-cache/net-firewall/shorewall-4.5.11.2
index d99625a9a862..8b3585db0026 100644
--- a/metadata/md5-cache/net-firewall/shorewall-4.5.11.2
+++ b/metadata/md5-cache/net-firewall/shorewall-4.5.11.2
@@ -4,10 +4,10 @@ DESCRIPTION=Shoreline Firewall is an iptables-based firewall for Linux.
 EAPI=4
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl =net-firewall/shorewall-core-4.5.11.2
 SLOT=0
 SRC_URI=http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.11/shorewall-4.5.11.2.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.11/shorewall-docs-html-4.5.11.2.tar.bz2 )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=616050e2fb47e8dd6773c3daaadc8ce1
+_md5_=4b0a73243c50b7dc8ec6195d74f338af
diff --git a/metadata/md5-cache/net-firewall/shorewall-core-4.5.11.2 b/metadata/md5-cache/net-firewall/shorewall-core-4.5.11.2
index 8d6ee3a9dce5..a094dea85b13 100644
--- a/metadata/md5-cache/net-firewall/shorewall-core-4.5.11.2
+++ b/metadata/md5-cache/net-firewall/shorewall-core-4.5.11.2
@@ -4,10 +4,10 @@ DESCRIPTION=Core libraries of shorewall / shorewall(6)-lite
 EAPI=4
 HOMEPAGE=http://www.shorewall.net/
 IUSE=selinux
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl dev-perl/Digest-SHA1 !<net-firewall/shorewall-4.5.0.1 selinux? ( sec-policy/selinux-shorewall )
 SLOT=0
 SRC_URI=http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.11/shorewall-core-4.5.11.2.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ba0b6eb9c8ab7da98f11c1076969afd1
+_md5_=ffb5e7e55d616f7cc806f89dc52f72f5
diff --git a/metadata/md5-cache/net-firewall/shorewall-lite-4.5.11.2 b/metadata/md5-cache/net-firewall/shorewall-lite-4.5.11.2
index abdc91abc928..b45c88b8e1fa 100644
--- a/metadata/md5-cache/net-firewall/shorewall-lite-4.5.11.2
+++ b/metadata/md5-cache/net-firewall/shorewall-lite-4.5.11.2
@@ -3,10 +3,10 @@ DESCRIPTION=An iptables-based firewall whose config is handled by a normal Shore
 EAPI=4
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2 =net-firewall/shorewall-core-4.5.11.2
 SLOT=0
 SRC_URI=http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.11/shorewall-lite-4.5.11.2.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.11/shorewall-docs-html-4.5.11.2.tar.bz2 )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5a33c20df7263ffcab8aef0c19385368
+_md5_=aef1848370c1cc31ff2b3670c630a5dc
diff --git a/metadata/md5-cache/net-im/ekg2-0.3.1-r1 b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
index b6de7094a77f..b2783dbbe8af 100644
--- a/metadata/md5-cache/net-im/ekg2-0.3.1-r1
+++ b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
@@ -3,11 +3,11 @@ DEPEND=gpg? ( app-crypt/gpgme ) gsm? ( media-sound/gsm ) gtk? ( x11-libs/gtk+:2
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=5
 HOMEPAGE=http://www.ekg2.org
-IUSE=gadu gif gnutls gpg gpm gsm gtk idn inotify jpeg ncurses nls oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode xmpp xosd zlib python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+IUSE=gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode xmpp xosd zlib python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=gpg? ( app-crypt/gpgme ) gsm? ( media-sound/gsm ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) oracle? ( dev-db/oracle-instantclient-basic ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) xosd? ( x11-libs/xosd ) zlib? ( sys-libs/zlib ) gadu? ( net-libs/libgadu gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) ) ncurses? ( sys-libs/ncurses[unicode?] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) rss? ( dev-libs/expat ) sqlite3? ( dev-db/sqlite:3 ) !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) ) xmpp? ( dev-libs/expat gnutls? ( net-libs/gnutls ) )
 SLOT=0
 SRC_URI=http://pl.ekg2.org/ekg2-0.3.1.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=36f0da146b601973b39d8be3e48bbaba
+_md5_=31ec0fd5b5b6a7c319c53adf32c769d1
diff --git a/metadata/md5-cache/net-im/ekg2-9999 b/metadata/md5-cache/net-im/ekg2-9999
index abee79cd4424..fa909853a84f 100644
--- a/metadata/md5-cache/net-im/ekg2-9999
+++ b/metadata/md5-cache/net-im/ekg2-9999
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk?
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=5
 HOMEPAGE=http://www.ekg2.org
-IUSE=gadu gpm gpg gtk inotify minimal ncurses nls nntp openssl perl python readline rss spell sqlite sqlite2 ssl xmpp unicode zlib python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss spell sqlite sqlite2 ssl xmpp unicode zlib python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) ssl? ( net-libs/gnutls ) xmpp? ( dev-libs/expat ) zlib? ( sys-libs/zlib ) ncurses? ( sys-libs/ncurses[unicode=] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) sqlite? ( !sqlite2? ( dev-db/sqlite:3 ) sqlite2? ( dev-db/sqlite:0 ) )
 SLOT=0
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=802b9cf94cfffd81d3e81d98b9d7fd42
+_md5_=635f615d72afcd5bb3de780121e97d9f
diff --git a/metadata/md5-cache/net-im/gajim-0.15.3-r1 b/metadata/md5-cache/net-im/gajim-0.15.3-r1
new file mode 100644
index 000000000000..5d6ce4b673a9
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-0.15.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=5
+HOMEPAGE=http://www.gajim.org/
+IUSE=avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils )
+REQUIRED_USE=libnotify? ( dbus ) avahi? ( dbus )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.3.tar.bz2
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=88bb7905a51923f4d9a2f7a5a871d459
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.3 b/metadata/md5-cache/net-libs/libtorrent-0.13.3
new file mode 100644
index 000000000000..4948f5e77dd4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/libsigc++-2.2.2:2 ssl? ( dev-libs/openssl ) virtual/pkgconfig
+DESCRIPTION=BitTorrent library written in C++ for *nix
+EAPI=4
+HOMEPAGE=http://libtorrent.rakshasa.no/
+IUSE=debug ipv6 ssl
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libsigc++-2.2.2:2 ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://libtorrent.rakshasa.no/downloads/libtorrent-0.13.3.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fd64fc7ba468b425b5a0a9daa153b9f7
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.0 b/metadata/md5-cache/net-libs/nodejs-0.10.1
similarity index 84%
rename from metadata/md5-cache/net-libs/nodejs-0.10.0
rename to metadata/md5-cache/net-libs/nodejs-0.10.1
index 5f9560177eb5..245540283576 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.10.0
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.1
@@ -8,6 +8,6 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.10.0/node-v0.10.0.tar.gz
+SRC_URI=http://nodejs.org/dist/v0.10.1/node-v0.10.1.tar.gz
 _eclasses_=multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=e5ea01201d2f093e5650ef59e61c951a
+_md5_=7125550340a6d1dd17e66fe8bbf0dd9b
diff --git a/metadata/md5-cache/net-libs/nodejs-0.6.21-r1 b/metadata/md5-cache/net-libs/nodejs-0.6.21-r1
deleted file mode 100644
index 616406f6f542..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.6.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/v8-3.6.6.24 dev-libs/openssl =dev-lang/python-2*
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=4
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/v8-3.6.6.24 dev-libs/openssl =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c5f38b588dbca054be60ab25bc324717
diff --git a/metadata/md5-cache/net-libs/nodejs-0.6.21-r2 b/metadata/md5-cache/net-libs/nodejs-0.6.21-r2
deleted file mode 100644
index ba58bfe01702..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.6.21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl =dev-lang/python-2*
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=4
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=504e05d5417009fad534c4cc3096b701
diff --git a/metadata/md5-cache/net-libs/nodejs-0.9.12 b/metadata/md5-cache/net-libs/nodejs-0.9.12
deleted file mode 100644
index 3abb99104bf8..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.9.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl virtual/python-json test? ( net-misc/curl )
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.9.12/node-v0.9.12.tar.gz
-_eclasses_=multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=3589b241976e6e4392c492229a369adc
diff --git a/metadata/md5-cache/net-libs/nodejs-0.9.3-r1 b/metadata/md5-cache/net-libs/nodejs-0.9.3-r1
deleted file mode 100644
index 6ba0d038fcc9..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.9.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==dev-lang/v8-3.15*:= dev-libs/openssl =dev-lang/python-2*
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND==dev-lang/v8-3.15*:= dev-libs/openssl =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.9.3/node-v0.9.3.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c4cb29b13fbd89fdf28be1c8c67cfb1
diff --git a/metadata/md5-cache/net-libs/nodejs-0.9.9 b/metadata/md5-cache/net-libs/nodejs-0.9.9
deleted file mode 100644
index 48f4ce19f9eb..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-0.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==dev-lang/v8-3.15*:= dev-libs/openssl =dev-lang/python-2*
-DESCRIPTION=Evented IO for V8 Javascript
-EAPI=5
-HOMEPAGE=http://nodejs.org/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND==dev-lang/v8-3.15*:= dev-libs/openssl =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://nodejs.org/dist/v0.9.9/node-v0.9.9.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c23a2758115b3deb6cfc4b108b27340
diff --git a/metadata/md5-cache/net-mail/dovecot-2.1.12-r1 b/metadata/md5-cache/net-mail/dovecot-2.1.12-r1
deleted file mode 100644
index 7eab637f5399..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.1.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl )
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=4
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv >=net-mail/mailbase-0.00-r8
-SLOT=0
-SRC_URI=http://www.dovecot.org/releases/2.1/dovecot-2.1.12.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.3.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.3.tar.gz )
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=253001715ea3d19abb6dd1c3f6db8ae1
diff --git a/metadata/md5-cache/net-mail/dovecot-2.1.13 b/metadata/md5-cache/net-mail/dovecot-2.1.13
deleted file mode 100644
index 41ab9b46e5f7..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl )
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=4
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv >=net-mail/mailbase-0.00-r8
-SLOT=0
-SRC_URI=http://www.dovecot.org/releases/2.1/dovecot-2.1.13.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.3.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.3.tar.gz )
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0448264b1de95c3d61b7f650d41b2f1e
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2_rc2 b/metadata/md5-cache/net-mail/dovecot-2.2_rc3
similarity index 87%
rename from metadata/md5-cache/net-mail/dovecot-2.2_rc2
rename to metadata/md5-cache/net-mail/dovecot-2.2_rc3
index be22c416b38c..6e3ae33a4377 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2_rc2
+++ b/metadata/md5-cache/net-mail/dovecot-2.2_rc3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv net-mail/mailbase
 SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/rc/dovecot-2.2.rc2.tar.gz sieve? ( http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/99eec511aa2c.tar.bz2 -> dovecot-2.2-pigeonhole-99eec511aa2c.tar.bz2 ) managesieve? ( http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/99eec511aa2c.tar.bz2 -> dovecot-2.2-pigeonhole-99eec511aa2c.tar.bz2 )
+SRC_URI=http://dovecot.org/releases/2.2/rc/dovecot-2.2.rc3.tar.gz sieve? ( http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/b75b00760b86.tar.bz2 -> dovecot-2.2-pigeonhole-b75b00760b86.tar.bz2 ) managesieve? ( http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/b75b00760b86.tar.bz2 -> dovecot-2.2-pigeonhole-b75b00760b86.tar.bz2 )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4257fc35c8ebeb63cbd7eb54d1591737
+_md5_=28224070d9eaa00024976c6097667bd5
diff --git a/metadata/md5-cache/net-mail/mailutils-2.99.98 b/metadata/md5-cache/net-mail/mailutils-2.99.98
new file mode 100644
index 000000000000..598bf8405939
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailutils-2.99.98
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline sys-devel/libtool virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig python? ( =dev-lang/python-2* )
+DESCRIPTION=A useful collection of mail servers, clients, and filters.
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/mailutils/mailutils.html
+IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline sys-devel/libtool virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) python? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=mirror://gnu-alpha/mailutils/mailutils-2.99.98.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8b7f490c896acecf45355f60203dbcde
diff --git a/metadata/md5-cache/net-misc/electrum-1.7 b/metadata/md5-cache/net-misc/electrum-1.7
index 4acc74dac956..ac87db3d8df5 100644
--- a/metadata/md5-cache/net-misc/electrum-1.7
+++ b/metadata/md5-cache/net-misc/electrum-1.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( gtk qt4 )
 SLOT=0
 SRC_URI=http://download.electrum.org/download/Electrum-1.7.tar.gz
 _eclasses_=distutils-r1	ca3b0f2e4faf3dc61cddde93db59a47e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	gnome2-utils	794d2847b4af390a1e020924876c8297	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2fbd24bc0a99bd0762cae985b4023159
+_md5_=b2aff17c233d9c1f1e4d324c844e7aa3
diff --git a/metadata/md5-cache/net-misc/suite3270-3.3.12_p12 b/metadata/md5-cache/net-misc/suite3270-3.3.12_p12
new file mode 100644
index 000000000000..0aad8e1b18f7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/suite3270-3.3.12_p12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup
+DEPEND=ssl? ( dev-libs/openssl ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ncurses? ( sys-libs/ncurses sys-libs/readline ) tcl? ( dev-lang/tcl ) X? ( x11-misc/imake x11-misc/xbitmaps x11-proto/xproto app-text/rman x11-apps/mkfontdir x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+DESCRIPTION=Complete 3270 access package
+EAPI=4
+HOMEPAGE=http://x3270.bgp.nu/
+IUSE=cjk doc ncurses ssl tcl X X
+KEYWORDS=~amd64 ~ppc ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ncurses? ( sys-libs/ncurses sys-libs/readline ) tcl? ( dev-lang/tcl )
+SLOT=0
+SRC_URI=mirror://sourceforge/x3270/suite3270-3.3.12ga12-src.tgz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0d474ced5acde90a771584bfadad4da4
diff --git a/metadata/md5-cache/net-misc/x2goserver-3.1.1.4-r1 b/metadata/md5-cache/net-misc/x2goserver-3.1.1.4-r1
index a49e1dfeeb4d..da0380c58f68 100644
--- a/metadata/md5-cache/net-misc/x2goserver-3.1.1.4-r1
+++ b/metadata/md5-cache/net-misc/x2goserver-3.1.1.4-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh x11-apps/xauth fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-3.1.1.4.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=717a37c96fb17f8d1a0722161dfad26f
+_md5_=6a1b5bb551dffccb22233b9962d0d6f2
diff --git a/metadata/md5-cache/net-misc/x2goserver-3.1.1.9 b/metadata/md5-cache/net-misc/x2goserver-3.1.1.9
index d47849666acc..1352d4dcdd7e 100644
--- a/metadata/md5-cache/net-misc/x2goserver-3.1.1.9
+++ b/metadata/md5-cache/net-misc/x2goserver-3.1.1.9
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh x11-apps/xauth fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-3.1.1.9.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d7e1dc60bbff6e4a7c3106d5943fcdcb
+_md5_=dec1beb9db32e1be888808cbadb21d2d
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.0.0 b/metadata/md5-cache/net-misc/x2goserver-4.0.0.0
index 0971ce1dea20..9997e39ed629 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.0.0
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.0.0
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
+RDEPEND=dev-perl/Config-Simple media-fonts/font-cursor-misc media-fonts/font-misc-misc net-misc/nx virtual/ssh x11-apps/xauth fuse? ( sys-fs/sshfs-fuse ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.0.0.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8f598ca9fc04f90de7592f8353331242
+_md5_=8f9a9ab79099b10283ea0b8db0745f66
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.02.25 b/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
index 6f866b07202e..9e5349a363b8 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.02.25
@@ -4,9 +4,9 @@ DESCRIPTION=Download videos from YouTube.com (and mores sites...)
 EAPI=5
 HOMEPAGE=http://rg3.github.com/youtube-dl/
 IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2013.02.25/youtube-dl-2013.02.25.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4c9345390e65dda714525e9d3297810f
+_md5_=3ea4cbf1272681eaac076b8b2800cfd2
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.3 b/metadata/md5-cache/net-p2p/rtorrent-0.9.3
new file mode 100644
index 000000000000..eac57cbfb1aa
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=~net-libs/libtorrent-0.13.3 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses xmlrpc? ( dev-libs/xmlrpc-c ) test? ( dev-util/cppunit ) virtual/pkgconfig
+DESCRIPTION=BitTorrent Client using libtorrent
+EAPI=4
+HOMEPAGE=http://libtorrent.rakshasa.no/
+IUSE=daemon debug ipv6 test xmlrpc
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=~net-libs/libtorrent-0.13.3 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen )
+SLOT=0
+SRC_URI=http://libtorrent.rakshasa.no/downloads/rtorrent-0.9.3.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0282ace91aa9df6dc2ffe889db770af1
diff --git a/metadata/md5-cache/net-zope/zc-buildout-2.0.1 b/metadata/md5-cache/net-zope/zc-buildout-2.0.1
new file mode 100644
index 000000000000..a8a65e56eef8
--- /dev/null
+++ b/metadata/md5-cache/net-zope/zc-buildout-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-python/setuptools =dev-lang/python-2*
+DESCRIPTION=System for managing development buildouts
+EAPI=3
+HOMEPAGE=http://pypi.python.org/pypi/zc.buildout
+KEYWORDS=~amd64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/setuptools =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/z/zc.buildout/zc.buildout-2.0.1.tar.gz
+_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=e7a0cc43a0992f152d77a781a974b644
diff --git a/metadata/md5-cache/sci-biology/profphd-1.0.39 b/metadata/md5-cache/sci-biology/profphd-1.0.39
index 740aa5c3c0bd..af1addd97413 100644
--- a/metadata/md5-cache/sci-biology/profphd-1.0.39
+++ b/metadata/md5-cache/sci-biology/profphd-1.0.39
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=compile install prepare
 DEPEND=dev-lang/perl
 DESCRIPTION=Secondary structure and solvent accessibility predictor
 EAPI=5
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/profphd/profphd_1.0.39.orig.tar.xz
-_md5_=3b9b799edbb5310b537b86f52f5e48e9
+_md5_=be62d6361caeef229501c162a3077531
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1
new file mode 100644
index 000000000000..3b8e992c7c7c
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-lang/tk[threads] dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-tcltk/tix =sci-libs/ccpn-data-2.2.2*[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+DESCRIPTION=The Collaborative Computing Project for NMR
+EAPI=5
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+IUSE=+opengl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+RDEPEND=dev-lang/tk[threads] dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-tcltk/tix =sci-libs/ccpn-data-2.2.2*[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130318.patch.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=272f4e21ee1242ffc205965ecebad8b0
diff --git a/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1 b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1
new file mode 100644
index 000000000000..e1f15920a409
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=The Collaborative Computing Project for NMR - Data
+EAPI=5
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+RDEPEND=!<sci-chemistry/ccpn-2.2.2_p121112-r1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=http://www2.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-121112.patch.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	ec14ac1ad9c7920d5f5c20950dda44bb	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b39976f4ee40a8a51dcbc3209ddc64c2
diff --git a/metadata/md5-cache/sci-libs/mathgl-1.11.2 b/metadata/md5-cache/sci-libs/mathgl-1.11.2
deleted file mode 100644
index d70364c73c03..000000000000
--- a/metadata/md5-cache/sci-libs/mathgl-1.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test unpack
-DEPEND=media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) python? ( dev-python/numpy ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) sys-devel/libtool:2 doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
-DESCRIPTION=Math Graphics Library
-EAPI=4
-HOMEPAGE=http://mathgl.sourceforge.net/
-IUSE=doc fltk gif glut gsl hdf5 jpeg mpi octave python qt4 wxwidgets static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) python? ( dev-python/numpy ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) python? ( =dev-lang/python-2* )
-REQUIRED_USE=mpi? ( hdf5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/mathgl/mathgl-1.11.2.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=a6239651c66a9d01e223da1a6d422c62
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.1.2 b/metadata/md5-cache/sci-libs/mathgl-2.1.2
new file mode 100644
index 000000000000..4e2881f9cacf
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mathgl-2.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test unpack
+DEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) zlib? ( sys-libs/zlib ) doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Math Graphics Library
+EAPI=5
+HOMEPAGE=http://mathgl.sourceforge.net/
+IUSE=doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl pdf png python qt4 static-libs threads wxwidgets zlib linguas_ru
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=mpi? ( hdf5 ) png? ( zlib ) pdf? ( png )
+SLOT=0
+SRC_URI=mirror://sourceforge/mathgl/mathgl-2.1.2.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
+_md5_=8a1d129e29a58968ce6e734c8419b745
diff --git a/metadata/md5-cache/sci-libs/matio-1.5.1 b/metadata/md5-cache/sci-libs/matio-1.5.1
index 381a03bc88f0..2413b68c6f10 100644
--- a/metadata/md5-cache/sci-libs/matio-1.5.1
+++ b/metadata/md5-cache/sci-libs/matio-1.5.1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib hdf5? ( sci-libs/hdf5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matio/matio-1.5.1.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a1e90f8a490cd3a0f4d4b17d2605559c
+_md5_=21ffeab09bf23859f0d76b1d4cb23dc3
diff --git a/metadata/md5-cache/sci-mathematics/yafu-1.34.3 b/metadata/md5-cache/sci-mathematics/yafu-1.34.3
index 28b54f2d76eb..667a420397e6 100644
--- a/metadata/md5-cache/sci-mathematics/yafu-1.34.3
+++ b/metadata/md5-cache/sci-mathematics/yafu-1.34.3
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve sci
 SLOT=0
 SRC_URI=mirror://sourceforge/yafu/1.34/yafu-1.34-src.zip
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=82ce1bbb7297e5237c7c4ba890c5b43b
+_md5_=4cb7568149fdb0ccd08c4df551badbac
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.46-r2 b/metadata/md5-cache/sys-apps/attr-2.4.46-r2
index 0adf71e3c8f5..c8777b7588c7 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.46-r2
+++ b/metadata/md5-cache/sys-apps/attr-2.4.46-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Extended attributes tools
 EAPI=4
 HOMEPAGE=http://savannah.nongnu.org/projects/attr
 IUSE=nls static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.46.src.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=accce151d0eb62088708da7e98401184
+_md5_=83f80d5396bd5a1b477b74f9693752a3
diff --git a/metadata/md5-cache/sys-apps/file-5.14 b/metadata/md5-cache/sys-apps/file-5.14
new file mode 100644
index 000000000000..9056ed0f28b8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=2
+HOMEPAGE=ftp://ftp.astron.com/pub/file/
+IUSE=python static-libs zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.14.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.14.tar.gz
+_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=87681ea988caa4263470420e4216487f
diff --git a/metadata/md5-cache/sys-apps/kmod-12-r1 b/metadata/md5-cache/sys-apps/kmod-12-r1
index b99bb0b4455b..0cd974551e28 100644
--- a/metadata/md5-cache/sys-apps/kmod-12-r1
+++ b/metadata/md5-cache/sys-apps/kmod-12-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( 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
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( 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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=4
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-IUSE=debug doc lzma static-libs +tools zlib
+IUSE=debug doc lzma static-libs +tools zlib kernel_linux
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 )
+RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-12.tar.xz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f2a7264df9db18a4bb32ad0a4c0d0b7c
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ec1fcd97b2a3e8d567b0a889f2d3fa1d
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 337a624aea31..ef3faeb6a7a3 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( 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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) dev-vcs/git
 DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=4
 HOMEPAGE=http://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-IUSE=debug doc lzma static-libs +tools zlib
+IUSE=debug doc lzma static-libs +tools zlib kernel_linux
 LICENSE=LGPL-2
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 )
+RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) zlib? ( >=sys-libs/zlib-1.2.6 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef8664d781124fde180a71c16f8eb537
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	git-2	e92e09651292b1bef5656592364550f7	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=504ef684da304240fda0fa6b8c1a31ec
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.58 b/metadata/md5-cache/sys-apps/portage-2.1.11.58
new file mode 100644
index 000000000000..d8b4f0f37935
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.1.11.58
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postrm preinst prepare setup test
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=2
+HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
+IUSE=build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy1_9 python_targets_pypy2_0 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.1.11.58.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.58.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=64852b02c3651d7e8f61b20a0c6c7663
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha169 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha169
new file mode 100644
index 000000000000..dd96f526d669
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha169
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=3
+HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
+IUSE=build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy1_9 python_targets_pypy2_0 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.2.0_alpha166.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha166.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha169.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha169.patch.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=44f9dd310f18d7838351d098789c3240
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 8ad36ca3755b..c621587859a0 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) dev-vcs/git
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 ) dev-vcs/git
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy1_9 python_targets_pypy2_0 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f25e16ae14e033bf93dd05b2ce6d1a9d
+_md5_=ecac5b5c55460bee2dc61ad0c6e06859
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 9d2e10ab1d45..389df7c28bb5 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -8,4 +8,4 @@ LICENSE=UoI-NCSA
 RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=786563b474be4ada9764a6f22c97abe6
+_md5_=ed2c5df3c5f00a292fb55605d5ad53b8
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20130318 b/metadata/md5-cache/sys-fs/aufs3-3_p20130318
index 29d0fa0cade2..e2203f8d6e45 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20130318
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20130318
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modu
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20130318.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bca5f8db8b9704562470c2a9aa1c8d9c
+_md5_=1fa505b94d3da14d2b876606b2eab077
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 27afa5542dac..3a2cd5d843ab 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs dev-vcs/git
+DEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs dev-vcs/git
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=4
 HOMEPAGE=https://btrfs.wiki.kernel.org
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
+RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
 SLOT=0
 _eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=7369dcfa285fb036f6c1f81800b625a0
+_md5_=1f0b1705fe1cae1b126e8dea8c66c519
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1 b/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
index b9e028d2e2b2..e43920d8de5f 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-0.1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libmtp >=sys-fs/fuse-2.8 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig media-libs/libmtp >=sys-fs/fuse-2.8
 DESCRIPTION=Simple MTP fuse filesystem driver
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/phatina/simple-mtpfs
 KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp >=sys-fs/fuse-2.8
 SLOT=0
 SRC_URI=mirror://github/phatina/simple-mtpfs/simple-mtpfs-0.1.tar.gz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a5c67b0a2bd94c76f07c5c3fff99db83
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=73eb64e1b3734e0d9c2488a6c6091e40
diff --git a/metadata/md5-cache/sys-fs/udev-198-r2 b/metadata/md5-cache/sys-fs/udev-198-r2
deleted file mode 100644
index b1ab5a6675b9..000000000000
--- a/metadata/md5-cache/sys-fs/udev-198-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !<sys-apps/systemd-198 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 ) keymap? ( dev-util/gperf ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=virtual/udev-197-r1 hwdb? ( >=sys-apps/hwids-20130309-r1[udev] ) openrc? ( >=sys-fs/udev-init-scripts-23 )
-RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !<sys-apps/systemd-198 openrc? ( !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.97-r1 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-22 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25 !<sec-policy/selinux-base-2.20120725-r10
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-198.tar.xz http://dev.gentoo.org/~ssuominen/udev-198-patches-3.tar.xz http://dev.gentoo.org/~williamh/dist/udev-198-patches-3.tar.xz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3d0b780d1e00727e3129a799f1db21d1
diff --git a/metadata/md5-cache/sys-fs/udev-198-r1 b/metadata/md5-cache/sys-fs/udev-198-r3
similarity index 92%
rename from metadata/md5-cache/sys-fs/udev-198-r1
rename to metadata/md5-cache/sys-fs/udev-198-r3
index 7ad255f28084..308682b082ea 100644
--- a/metadata/md5-cache/sys-fs/udev-198-r1
+++ b/metadata/md5-cache/sys-fs/udev-198-r3
@@ -10,6 +10,6 @@ PDEPEND=>=virtual/udev-197-r1 hwdb? ( >=sys-apps/hwids-20130309-r1[udev] ) openr
 RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-12 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !<sys-apps/systemd-198 openrc? ( !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.97-r1 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-22 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-198.tar.xz http://dev.gentoo.org/~ssuominen/udev-198-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-198-patches-1.tar.xz
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-198.tar.xz http://dev.gentoo.org/~ssuominen/udev-198-patches-4.tar.xz http://dev.gentoo.org/~williamh/dist/udev-198-patches-4.tar.xz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ce731c50e9d10ee5d762f440c422747f
+_md5_=e53c2f9dddf66b8bbb7fc22be3a406a6
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-25 b/metadata/md5-cache/sys-fs/udev-init-scripts-25
new file mode 100644
index 000000000000..e20da59ff07c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=virtual/pkgconfig
+DESCRIPTION=udev startup scripts for openrc
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/udev-180 sys-apps/openrc !<sys-fs/udev-186
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~williamh/dist/udev-init-scripts-25.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6b4223cc5182364b12168e7e9fde7543
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.8.4 b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.4
new file mode 100644
index 000000000000..12d6b68e5920
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.8 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob module proc symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.8 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.8.4
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://gentoo/genpatches-3.8-7.base.tar.xz mirror://gentoo/genpatches-3.8-7.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.8_p20130318.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d701ebf38c272662d58af8bb325b02ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.70 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.70
new file mode 100644
index 000000000000..998a5ed0d592
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.70
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.0 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.0.70
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-41.base.tar.xz mirror://gentoo/genpatches-3.0-41.extras.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9cb169b9dec37177acc58054de4df3e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.41
new file mode 100644
index 000000000000..83d20082046b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.41
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.2 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.41
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-21.base.tar.xz mirror://gentoo/genpatches-3.2-21.extras.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f7d71d13c5321fe083e20894d9a03710
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.37 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.37
new file mode 100644
index 000000000000..3fa6a175cc13
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.37
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.4 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.4.37
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-19.base.tar.xz mirror://gentoo/genpatches-3.4-19.extras.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9fbd424d53806df54322aeb7df195713
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.4
new file mode 100644
index 000000000000..3d9476fc78aa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.8 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.8.4
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://gentoo/genpatches-3.8-7.base.tar.xz mirror://gentoo/genpatches-3.8-7.extras.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ee2c44ce3a7c5ade87bde4d5783ec4bd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.70 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.70
new file mode 100644
index 000000000000..53bf6aa2e7cb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.70
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.0.70
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.70.xz mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e6f524f404f3be9d65789a30f0ce7507
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.41 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.41
new file mode 100644
index 000000000000..382506058d33
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.41
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.41
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.41.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ce2ea14c15e13a9266f6a74d3cfb74b5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.37 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.37
new file mode 100644
index 000000000000..485f854a37ca
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.37
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.4.37
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.37.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4156809208c529e9535cf327c9fa6273
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.4 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.4
new file mode 100644
index 000000000000..246d5b32dc12
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.8.4
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.8.4.xz mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	fa014ac485d8a2277bbd6aa17bc89521	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=44d23dd5e6e7b82fc2e994f8f332d0b3
diff --git a/metadata/md5-cache/sys-power/upower-0.9.20-r2 b/metadata/md5-cache/sys-power/upower-0.9.20-r2
new file mode 100644
index 000000000000..778d881ef158
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.9.20-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.22 sys-apps/dbus >=sys-auth/polkit-0.110 introspection? ( dev-libs/gobject-introspection ) kernel_linux? ( virtual/libusb:1 >=virtual/udev-197[gudev] ios? ( >=app-pda/libimobiledevice-1 >=app-pda/libplist-1 ) systemd? ( sys-apps/systemd ) ) dev-libs/libxslt app-text/docbook-xsl-stylesheets dev-util/intltool virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig
+DESCRIPTION=D-Bus abstraction for enumerating power devices and querying history and statistics
+EAPI=5
+HOMEPAGE=http://upower.freedesktop.org/
+IUSE=+deprecated doc +introspection ios kernel_FreeBSD kernel_linux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.22 sys-apps/dbus >=sys-auth/polkit-0.110 introspection? ( dev-libs/gobject-introspection ) kernel_linux? ( virtual/libusb:1 >=virtual/udev-197[gudev] ios? ( >=app-pda/libimobiledevice-1 >=app-pda/libplist-1 ) systemd? ( sys-apps/systemd ) ) kernel_linux? ( deprecated? ( >=sys-power/pm-utils-1.4.1 ) systemd? ( app-shells/bash ) )
+REQUIRED_USE=kernel_linux? ( !deprecated? ( systemd ) )
+SLOT=0
+SRC_URI=http://upower.freedesktop.org/releases/upower-0.9.20.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	systemd	0c62b9aceddad24eb96da235b42eded1	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	fea2246732f911905d6991fed203e65c	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5b8f820b53e07ca06d366bad2c957ac3
diff --git a/metadata/md5-cache/virtual/awk-0 b/metadata/md5-cache/virtual/awk-0
index 1cd9d84ef7f6..54153f512e19 100644
--- a/metadata/md5-cache/virtual/awk-0
+++ b/metadata/md5-cache/virtual/awk-0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( sys-apps/gawk sys-apps/mawk sys-apps/nawk sys-apps/busybox )
 SLOT=0
-_md5_=69c7494b856bea997a240e92fdc93271
+_md5_=e9d38e99e0b038201a47283f8e844baa
diff --git a/metadata/md5-cache/www-apps/tt-rss-1.7.4 b/metadata/md5-cache/www-apps/tt-rss-1.7.4
index 6670543af601..a31d9435bde4 100644
--- a/metadata/md5-cache/www-apps/tt-rss-1.7.4
+++ b/metadata/md5-cache/www-apps/tt-rss-1.7.4
@@ -10,4 +10,4 @@ RDEPEND=daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] ) !daemon? ( dev-lan
 SLOT=1.7.4
 SRC_URI=http://tt-rss.org/download/tt-rss-1.7.4.tar.gz
 _eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=f7c01eef0e41b02c4b5149b1f3f290c0
+_md5_=07a1026b1bb348e778ae7cd5d0b38fd1
diff --git a/metadata/md5-cache/www-client/chromium-26.0.1410.28 b/metadata/md5-cache/www-client/chromium-26.0.1410.40
similarity index 64%
rename from metadata/md5-cache/www-client/chromium-26.0.1410.28
rename to metadata/md5-cache/www-client/chromium-26.0.1410.40
index 5452179618b1..5a9f91ba1830 100644
--- a/metadata/md5-cache/www-client/chromium-26.0.1410.28
+++ b/metadata/md5-cache/www-client/chromium-26.0.1410.40
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.16.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1:= dev-libs/jsoncpp >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.12.3 dev-libs/protobuf:= dev-libs/re2 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) gps? ( >=sci-geosciences/gpsd-3.7[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 !arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) ) media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] ) >=net-libs/libsrtp-1.4.4_p20121108 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.16.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1:= dev-libs/jsoncpp >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.12.3 dev-libs/protobuf:= dev-libs/re2 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) gps? ( >=sci-geosciences/gpsd-3.7[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 !arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) ) media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] ) sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc 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-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.16.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1:= dev-libs/jsoncpp >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.12.3 dev-libs/protobuf:= dev-libs/re2 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) gps? ( >=sci-geosciences/gpsd-3.7[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 !arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) ) media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] ) >=net-libs/libsrtp-1.4.4_p20121108 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
+RDEPEND=app-accessibility/speech-dispatcher app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.16.11.1:= >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1:= dev-libs/jsoncpp >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.12.3 dev-libs/protobuf:= dev-libs/re2 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) gps? ( >=sci-geosciences/gpsd-3.7[shm] ) >=media-libs/alsa-lib-1.0.19 media-libs/flac media-libs/harfbuzz >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng media-libs/libvpx >=media-libs/libwebp-0.2.0_rc1 !arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) ) media-libs/opus media-libs/speex pulseaudio? ( media-sound/pulseaudio ) system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] ) sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.40.tar.xz
 _eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=096f061df68c1078d6437f8436512901
+_md5_=991ffe95d4a8f5867420e902467d03cd
diff --git a/metadata/md5-cache/www-client/opera-next-12.15_pre1742 b/metadata/md5-cache/www-client/opera-next-12.15_pre1742
new file mode 100644
index 000000000000..b42840ec2837
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-next-12.15_pre1742
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://my.opera.com/desktopteam/blog/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-12 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs dev-qt/qtcore:4 dev-qt/qtgui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/sepr_12.15-1742/opera-next-12.15-1742.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/sepr_12.15-1742/opera-next-12.15-1742.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/sepr_12.15-1742/opera-next-12.15-1742.i386.freebsd.tar.xz )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0cc255ae5b6ced9ff76d80554667daf1
diff --git a/metadata/md5-cache/x11-apps/ardesia-1.0 b/metadata/md5-cache/x11-apps/ardesia-1.0
new file mode 100644
index 000000000000..25d84e4db535
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/ardesia-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 gnome-extra/libgsf cwiid? ( app-misc/cwiid ) x11-misc/xdg-utils
+DESCRIPTION=Color, record and share free-hand annotations on screen and on network.
+EAPI=4
+HOMEPAGE=http://code.google.com/p/ardesia/
+IUSE=cwiid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 gnome-extra/libgsf cwiid? ( app-misc/cwiid )
+SLOT=0
+SRC_URI=http://ardesia.googlecode.com/files/ardesia-1.0.tar.bz2
+_md5_=43fe8aceb544c7dccbace3e0f863d1ae
diff --git a/metadata/md5-cache/x11-misc/mkxf86config-0.9.10 b/metadata/md5-cache/x11-misc/mkxf86config-0.9.10
deleted file mode 100644
index a048cf434b27..000000000000
--- a/metadata/md5-cache/x11-misc/mkxf86config-0.9.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=xorg-x11 configuration builder - used only on LiveCD
-HOMEPAGE=http://wolf31o2.org
-KEYWORDS=alpha amd64 ia64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=!mips? ( sys-apps/hwsetup )
-SLOT=0
-SRC_URI=http://wolf31o2.org/sources/mkxf86config/mkxf86config-0.9.10.tar.bz2
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d6b73f6aa14a8738ca95a089c5f34670
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt
deleted file mode 100644
index 937eadc32a9a..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Title:  Probleme mit kdeprefix und monolithischen Ebuilds
-Author: Theo Chatzimichos <tampakrap@gentoo.org>
-Translator: Christian Faulhammer <fauli@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-07-02
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/kdelibs-5
-
-Die Anleitung für KDE in Gentoo wurde überarbeitet und deckt nun die
-zwei wichtigsten Problemfelder für KDE-Benutzer ab:
-
-1.) Maskierung des USE-Flags kdeprefix für KDE 4-Benutzer und
-2.) die Aktualisierung auf KDE 3.5.10 und KOffice 1.6.3_p20090204 für
-die Benutzer der monolithischen Ebuilds.
-
-Die Anleitung [0] enthält alle Anweisungen zur Behebung dieser Probleme.
-
-[0] http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt.asc b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt.asc
deleted file mode 100644
index f57762e36a73..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.de.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAkpNS24ACgkQjDdoMVfcAHitMgCg0fH6Qzj8j4vgV0Ca6ychm6sP
-RuMAoIy0A44jcaHpUloqrLnm4mDs52z/
-=ySOq
------END PGP SIGNATURE-----
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt
deleted file mode 100644
index fff10c05f518..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Title: Προβλήματα με το kdeprefix και τα μονολιθικά ebuilds
-Author: Theo Chatzimichos <tampakrap@gentoo.org>
-Translator: Theo Chatzimichos <tampakrap@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-07-02
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/kdelibs-5
-
-Ο Οδηγός KDE του Gentoo έχει ανανεωθεί και πλέον καλύπτει δύο
-από τα πιο σημαντικά θέματα που αφορούν τους χρήστες KDE:
-
-1) την κάλυψη της σημαίας χρήσης kdeprefix για τους χρήστες του
-KDE 4 και
-2) την αναβάθμιση του KDE 3 και του KOffice 1.6.3 λόγω της
-σταθεροποίησης του KDE 3.5.10 και του KOffice 1.6.3_p20090204
-για τους χρήστες των μονολιθικών ebuilds.
-
-Παρακαλούμε να απευθυνθείτε στον οδηγό [0] για την επίλυση των
-παραπάνω θεμάτων.
-
-[0] http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt.asc b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt.asc
deleted file mode 100644
index 231328c0fd90..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.el.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAkpNS1wACgkQjDdoMVfcAHiV+wCfVpzCjogRWL7bTMbuW8Pf5bEa
-aZAAoOpCq5rjVWVpF0CpP/WL61FpEFEQ
-=fqki
------END PGP SIGNATURE-----
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt
deleted file mode 100644
index d90f7b21fd7c..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: kdeprefix and monolithic ebuilds issues
-Author: Theo Chatzimichos <tampakrap@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-07-02
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/kdelibs-5
-
-The Gentoo KDE Guide has been updated and now covers the two most
-serious issues affecting KDE users:
-
-1) masking of the kdeprefix USE flag for KDE 4 users and
-2) the upgrade of KDE 3 and KOffice 1.6.3 due to stabilisation to KDE
-3.5.10 and KOffice 1.6.3_p20090204 for users of monolithic ebuilds.
-
-Please refer to the guide [0] to solve those issues.
-
-[0] http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt.asc b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt.asc
deleted file mode 100644
index 8c15de69fca4..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.en.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAkpNS2IACgkQjDdoMVfcAHjCwgCg09b5BEayDE0GvLH/Bj4qXpkW
-owsAoMJSHF5ZLsEV00/vbuWEt3rtVbej
-=sFbS
------END PGP SIGNATURE-----
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt
deleted file mode 100644
index f8f4b1bd3aa9..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Title: Problemen met kdeprefix en de monolitische ebuilds
-Author: Theo Chatzimichos <tampakrap@gentoo.org>
-Translator: Fabian Groffen <grobian@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-07-02
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/kdelibs-5
-
-De Gentoo KDE Guide is bijgewerkt en heeft nu informatie over de twee
-grootste problemen voor KDE gebruikers:
-
-1) masking van de kdeprefix USE-vlag voor KDE 4 gebruikers, en
-2) de upgrade van KDE 3 en KOffice 1.6.3 naar versies 3.5.10 en
-1.6.3_p20090204 respectievelijk voor gebruikers van de monolitische
-ebuilds.
-
-Voor meer informatie over het oplossen van deze problemen, zie de Gentoo
-KDE Guide [0].
-
-[0] http://www.gentoo.org/proj/en/desktop/kde/kde4-guide.xml
diff --git a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt.asc b/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt.asc
deleted file mode 100644
index 2511446177e3..000000000000
--- a/metadata/news/2009-07-02-kdeprefix+monolithics/2009-07-02-kdeprefix+monolithics.nl.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAkpNS2kACgkQjDdoMVfcAHjgOQCguFCqXC7PndvSNhwqxbGPfaga
-w0IAniJkjMiWKlo45uaqOrSHb25D+T9P
-=8Bo+
------END PGP SIGNATURE-----
diff --git a/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt b/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt
deleted file mode 100644
index 6ece43a26715..000000000000
--- a/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: KDE3 to be masked and removed from portage
-Author: Samuli Suominen <ssuominen@gentoo.org>
-Author: Tomáš Chvátal <scarabeus@gentoo.org>
-Author: Alex Alexander <wired@gentoo.org>
-Content-Type: text/plain
-Posted: 2009-11-02
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <kde-base/kdelibs-4
-
-After multiple setbacks we have finally managed to stabilise KDE4 on
-both major desktop architectures (amd64 and x86), with other teams to
-follow.
-
-For this and other reasons as discussed at [1], those of you who still 
-use KDE3 should be seriously considering an upgrade in the near future.
-
-KDE3 is currently being phased out of the tree, meaning ebuilds with
-KDE3 support found to be broken or clashing with KDE4 features are having
-that support removed.
-
-KDE3 packages will be moved to a special overlay named kde-sunset.  
-This can be found in layman.  [2] Note that this overlay is going to be
-user maintained and will NOT be developer reviewed. [3]
-
-[1] - http://archives.gentoo.org/gentoo-desktop/msg_a3e260bd0545cb4e763c81bc60f81de2.xml
-[2] - http://www.gentoo.org/proj/en/overlays/userguide.xml
-[3] - http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git
diff --git a/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt.asc b/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt.asc
deleted file mode 100644
index e0e51d6dadc6..000000000000
--- a/metadata/news/2009-11-02-kde-3/2009-11-02-kde-3.en.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEABECAAYFAkr3eOcACgkQCtniI/gSTSd6TACeK4elehTzdX0dK2Q8t2oHsmzS
-YWQAn1r2gThCWqcr/Ln6YPU9FIqB3w6h
-=oECE
------END PGP SIGNATURE-----
diff --git a/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt b/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt
deleted file mode 100644
index 1f9f263414e4..000000000000
--- a/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Title: Paludis kdebuild-1 Removal
-Author: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
-Content-Type: text/plain
-Posted: 2009-12-14
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: <sys-apps/paludis-0.44_alpha
-
-kdebuild-1 was an EAPI used by the Gentoo KDE team and the Genkdesvn
-project for various live ebuilds in overlays.
-
-As support for this ebuild format has never been officially approved,
-the support will phase out from the Paludis package manager.  To avoid
-any troubles users need to take some steps to properly remove all
-kdebuild-1 packages from their installation.
-
-Users should verify that they have no kdebuild-1 packages installed. If
-Paludis was built with the 'inquisitio' use flag enabled, you can use:
-
-    $ inquisitio -K installed -k EAPI kdebuild-1
-
-Otherwise, use:
-
-    $ paludis -q '*/*::/[.EAPI=kdebuild-1]'
-
-and, if any such packages are installed, they must be uninstalled
-before Paludis is upgraded.
diff --git a/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt.asc b/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt.asc
deleted file mode 100644
index 099e0999dca4..000000000000
--- a/metadata/news/2009-12-21-kdebuild/2009-12-21-kdebuild.en.txt.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEABECAAYFAktTR8YACgkQNQqtfCuFneMVLgCfeZw9UQD5Aw2OJU93hnTNwYer
-0TQAniXwCN8bwuVzJ+lj9dZMuSmJ18Rr
-=9xv6
------END PGP SIGNATURE-----
diff --git a/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt b/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt
deleted file mode 100644
index 30e24763637c..000000000000
--- a/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Title: Removal of kdeprefix support
-Author: Jonathan Callen <abcd@gentoo.org>
-Content-Type: text/plain
-Posted: 2011-05-22
-Revision: 2
-News-Item-Format: 1.0
-Display-If-Installed: >=kde-base/kdelibs-4
-
-This news item is relevant to you only if you unmasked and enabled
-kdeprefix useflag on your kde-base packages.
-
-On 2011-06-06, kdeprefix support will be removed from all KDE ebuilds in
-portage.  After this is done, only one version of KDE SC will be able to
-be installed at a time on a system.  If you are currently using
-USE=kdeprefix to install multiple versions of KDE SC simultaneously, you
-will need to migrate to a non-kdeprefix installation.
-
-To migrate, you will need to set USE=-kdeprefix (or remove the manual
-unmasking of that flag in /etc/portage/profile) and rebuild all of the
-installed packages in kde-base/.  To reinstall these packages, you can
-run: emerge --update --deep --newuse @world
diff --git a/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt.asc b/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt.asc
deleted file mode 100644
index b14a96f21b44..000000000000
--- a/metadata/news/2011-05-22-kdeprefix/2011-05-22-kdeprefix.en.txt.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAABCAAGBQJN2n44AAoJELHSF2kinlg4GoQQAITIqUnZy9iOpwok4doZj7Yy
-prQQUFGNgKDrRUA9l2CifYqOMrcHlbOySrJQ+fRNAkPH/h9VP415l4BxyIUIuoC1
-KpdVOgPzm4UzFP1uw+c7RsfuNCD/fuoY9aomN75/LjMLS4J4AaQDF76o1OaThJWD
-+A8ihZLQcMiwcHeqnZZPbRtL0m0LVd2oW3Wrp6tuKva2xlqt2PEqs8/xQQu6NXAL
-3KItl7gqqcG7VeW0xCjVLrm4Tj0R8robfTaYh/sOLjPeYDZLpf3xU+Ycl+EV2wto
-Iqjhopc4BuRqMAY9bxajHShVDzwUaVXzoh4LwFf7RovnOsgf63/01OcQPVvY7MlQ
-nw6fmb2XKCqvlaMHB4YdVNVA5tGaKY01TPGUhZM+2bfeFTV5ZK8+0shmB1GPf500
-T8faFIEbdi85nYKKKFKJ5qXh9hEhmhhAs9DrRusgXxguIt5QTiETc/u2ZIyW8HR/
-qTrorVeaad9wtAoEmPz0WyG0DXdXvi/hTgjmCRb503rNG1VidL1qeUnJjdA4JyxO
-7qOeor5da3swWXREHNTmfIBc3wO20A4Gi3m925jmkJY1aiaybSKVR6FfkaK0hiR8
-Gt00FaOBQlSUsxWrOwf2QHBNzeFxS1Qz0dLJQXnnPK+ZW8NUep7GC74w9WASsow8
-XS3hh7FHt4bLC1XUhGke
-=C4GZ
------END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 103fc2e0ab0b..8f0882ce860c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 21 Mar 2013 06:36:55 +0000
+Fri, 22 Mar 2013 15:36:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5c09c6dd239d..81fe5d87dd74 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Mar 21 06:36:53 UTC 2013
+Fri Mar 22 15:36:56 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 233fcdb3beeb..3e78419c91bf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 21 Mar 2013 07:00:01 +0000
+Fri, 22 Mar 2013 16:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d28ffedb2f58..f69b208158f4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1363847701 Thu Mar 21 06:35:01 2013 UTC
+1363966501 Fri Mar 22 15:35:01 2013 UTC
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild
index 01574a3bcb5d..64f76bc65f29 100644
--- a/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild
+++ b/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild,v 1.3 2013/03/17 12:36:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.11.2.ebuild,v 1.4 2013/03/21 15:09:51 jer Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="selinux"
 
 DEPEND=">=net-firewall/iptables-1.2.4
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild
index 94656234f97a..07e63b28ff8d 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild,v 1.3 2013/03/17 12:36:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild,v 1.4 2013/03/21 15:10:11 jer Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="net-firewall/iptables
diff --git a/net-firewall/shorewall/shorewall-4.5.11.2.ebuild b/net-firewall/shorewall/shorewall-4.5.11.2.ebuild
index 261747660a20..670660d52709 100644
--- a/net-firewall/shorewall/shorewall-4.5.11.2.ebuild
+++ b/net-firewall/shorewall/shorewall-4.5.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.11.2.ebuild,v 1.3 2013/03/17 12:36:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.11.2.ebuild,v 1.4 2013/03/21 15:10:09 jer Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND=">=net-firewall/iptables-1.2.4
diff --git a/net-im/ekg2/ekg2-0.3.1-r1.ebuild b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
index c3ece0c44f88..e8d28e4088f4 100644
--- a/net-im/ekg2/ekg2-0.3.1-r1.ebuild
+++ b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.4 2012/12/17 00:37:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.5 2013/03/21 16:30:49 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gif gnutls gpg gpm gsm gtk idn inotify jpeg ncurses nls
+IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
 	oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode
 	xmpp xosd zlib"
 
@@ -83,7 +83,6 @@ src_configure() {
 		$(use_with gsm libgsm)
 		$(use_with gtk)
 		$(use_with idn libidn)
-		$(use_with inotify)
 		$(use xmpp && echo '--with-expat' || use_with rss expat)
 		$(use_with jpeg libjpeg)
 		$(use_with ncurses)
@@ -100,6 +99,7 @@ src_configure() {
 		$(use_with zlib)
 		$(use_enable nls)
 		$(use_enable unicode)
+		--with-inotify
 		--without-ioctld
 		--disable-remote
 		--enable-skip-relative-plugins-dir
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 99e5d8450389..200cfd38f15e 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.5 2012/12/17 00:37:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.6 2013/03/21 16:30:49 mgorny Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gpm gpg gtk inotify minimal ncurses nls nntp openssl
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
 	perl python readline rss spell sqlite sqlite2 ssl xmpp unicode zlib"
 
 RDEPEND="dev-libs/glib:2
@@ -98,7 +98,7 @@ src_configure() {
 
 		# optional deps
 		$(use_with gpm)
-		$(use_with inotify)
+		# do not pass --with-inotify as it will fail if check fails
 		$(use_with spell aspell)
 		$(use_with ssl gnutls)
 		$(use_with zlib)
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index 7fa65569e13e..70c61f7364d6 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -31,8 +31,6 @@
 			<pkg>net-libs/libgadu</pkg>).</flag>
 		<flag name='gpg'>Enable jabber message encryption through
 			<pkg>app-crypt/gpgme</pkg>.</flag>
-		<flag name='inotify'>Enable inotify-based filesystem monitoring support
-			for xmsg&amp;mail plugins.</flag>
 		<flag name='minimal'>Disable building extra plugins with no additional
 			deps.</flag>
 		<flag name='openssl'>Support encryption in sim plugin, using OpenSSL.</flag>
diff --git a/net-im/gajim/files/gajim-0.15.3-starttls.patch b/net-im/gajim/files/gajim-0.15.3-starttls.patch
new file mode 100644
index 000000000000..91f0e4940234
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.15.3-starttls.patch
@@ -0,0 +1,11 @@
+Index: src/common/connection.py
+===================================================================
+--- src/common/connection.py	(revision 14431)
++++ src/common/connection.py	(revision 14476)
+@@ -1329,5 +1329,5 @@
+                 return True
+             i += 1
+-        if hasattr(con.Connection, 'ssl_fingerprint_sha1'):
++        if con.Connection.ssl_fingerprint_sha1:
+             saved_fingerprint = gajim.config.get_per('accounts', self.name,
+                 'ssl_fingerprint_sha1')
diff --git a/net-im/gajim/gajim-0.15.3-r1.ebuild b/net-im/gajim/gajim-0.15.3-r1.ebuild
new file mode 100644
index 000000000000..77e733aa0755
--- /dev/null
+++ b/net-im/gajim/gajim-0.15.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3-r1.ebuild,v 1.1 2013/03/21 09:50:37 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farstream:0.1[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	xhtml? ( dev-python/docutils )"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-roster.patch
+	"${FILESDIR}"/${P}-starttls.patch
+	)
+
+src_prepare() {
+	echo "src/command_system/mapping.py" >> po/POTFILES.in
+	echo '#!/bin/sh' > config/py-compile
+	autotools-utils_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myeconfargs=(
+			$(use_enable nls)
+			$(use_with X x)
+			--docdir="/usr/share/doc/${PF}"
+			--libdir="$(python_get_sitedir)"
+			--enable-site-packages
+		)
+		run_in_build_dir autotools-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		run_in_build_dir autotools-utils_src_compile
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	testing() {
+		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		run_in_build_dir autotools-utils_src_install
+		python_optimize "${ED}"/$(python_get_sitedir)
+	}
+	python_foreach_impl installation
+
+	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index a42adc563e38..c7cee44d94bf 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -4,3 +4,4 @@ DIST libtorrent-0.12.7.tar.gz 632060 SHA256 96f59ec9593cd77ef9bad78cadef9ce6f104
 DIST libtorrent-0.12.9.tar.gz 667864 SHA256 15dc9e8dd45d070f447e599bef08ef0ca421bac6e7f55e608dcd19360594af64
 DIST libtorrent-0.13.1.tar.gz 723523 SHA256 9e51ab1409444238de2a2a9e24405d43b1c18b958bc14e7c598aa69ab6f1baf6
 DIST libtorrent-0.13.2.tar.gz 725088 SHA256 ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f SHA512 03528531141c2e0a82c5371b619850bb54be2fc702ca676093f742795284e396fa664ea38302c7c8466bb33ca2ec51039e7c942d7bd681b1a2e9ae5ec69c4c20 WHIRLPOOL 9bc9b9e1069fe3aba862ae3da85cdb2932b0120e3a0de47b0bac97bb56bfc30839c5278a1e7ada17b037a64dfdb68fb24749064e000ab41dc6b1462e90d61a64
+DIST libtorrent-0.13.3.tar.gz 732847 SHA256 34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677 SHA512 40f504db26d52b0c65fc1008c7b1465bde0e316c776028c5448bf15c6fd38389fad780b0c200933e51f63974a43942603e0103d45a98a3dd57f23f01a306ef25 WHIRLPOOL 7ed5c4903413c9a1587a561a9ec4bedf86f1ed78c8f81c0d0ebe7bf7de9f45187cb41520d3187d62d3718c2fb379857fac255311618b42bfcf77794ee8636ff2
diff --git a/net-libs/libtorrent/libtorrent-0.13.3.ebuild b/net-libs/libtorrent/libtorrent-0.13.3.ebuild
new file mode 100644
index 000000000000..1c0e16522729
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.13.3.ebuild,v 1.1 2013/03/22 08:28:17 patrick Exp $
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug ipv6 ssl"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.2.2:2
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+#	epatch "${FILESDIR}"/download_constructor.diff
+	elibtoolize
+}
+
+src_configure() {
+	# the configure check for posix_fallocate is wrong.
+	# reported upstream as Ticket 2416.
+	local myconf
+	echo "int main(){return posix_fallocate();}" > "${T}"/posix_fallocate.c
+	if $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${T}"/posix_fallocate.c -o /dev/null 2>/dev/null ; then
+		myconf="--with-posix-fallocate"
+	else
+		myconf="--without-posix-fallocate"
+	fi
+
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--disable-dependency-tracking \
+		--enable-aligned \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		${myconf}
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 04fd256ceddd..e4b4ad9f0ef0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,2 @@
-DIST node-v0.10.0.tar.gz 12777259 SHA256 1624dc37866ebfb5431e3393e6b049cf238cac8ad4d20c6d567263b1259177ab SHA512 4d7dd3938563fb374e8c35e741b9d10fbf88c087d0f914f37cade0e9dd7f760e3d4f347de964e9ec2ced06bc3945bb0804d997051699cbc197640419a8f17966 WHIRLPOOL f13ab9b62a2a39a98a0b767335dc66cb20e95f6f5d5ec2bc08d8f62de55e0582fc12b52593682a509f343547295338e76f223f4235a6b5b46cefbf178f954ea2
-DIST node-v0.6.21.tar.gz 10235165 SHA256 22265fd07e09c22f1d058156d548e7398c9740210f534e2f848eeab5b9772117 SHA512 b00908576986741a2c10d00fb9ae4b97c8a8bd8e5937fc196b13bab80098b07f1f5eb2d0e67a1dd1d6d56acf45e4e847a60325501d9db3f02ddebf94e5393d5f WHIRLPOOL 1fa1d71ed761cb9fcef9b3bb0c640075349e0ccc67951e4554de200fd4091051d5b9b56f8d0cf28088df5ca2e9d1b0600e4a44ccf920b01ec570300f2bc38c95
+DIST node-v0.10.1.tar.gz 12790341 SHA256 2628dbf42fb3ec3927e595dc66f2f96e3c23455990dea690e300296d92afe4d3 SHA512 552223c7e8664e199574affb77f504ad5d4f4f092edb12df10fa013ac6af5a9a45e30f334e0255a256eb0a9604bc697f74b039e9e4e6f7453ea3f0c781c03fbe WHIRLPOOL f5dda85c10e04ef7999882bb76c0e6ea36198cc551bfcdb8a2079145e626442aabcb18440cf5fdbabac30ff066f24ecca0f1010606b13e6b1cdc803d4c73cafe
 DIST node-v0.8.21.tar.gz 12191813 SHA256 e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6 SHA512 10a305d5d798703144a4d4a29878b261be516f29a0bfe349e73879b81e16db89a6fabfce43a6b1abef2f085aa2cf884bde310b9feeb377083c43f674492f5d99 WHIRLPOOL f44085bb6710289adc85653f39073d17527bbe2bd27d9a998376a3eeab9fea462fb8f9d0f3baab4bda28d3046d3920a58ab14cfaa9eb1d20bb66cfdc1c71cc72
-DIST node-v0.9.12.tar.gz 12762373 SHA256 d1dbf425eb72b7c6d931f5fabf79b1e67ce1b2808c19c4b06a9aafe313ac2474 SHA512 1717da7736a43acd79ef3e0e3d430abad3ae9e6b58d045e0cadf9b76ae50001fc7b61a41b9e2be457849cced18515c97f2800b6fdfe65bb47b7621002b07b7ae WHIRLPOOL 03e3f6409813540a6baf02af4e4245fc6182b779da8b021e3937ff0d1de908070f00cc2430976fe981376471ad55cbe9743fc4c95fad39c06b3a1128d611c3e0
-DIST node-v0.9.3.tar.gz 12481901 SHA256 7e1750cd47d7b8c13c7cf12457b6a528fa2abf8a10b7c9a35c13ed47cebaab41 SHA512 2e2670832a5838fdffa58a8b1a0afd57d79dc76f92ea319761e35e91fb1495409f793c8080e7de581368520afc5677530b5ad8b97eaa733fe27eeb2a6746fdde WHIRLPOOL 8e9bf4bb605c39fc0b8d13bcf0570e4e34b04e5b363fc98d8eb7f24e3943dd0ec6d5c21347732bf1d5b7d39e6a9a84bbd10aa223fe8a11c1b332b120ba58ce48
-DIST node-v0.9.9.tar.gz 12633438 SHA256 d285559044db3e340ab6403d7508943fbec4cc166f1ad96a00ac441794ce8a88 SHA512 c3bbdf447c2e76c992619de0004885293219c94ddb8b32296a9dc734f0776976f83026ec4f59c6228b77d0b6f6a83e59d8a803f66417525e9feaccc8df876792 WHIRLPOOL ebb76cf36446f7b761d5879c2c255e476d0be2862bcecdadfa4537a9560988151b54d3a21cf2220d4a560d0afb8b1863abd9f5d6bd272cda68883ee0f8087e49
diff --git a/net-libs/nodejs/nodejs-0.10.0.ebuild b/net-libs/nodejs/nodejs-0.10.1.ebuild
similarity index 93%
rename from net-libs/nodejs/nodejs-0.10.0.ebuild
rename to net-libs/nodejs/nodejs-0.10.1.ebuild
index 87161457d77d..fc5011579c31 100644
--- a/net-libs/nodejs/nodejs-0.10.0.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.0.ebuild,v 1.1 2013/03/14 02:39:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.1.ebuild,v 1.1 2013/03/22 03:48:16 patrick Exp $
 
 EAPI=5
 
diff --git a/net-libs/nodejs/nodejs-0.6.21-r1.ebuild b/net-libs/nodejs/nodejs-0.6.21-r1.ebuild
deleted file mode 100644
index 07eb5ab6b509..000000000000
--- a/net-libs/nodejs/nodejs-0.6.21-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.6.21-r1.ebuild,v 1.2 2013/01/15 06:31:57 zerochaos Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit python eutils pax-utils
-
-# omgwtf
-RESTRICT="test"
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/v8-3.6.6.24
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/node-v${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/flags = \['-arch', arch\]/s/= .*$/= ''/" wscript || die
-}
-
-src_configure() {
-	# this is a waf confuserator
-	./configure --shared-v8 --prefix="${EPREFIX}"/usr || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	docompress -x /lib/node_modules/npm/man
-	emake DESTDIR="${D}" install || die
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	emake test || die
-}
diff --git a/net-libs/nodejs/nodejs-0.6.21-r2.ebuild b/net-libs/nodejs/nodejs-0.6.21-r2.ebuild
deleted file mode 100644
index f2cd6a61680e..000000000000
--- a/net-libs/nodejs/nodejs-0.6.21-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.6.21-r2.ebuild,v 1.1 2013/02/25 06:36:04 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit python eutils pax-utils
-
-# omgwtf
-RESTRICT="test"
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/node-v${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/flags = \['-arch', arch\]/s/= .*$/= ''/" wscript || die
-}
-
-src_configure() {
-	# this is a waf confuserator
-	./configure --prefix="${EPREFIX}"/usr || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	docompress -x /lib/node_modules/npm/man
-	emake DESTDIR="${D}" install || die
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	emake test || die
-}
diff --git a/net-libs/nodejs/nodejs-0.9.12.ebuild b/net-libs/nodejs/nodejs-0.9.12.ebuild
deleted file mode 100644
index c321a062d356..000000000000
--- a/net-libs/nodejs/nodejs-0.9.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.12.ebuild,v 1.1 2013/03/07 04:11:23 patrick Exp $
-
-EAPI=5
-
-# a few tests fail. Should be fixed in 0.10
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-
-inherit python-any-r1 pax-utils
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}
-	virtual/python-json
-	test? ( net-misc/curl )"
-
-S=${WORKDIR}/node-v${PV}
-
-src_prepare() {
-	# fix compilation on Darwin
-	# http://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-}
-
-src_configure() {
-	"${PYTHON}" configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	"${PYTHON}" tools/install.py install "${ED}"
-
-	dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
-	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
-	rm -rf "${ED}"/usr/lib/dtrace
-
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	"${PYTHON}" tools/test.py --mode=release simple message || die
-}
diff --git a/net-libs/nodejs/nodejs-0.9.3-r1.ebuild b/net-libs/nodejs/nodejs-0.9.3-r1.ebuild
deleted file mode 100644
index e1ce319e501d..000000000000
--- a/net-libs/nodejs/nodejs-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.3-r1.ebuild,v 1.5 2013/02/16 18:16:09 floppym Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-inherit python eutils multilib pax-utils
-
-# omgwtf
-RESTRICT="test"
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-DEPEND="=dev-lang/v8-3.15*:=
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/node-v${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# fix compilation on Darwin
-	# http://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-}
-
-src_configure() {
-	# this is an autotools lookalike confuserator
-	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	docompress -x /lib/node_modules/npm/man
-	local MYLIB=$(get_libdir)
-	mkdir -p "${ED}"/usr/include/node
-	mkdir -p "${ED}"/usr/bin
-	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
-	mkdir -p "${ED}"/usr/"${MYLIB}"/node
-	cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
-	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
-
-	# now add some extra stupid just because we can
-	# needs to be a symlink because of hardcoded paths ... no es bueno!
-	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	emake test || die
-}
diff --git a/net-libs/nodejs/nodejs-0.9.9.ebuild b/net-libs/nodejs/nodejs-0.9.9.ebuild
deleted file mode 100644
index ff2b80e8c25a..000000000000
--- a/net-libs/nodejs/nodejs-0.9.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.9.ebuild,v 1.2 2013/02/16 18:16:09 floppym Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-inherit python eutils multilib pax-utils
-
-# omgwtf
-RESTRICT="test"
-
-DESCRIPTION="Evented IO for V8 Javascript"
-HOMEPAGE="http://nodejs.org/"
-SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-IUSE=""
-
-DEPEND="=dev-lang/v8-3.15*:=
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/node-v${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# fix compilation on Darwin
-	# http://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-}
-
-src_configure() {
-	# this is an autotools lookalike confuserator
-	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	docompress -x /usr/$(get_libdir)/node_modules/npm/man
-	local MYLIB=$(get_libdir)
-	mkdir -p "${ED}"/usr/include/node
-	mkdir -p "${ED}"/usr/bin
-	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
-	mkdir -p "${ED}"/usr/"${MYLIB}"/node
-	cp src/*.h "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
-	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
-	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
-
-	# now add some extra stupid just because we can
-	# needs to be a symlink because of hardcoded paths ... no es bueno!
-	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
-	pax-mark -m "${ED}"/usr/bin/node
-}
-
-src_test() {
-	emake test || die
-}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2c55193925c9..83049d829227 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -2,9 +2,7 @@ DIST dovecot-2.0-pigeonhole-0.2.6.tar.gz 1234253 SHA256 49829e4aed763848b63b2bf9
 DIST dovecot-2.0.19.tar.gz 3357056 SHA256 50e49e181acea7f2c08008c5a61500c01803dc36b5ae1e6ffe24c1c56e3c69b4 SHA512 a6a54675c3f991a9c86a285d3fcbd388ba92f902e032362a6fc846522090daf05b8e2d4bae623a1568120384c981105c8b80c1ab0f365fdb1c22da1a84e025f9 WHIRLPOOL aad7772edf993c364cc53b36425c2a34b1170215a6f54cb22ea34cbf5b5b587602e393e38ca98e583129f2673d6f467e466f554eb5277e49ad5126305ca93ae4
 DIST dovecot-2.1-pigeonhole-0.3.1.tar.gz 1084148 SHA256 e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7 SHA512 9df0a428f43287606522120a368c07513b39852325c436bc9c523e52f82a4c97232991ca832630baaa8c704adc2234ed18c2c0a63f8211f7f412dbe285436240 WHIRLPOOL 72e346e338a3e0149cc978ccc9c54943efad165d82d54cade1d954688f1806b30b3509c7f90c6589673c2808f9d85497af28aec63e2e060ca5934ea4ef101e9a
 DIST dovecot-2.1-pigeonhole-0.3.3.tar.gz 1078559 SHA256 1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e SHA512 1e9b611fce25860e3c1663bb98ba14d823cd7903ca9889194da157180e296c5a38de368bef0ff152620644963b51f2a0648673a0136f304d677e88ba2ee4e9be WHIRLPOOL f83c77559e1bf98e4f8b29652d5a66720fe9f1264af3ec943fd4c184071e2c0495cca4b86d541eee91fd34f3cd6cf902e8e347cb2dab55b8ecb51d4db2c50a98
-DIST dovecot-2.1.12.tar.gz 3839088 SHA256 d76ae15146452d053c423d883b2cbc24f62a55cf2f1f547577f42bc7d8d20840 SHA512 269beb56be927c33415fe0c0a94c73331b32a4d0104f28e98e9a24ea27475450abb18c8fea1aa134ac8f9747a0fe2fe92049c7318929dee7ef6126a0d7a0f6dd WHIRLPOOL 9b3f615b17d88ed67829960220fd27ae2a9b64cc31d2395a7dff9a349c217b7505454d2f3c0aeac5d1e6dc42602a42b715ab6b9620e3e4128c4a6cdc19acc333
-DIST dovecot-2.1.13.tar.gz 3843407 SHA256 d0982b1a3b4cefe06d8d5e9e90372dc7569b9cc35bcb4d8087f09362b2632278 SHA512 8be152d10b3d29c9067c4fc46eb5ddbb0b6c3cabf70fc3c88ce7add89fc2730a28b33fb8a129dced2aa314e9abadc095731eb66a96904d6b45fd2187cf5f1e74 WHIRLPOOL fab53e2f56c33dc60dc38106155598754e02de92150c2b5a7d4de7472d1f1f60c78a06bbc27b48514dfe244123c654580575a7d92eb52ef746be8b3ce692b9a0
 DIST dovecot-2.1.15.tar.gz 3862058 SHA256 706a69cede44551401dc5f49225b97b4b7b7e30ddbdc5cc11176a23a0fa72ded SHA512 e97f12ba5fbf2608c377730467efd0bd6773aab2f31dd886c25e8966ca084599498da1c092fc52e46456da3fd7fc4ca410623b1077838a3561ed164ca0acd9d3 WHIRLPOOL 5bdcad2f1c5833d2142c1282c4321c3488f3c4e75ea8a95561d57ba41f733ec08633f2d69b8cdee5cb0a233f8088d89fc61ec816f0ed3eb7769b331e3c865b75
 DIST dovecot-2.1.9.tar.gz 3829755 SHA256 77d11112bced9e2bbb1410ce5e6464af477775315ec67c7f3ab4d0da64e3c512 SHA512 da16bce6fdb535dd8eb48b4626444296e78808613f5a0d3d28dd7a509a82a276ee4f34d3ed8c339a98bd6aaee10ddf1c2df62060748b4c603a06ab165086d8de WHIRLPOOL f5bfe022687f36fcb06aa46165d6ffe8323bd13e990b7acecaed6af91226c5b06bc1e479f242dd6f963ff6039f633d790221559af42c4debf39ca252715a81f3
-DIST dovecot-2.2-pigeonhole-99eec511aa2c.tar.bz2 579693 SHA256 ae1f9f44fceb74b8118e77070685ed77566d7d47505da9296a11d296c18ad27f SHA512 3e55468efbae295925e17b5b112b74cb917479512968e4aa00471b13601a86da0c60c629e76ffc1df566545ba1d70903e4ca9bfe10bbc795fe3ff259550bac3c WHIRLPOOL 65a423d19f55398d66190e08f71edf42f4f6428eb3cf904217f6bdda2f1363806dce8bb0aeed518dc9372cf70bb12cdc740ce0f104e6436de954d2f95d0b5307
-DIST dovecot-2.2.rc2.tar.gz 4223100 SHA256 99f8d67ccdf9c4bd294fa17add2313e66082a7b7c396666ff3d739f59dbcd951 SHA512 806130b840878ac2335295113cf6c035a328589e6a1200d2c33986222365a1ea33373c6e6b1c8997501ba6f3e0a538ad5fc6e963909e36797caccd976c894116 WHIRLPOOL be86e07f14dcba4ecbd9aa777a744fd6c2ad588c9e77fe7e027b8be35aabce55bfd8a3b7e85a197504dc2613bf4644b2e2a71fabc6c95467251453e00019de47
+DIST dovecot-2.2-pigeonhole-b75b00760b86.tar.bz2 579987 SHA256 a55c514b91f4c43dbdb656785bde813fd64ad5f5df66e5dc071212d420c3c003 SHA512 2005a080d8a97dca62b0fd4d444ec875f3f0e8bc1a0d0f56a0a03e812dcd9d366ee387b7fdb1e53dc49052391032fcbc4b1eefd817035d9356812c5c42320617 WHIRLPOOL 823dcabad94917dfa4ae6e21a885255ba989fadeb03e140e7337b13fc366ff00f05b88c50e2d3d1b5df842c8d871d5bc9e4f113335d1468f5713f6f47bcead50
+DIST dovecot-2.2.rc3.tar.gz 4222611 SHA256 71f9e19925b5e713be06a019084ddbb3dd2e0452c31fe07466f7613d39f8ee67 SHA512 3af9ba7f33c9c4062d2242d75635237481f1c97a9947fd889d01f369cfeca2bff790653da00a427cd2e25fe4f392117b9a8e6bfa81ceccd146959a2b74b16aa7 WHIRLPOOL c7fdb7d6ae09654742baf447e762fda30757ee434efbaabcf14db57d8cc73ea9c70844a7d7684ae8a66e72cc307ed96a5a0990d115d667f3d9f3b59403b15093
diff --git a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild b/net-mail/dovecot/dovecot-2.1.12-r1.ebuild
deleted file mode 100644
index e478d9dc744b..000000000000
--- a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.12-r1.ebuild,v 1.8 2012/12/15 17:53:00 armin76 Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd user multilib
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.3.3"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.1.13.ebuild b/net-mail/dovecot/dovecot-2.1.13.ebuild
deleted file mode 100644
index 4935ae0d8d56..000000000000
--- a/net-mail/dovecot/dovecot-2.1.13.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.13.ebuild,v 1.1 2013/01/07 13:43:00 eras Exp $
-
-EAPI=4
-inherit eutils versionator ssl-cert systemd user multilib
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.3.3"
-SRC_URI="http://www.dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve +ssl static-libs suid zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00-r8"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with ssl ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2_rc2.ebuild b/net-mail/dovecot/dovecot-2.2_rc3.ebuild
similarity index 99%
rename from net-mail/dovecot/dovecot-2.2_rc2.ebuild
rename to net-mail/dovecot/dovecot-2.2_rc3.ebuild
index ad51ea9a2201..dc2c9f9e102a 100644
--- a/net-mail/dovecot/dovecot-2.2_rc2.ebuild
+++ b/net-mail/dovecot/dovecot-2.2_rc3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2_rc2.ebuild,v 1.1 2013/02/26 09:41:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2_rc3.ebuild,v 1.1 2013/03/22 09:57:06 eras Exp $
 
 EAPI=5
 inherit eutils versionator ssl-cert systemd user multilib
 
 MY_P="${P/_/.}"
 major_minor="$(get_version_component_range 1-2)"
-sieve_version="99eec511aa2c"
+sieve_version="b75b00760b86"
 SRC_URI="http://dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
 	sieve? (
 	http://hg.rename-it.nl/dovecot-${major_minor}-pigeonhole/archive/${sieve_version}.tar.bz2 \
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index a151c9521983..e12cf7c401b5 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1 +1,2 @@
 DIST mailutils-2.99.97.tar.xz 2787304 SHA256 e3455503ff27d37d60e18a49a66cc1a223526fa43d9b8d09e5ef7386f2d90e1b SHA512 e2fdff9ed422f59c06d640f07510faca890ba88467a932693bbdbf0dc6d76c4577c017a3bdb353b62767045a579a02576e3088efda94f93a3adeaf71c8b259bc WHIRLPOOL 49f6e986718cd3b6f4b895e5cf11c6a10a28e06465dd786ed05cac88cd934c86ffe19990cc9f0b7f421e19533f89b01797aaec9c4778846a82d5cf3eeb8464ec
+DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
new file mode 100644
index 000000000000..8ac418c7c037
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-array_bounds.patch
@@ -0,0 +1,11 @@
+--- libmu_auth/ldap.c	2012-03-25 14:02:22.000000000 +0300
++++ libmu_auth/ldap.c	2013-03-22 12:29:19.034880845 +0200
+@@ -534,7 +534,7 @@
+ 
+   env[0] = "user";
+   env[1] = key;
+-  env[3] = NULL;
++  env[2] = NULL;
+ 
+   ws.ws_env = env;
+   if (mu_wordsplit (filter_pat, &ws,
diff --git a/net-mail/mailutils/mailutils-2.99.98.ebuild b/net-mail/mailutils/mailutils-2.99.98.ebuild
new file mode 100644
index 000000000000..5555a6079b1e
--- /dev/null
+++ b/net-mail/mailutils/mailutils-2.99.98.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.98.ebuild,v 1.1 2013/03/22 10:41:58 eras Exp $
+
+EAPI=5
+PYTHON_DEPEND="python? 2"
+
+inherit eutils flag-o-matic python toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters."
+HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
+#SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
+python servers ssl static-libs +threads tcpd tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-devel/libtool
+	virtual/mta
+	berkdb? ( sys-libs/db )
+	bidi? ( dev-libs/fribidi )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Disable bytecompilation of Python modules.
+	echo "#!/bin/sh" > build-aux/py-compile
+	epatch "${FILESDIR}/${P}-array_bounds.patch"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	# but fails tests. So set it in config file instead.
+	#econf MU_DEFAULT_SCHEME=maildir \
+	econf CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_enable servers build-servers) \
+		$(use_enable clients build-clients) \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug \
+		--disable-rpath
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	doins "${FILESDIR}/mailutils.rc"
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_clean_installation_image
+		rm -f "${ED}$(python_get_sitedir)/mailutils/c_api.a"
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	# compatibility link
+	use clients && dosym /usr/bin/mail /bin/mail
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize mailutils
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup mailutils
+	fi
+}
diff --git a/net-misc/electrum/electrum-1.7.ebuild b/net-misc/electrum/electrum-1.7.ebuild
index 7fbe27c1e70b..76a39c5d3db4 100644
--- a/net-misc/electrum/electrum-1.7.ebuild
+++ b/net-misc/electrum/electrum-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.7.ebuild,v 1.1 2013/03/19 12:39:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.7.ebuild,v 1.2 2013/03/22 11:23:14 blueness Exp $
 
 EAPI="5"
 
@@ -54,11 +54,12 @@ src_prepare() {
 
 	# Remove unrequested GUI implementations:
 	if use !gtk; then
-		rm lib/gui.py || die
+		rm gui/gui_gtk.py || die
 	fi
 	if use !qt4; then
-		rm lib/gui_qt.py lib/gui_lite.py || die
-		sed -i 's/default="lite"/default="gtk"/' electrum || die
+		rm gui/gui_{classic,lite}.py || die
+		sed -i "/config.get('gui','classic')/s/classic/gtk/" electrum \
+			|| die
 	fi
 
 	distutils-r1_src_prepare
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 8fb2cdadeb91..52edbb5a0679 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,9 +1,10 @@
 DIST suite3270-3.3.10ga3-src.tgz 6419282 SHA256 c94cd13e82f6f335461f1de7a816e627fa7e55f68852a5f513194067bccc4408 SHA512 c30af38bff1517a96250365bc6beec19f8ae4c8b6cae7b68c2279749796b370d1ecaf4a4dc3abc25780bd67bbdf9ef00bc9f8d6bb332c642e672ba24f623e6ab WHIRLPOOL e69cb4f7a7174050e35edecaf461385ccef13b7f396625e735ac7455aae6a7f90c7aee9c2a12fef6ec7cd163b2a84c7f33653d3b002a73dcda86cf14ee75f48d
 DIST suite3270-3.3.12ga10-src.tgz 6670311 SHA256 f93a51c19a6f13a97e895343f79ce867b53ca6e672b8fa5a491f2e2fed7294d6 SHA512 8c6e31dfcfb40ee81e1984648cff64d96f7cfadb45a221cb59b5e234ee1a5dd25b7d0ccccf04e11b740eb4237d8228f61186d1107b3d7bfa6405e7cc95b8d32f WHIRLPOOL 4958e0d07cf8ff5ef91862fe8fda0cb559a89e69be91914bd5c12c8afeea5b94ff6523faeeaa748a1bb86d6df19c70564ded116c4ec9cf6eceb07e9e418c6823
-DIST suite3270-3.3.5p8.tgz 3244414 SHA256 c33acfecab9b720d9fbc342d2c53c4c3ff999f67b6f2e387dd27b97f2c49eeed
-DIST suite3270-3.3.6.tgz 3315214 SHA256 189f0f639186060b7bbb3093fce60bfb7f35fa147e051a24753236358f609b5e
-DIST suite3270-3.3.7.tgz 3357492 SHA256 5b5c3b57cdc3a8e4c2fdd9fa59ef198a5a2ca73f4ad49a42869b709c47318444
-DIST suite3270-3.3.7p5.tgz 3357564 SHA256 ac1250eef285dbc9b511228d83e9b6c0db8c7ead3586ec82ff36a4ab8ca1067e
-DIST suite3270-3.3.7p8.tgz 3362264 SHA256 44fc1b167188c9c5b592c266f7dda391628a72bfbab7b1815bf511f7569ffa4b
-DIST suite3270-3.3.8.tgz 3958021 SHA256 e37fde24e4b9eec494b58be54b9c3e06d518d66201ece718fcd6259d051dfe93
+DIST suite3270-3.3.12ga12-src.tgz 6695998 SHA256 2b7ca0614a7b0d97507753f933f4be04aa16a4bc255ad80b2c14a9dfebbcb8b8 SHA512 61b5bc1682af6844609356b25eec5b1c27a057a060e88e51787c8b8bc73123a01e344a02e9104c78b037e46d15d6f6824caa85a5902e51115aac468eb0b3b250 WHIRLPOOL 03582957daa9362594a589094edfc0e724ad3d6f2f9fa796865aad94697592b492a67d6ccfd4588ee19c8837413e44ac7bb7be0dacf19b621ea93659ff7845bf
+DIST suite3270-3.3.5p8.tgz 3244414 SHA256 c33acfecab9b720d9fbc342d2c53c4c3ff999f67b6f2e387dd27b97f2c49eeed SHA512 60daec899106adfed604cb00fb3085ff700d3ee554f7a0cafe4dd524c19cfc0d186489d088ddfd41aa15c2366b8d9eadc77ef1e8549ed31c1b289d7c368f15b5 WHIRLPOOL 491475567d4a6ec3a4a46c4ba9eaf4b982b61571b5f2767481b5ebc2b8c22fbb436a9434913057f52ed27632622b92ce39e123ab7fe2996e236d77ac41ebd182
+DIST suite3270-3.3.6.tgz 3315214 SHA256 189f0f639186060b7bbb3093fce60bfb7f35fa147e051a24753236358f609b5e SHA512 0b59c231a5cb4447fb5d2263cf3be0812773450ab2bfb14923ffdc05e5554bcaa63f15d28bdd3fde3d4c0fe31efb284a4e4fd43b448b1adb8d1cf52e3c5b5957 WHIRLPOOL a4d95cc2b399dbfdb1a4b00c804f1bfc036bc8eb0ec463275a256caaef03348b33b60c4bd46eb3e8a7168e2bed1c2b9a9d488ddefc6c1267381de390041161ba
+DIST suite3270-3.3.7.tgz 3357492 SHA256 5b5c3b57cdc3a8e4c2fdd9fa59ef198a5a2ca73f4ad49a42869b709c47318444 SHA512 69779666b3f88c1c8291df56298ced3a64d3f12f7b7dc191f288fd62b4beaa387fc15f418526ab3d0091837de9bd9e3fd6412e1b6fa25347d5fcaea16be34e79 WHIRLPOOL 33a296e491b1907c0a61c39036d0af7a36440b9ae3e98f54020a737ed3ca4f8239f8a3cdb038caf8995e359a3c24f7626415d88df5586183548f839f4db5ac0a
+DIST suite3270-3.3.7p5.tgz 3357564 SHA256 ac1250eef285dbc9b511228d83e9b6c0db8c7ead3586ec82ff36a4ab8ca1067e SHA512 81262e086b6f6d2e87a8b91429df1366aad7a82551c1d0645a13dd8f57366fc2866d4306135d2e0defe1a6515786fca28f81ec950f6715429730dbe1f4b55bfe WHIRLPOOL 6dd8fa75dc225182ba6b9e2ed655979b9bda1b1f96ad17e9863e96607df270dbb460eaf63982102b31d345923a058ac0770dd18878aa9692647fbfc3cf18f293
+DIST suite3270-3.3.7p8.tgz 3362264 SHA256 44fc1b167188c9c5b592c266f7dda391628a72bfbab7b1815bf511f7569ffa4b SHA512 3e7307de562308572f682e4a281997471a758dd455a0fcc52a4ccb1df3d1e557d0ccd3294e0aefc84db3513b344ebdfce738164bce3ca4dd28db9d20b40bcf23 WHIRLPOOL add5bac8d14181baeebffcb9a211ae1f5db5c563cce7b3442341379c6e054e21b887b017ba70ac406c527e87df13e6c30784e1b8e0e084a06d9ea5586f2e3e94
+DIST suite3270-3.3.8.tgz 3958021 SHA256 e37fde24e4b9eec494b58be54b9c3e06d518d66201ece718fcd6259d051dfe93 SHA512 474c7db1ab577205203f98ece4d2118da082803a4b406a1df65127d7d2a0ad28f2fba8c4df49f62cf07e864fe46e5efdb829d8bd6d4272e608af5894037efbb7 WHIRLPOOL 2cb662f4b52c993c7f094d6061925bfa995a55f888c5ac529460bf39cc3de4a24ef2ee6eb702471584abc1e6941a4d6e8e22305d2ba44e30e3746b3d084008c2
 DIST suite3270-3.3.9ga12.tgz 6305237 SHA256 256b3e3e51cdde716173bc99cbc08958369bc3b993f0b1aafc50e20d8f17ad2c
diff --git a/net-misc/suite3270/suite3270-3.3.12_p12.ebuild b/net-misc/suite3270/suite3270-3.3.12_p12.ebuild
new file mode 100644
index 000000000000..86aa2a33cc9d
--- /dev/null
+++ b/net-misc/suite3270/suite3270-3.3.12_p12.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.12_p12.ebuild,v 1.1 2013/03/21 19:33:50 robbat2 Exp $
+
+EAPI="4"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S=${WORKDIR}/${FONT_PN}-${SUB_PV}
+
+inherit eutils font multiprocessing
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-misc/imake
+		x11-misc/xbitmaps
+		x11-proto/xproto
+		app-text/rman
+		x11-apps/mkfontdir
+		x11-apps/bdftopcf
+	)"
+
+suite3270_makelist() {
+	echo pr3287 s3270 \
+		$(usex ncurses c3270 '') \
+		$(usex tcl tcl3270 '') \
+		$(usex X x3270 '')
+}
+
+src_configure() {
+	local p myconf
+	# Run configures in parallel!
+	multijob_init
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}-${SUB_PV}"
+		if [[ ${p} == "x3270" ]] ; then
+			myconf=(
+				$(use_with X x)
+				$(use_with X fontdir "${FONTDIR}")
+			)
+		else
+			myconf=()
+		fi
+		multijob_child_init econf \
+			--cache-file="${S}"/config.cache \
+			$(use_enable cjk dbcs) \
+			$(use_enable ssl) \
+			"${myconf[@]}"
+	done
+	multijob_finish
+}
+
+src_compile() {
+	local p
+	for p in $(suite3270_makelist) ; do
+		emake -C "${S}/${p}-${SUB_PV}"
+	done
+}
+
+src_install() {
+	use X && dodir "${FONTDIR}"
+	local p
+	for p in $(suite3270_makelist) ; do
+		cd "${S}/${p}-${SUB_PV}"
+		emake DESTDIR="${D}" install install.man
+		docinto ${p}
+		local d=$(echo README*)
+		[[ -n ${d} ]] && dodoc ${d}
+		use doc && dohtml html/*
+	done
+	chmod a-x "${D}"/usr/share/man/*/*
+
+	use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
index 849c0ea2bf95..904843aa9c21 100644
--- a/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild,v 1.4 2013/01/17 13:49:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.4-r1.ebuild,v 1.5 2013/03/21 13:55:35 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs user
@@ -23,6 +23,7 @@ RDEPEND="dev-perl/Config-Simple
 	media-fonts/font-misc-misc
 	net-misc/nx
 	virtual/ssh
+	x11-apps/xauth
 	fuse? ( sys-fs/sshfs-fuse )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
diff --git a/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild b/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
index 9177f1a0538a..ea8366841c02 100644
--- a/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
+++ b/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild,v 1.2 2013/01/17 13:49:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-3.1.1.9.ebuild,v 1.3 2013/03/21 13:55:35 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs user
@@ -23,6 +23,7 @@ RDEPEND="dev-perl/Config-Simple
 	media-fonts/font-misc-misc
 	net-misc/nx
 	virtual/ssh
+	x11-apps/xauth
 	fuse? ( sys-fs/sshfs-fuse )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
diff --git a/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
index 7c4eda4baea3..45dfded15cf6 100644
--- a/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild,v 1.2 2013/01/17 13:49:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.0.0.ebuild,v 1.3 2013/03/21 13:55:35 voyageur Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs user
@@ -23,6 +23,7 @@ RDEPEND="dev-perl/Config-Simple
 	media-fonts/font-misc-misc
 	net-misc/nx
 	virtual/ssh
+	x11-apps/xauth
 	fuse? ( sys-fs/sshfs-fuse )
 	postgres? ( dev-perl/DBD-Pg )
 	sqlite? ( dev-perl/DBD-SQLite )"
diff --git a/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild b/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
index fe7480374492..0d06f91d6434 100644
--- a/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild,v 1.3 2013/03/16 16:34:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.02.25.ebuild,v 1.4 2013/03/22 10:06:03 pinkbyte Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_5,2_6,2_7})
@@ -13,7 +13,7 @@ SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="offensive test"
 
 DEPEND="test? ( dev-python/nose[coverage(+)] )"
diff --git a/net-news/canto/metadata.xml b/net-news/canto/metadata.xml
index 5e3a61a90139..e8b6c80fb348 100644
--- a/net-news/canto/metadata.xml
+++ b/net-news/canto/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
+<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <longdescription lang="en">
 </longdescription>
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index d089bec2de98..86899a4ce0f6 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -3,3 +3,4 @@ DIST rtorrent-0.8.7.tar.gz 547435 SHA256 1fd0c9b2b3fe81b035209417c4dd4514473411f
 DIST rtorrent-0.8.9.tar.gz 570904 SHA256 cca70eb36a0c176bbd6fdb3afe2bc9f163fa4c9377fc33bc29689dec60cf6d84
 DIST rtorrent-0.9.1.tar.gz 591114 SHA256 466c529a5d69e4cf8267029821dc5811fffa5fad354d80ec64c88b12c1a4c5f1
 DIST rtorrent-0.9.2.tar.gz 591837 SHA256 5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d SHA512 8b170021ca28ebe6c9bfd1405fe38962828a21eb0020460786115ff360ef62d325b745976fb29996a80387e763465f7b3ef0c47ca30b185a5c98a060cc151c38 WHIRLPOOL 757e6752da6b68e8b753d1a2599172fd3d8e14116c18c9906a8eb458799e856d510a578499ef7ed0ad98573825048a3e6ba37f37570b2b5556054fdc02003f55
+DIST rtorrent-0.9.3.tar.gz 583311 SHA256 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310 SHA512 a6cc390795c0cf36bf70f4f141db3e176c81df0d6754fe2e6a95ef59385a70e7ce006fe81b83deff5b32e06cc771d03c5c7ba1140be64b2d252719e8aa2058f3 WHIRLPOOL 7cb2e51718596145ef8a07b1de0bb9ccd4dc923a4ec8091a3f775dffaafe5111873d43047e6e32720a202774454e53443e402010d956954f19cdfdb08983ec52
diff --git a/net-p2p/rtorrent/files/rtorrent.1 b/net-p2p/rtorrent/files/rtorrent.1
new file mode 100644
index 000000000000..fa5477f2e106
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent.1
@@ -0,0 +1,560 @@
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "RTORRENT" "1" "14 May 2009" "BitTorrent client for ncurses" ""
+
+.SH NAME
+rtorrent \- a BitTorrent client for ncurses
+.SH SYNOPSIS
+
+\fBrtorrent\fR [ \fB-h\fR ] [ \fB-n\fR ] [ \fB-o key1=opt1,...\fR ] [ \fB-O key=opt\fR ] [ \fBURL | FILE\fR\fI ...\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBrtorrent\fR is a BitTorrent client for ncurses, using
+the \fBlibtorrent\fR library. The client and library is
+written in C++ with emphasis on speed and efficiency, while delivering
+equivalent features to those found in GUI based clients in an ncurses
+client.
+.PP
+Most of the options below have their own default unit in addition to
+supporting B, K, M and G suffixes.
+.SH "KEYBOARD CONTROL"
+.PP
+.SS "GLOBAL KEYS"
+.TP
+\fB^q\fR
+Initiate shutdown, press again to force the shutdown and
+skip sending the stop signal to trackers.
+.TP
+\fBup | down | left | right arrow keys\fR
+.TP
+\fB^P | ^N | ^B | ^F\fR
+Select entries or change windows. The right arrow key or ^F is often
+used for viewing details about the selected entry, while the left
+arrow key or ^B often returns to the previous screen.
+.TP
+\fBa | s | d\fR
+Increase the upload throttle by 1/5/50 KB.
+.TP
+\fBA | S | D\fR
+Increase the download throttle by 1/5/50 KB.
+.TP
+\fBz | x | c\fR
+Decrease the upload throttle by 1/5/50 KB.
+.TP
+\fBZ | X | C\fR
+Decrease the download throttle by 1/5/50 KB.
+.SS "MAIN VIEW KEYS"
+.TP
+\fB->\fR
+View download.
+.TP
+\fB1 - 7\fR
+Change view.
+.TP
+\fB^S\fR
+Start download.
+.TP
+\fB^D\fR
+Stop an active download, or remove a stopped download.
+.TP
+\fB^K\fR
+Close a torrent and its files.
+.TP
+\fB^E\fR
+Set the 'create/resize queued' flags on all files in a torrent. This
+is necessary if the underlying files in a torrent have been deleted or
+truncated, and thus rtorrent must recreate them.
+.TP
+\fB^R\fR
+Initiate hash check of torrent.
+.TP
+\fB^O\fR
+Change the destination directory of the download. The torrent must be
+closed.
+.TP
+\fB^X\fR
+Call commands or change settings.
+.TP
+\fB^B\fR
+Set download to perform initial seeding. Only use when
+you are the first and only seeder so far for the download.
+.TP
+\fB+ | -\fR
+Change the priority of the download.
+.TP
+\fBbackspace\fR
+Add torrent using an URL or file path. Use
+\fBtab\fR to view directory content and do
+auto-complete.
+.TP
+\fBl\fR
+View log. Exit by pressing the space-bar.
+.TP
+\fBU\fR
+Delete the file the torrent is tied to, and clear the association.
+.TP
+\fBI\fR
+Toggle whether torrent ignores ratio settings.
+.SS "DOWNLOAD VIEW KEYS"
+.TP
+\fB->\fR
+View torrent file list. Use the space-bar to change the file priority
+and \fB*\fR to change the priority of all
+files. Use \fB/\fR to collapse the directories. OUTDATED
+.TP
+\fB1 | 2\fR
+Adjust max uploads.
+.TP
+\fB3 | 4\fR
+Adjust min peers.
+.TP
+\fB5 | 6\fR
+Adjust max peers.
+.TP
+\fBu\fR
+Display transfering blocks.
+.TP
+\fBi\fR
+Display chunk rarity.
+.TP
+\fBo\fR
+Display the tracker list. Cycle the trackers in a group with the
+space-bar.
+.TP
+\fBp\fR
+View peer and torrent information.
+.TP
+\fBt | T\fR
+Initiate tracker request. Use capital T to force the request, ignoring
+the "min interval" set by the tracker.
+.TP
+\fBk\fR
+Disconnect peer.
+.TP
+\fB*\fR
+Choke/Snub peer.
+.SH "OPTIONS"
+.TP
+\fB-b \fIa.b.c.d\fB\fR
+Bind listening socket and outgoing connections to this network
+interface address.
+.TP
+\fB-d \fIdirectory\fB\fR
+Set the default download directory. Defaults to "./".
+.TP
+\fB-h\fR
+Display help and exit.
+.TP
+\fB-i \fIa.b.c.d\fB\fR
+Set the address reported to the tracker.
+.TP
+\fB-n\fR
+Don't load ~/.rtorrent.rc on startup.
+.TP
+\fB-o key1=opt1,...\fR
+.TP
+\fB-O key=opt\fR
+Set any number of options, see the SETTINGS section. The options given
+here override the resource files. Use capital \fB-O\fR
+to allow comma in the option.
+.TP
+\fB-p \fIa-b\fB\fR
+Try to open a listening port in the range \fBa\fR up to
+and including \fBb\fR\&.
+.TP
+\fB-s \fIdirectory\fB\fR
+Session management will be enabled and the torrent files for all open
+downloads will be stored in this directory. Only one instance of
+rtorrent should be used with each session directory, though at the
+moment no locking is done. An empty string will disable the session
+directory.
+.SH "GENERAL SETTINGS"
+.PP
+.TP
+\fBbind = \fIa.b.c.d\fB\fR
+Bind listening socket and outgoing connections to this network
+interface address.
+.TP
+\fBip = \fIa.b.c.d\fB\fR
+.TP
+\fBip = \fIhostname\fB\fR
+Set the address reported to the tracker.
+.TP
+\fBport_range = \fIa-b\fB\fR
+Try to open a listening port in the range \fBa\fR up to
+and including \fBb\fR\&.
+.TP
+\fBport_random = \fIyes | no\fB\fR
+Open the listening port at a random position in the port range.
+.TP
+\fBcheck_hash = \fIyes | no\fB\fR
+Perform hash check on torrents that have finished downloading.
+.TP
+\fBdirectory = \fIdirectory\fB\fR
+Set the default download directory. Defaults to "./".
+.TP
+\fBsession = \fIdirectory\fB\fR
+Session management will be enabled and the torrent files for all open
+downloads will be stored in this directory. Only one instance of
+rtorrent can be used per session directory. An empty string will
+disable the session directory.
+.TP
+\fBhttp_proxy = \fIurl\fB\fR
+Use a http proxy. Use an empty string to disable.
+.TP
+\fBencoding_list = \fIencoding\fB\fR
+Add a preferred filename encoding to the list. The encodings are
+attempted in the order they are inserted, if none match the torrent
+default is used.
+.TP
+\fBencryption = \fIoption\fB,\fI\&...\fB\fR
+Set how rtorrent should deal with encrypted Bittorrent connections. By
+default, encryption is disabled, equivalent to specifying the option
+\fBnone\fR\&. Alternatively, any number of the following
+options may be specified:
+
+\fBallow_incoming\fR (allow incoming encrypted connections), 
+\fBtry_outgoing\fR (use encryption for outgoing connections),
+\fBrequire\fR (disable unencrypted handshakes), 
+\fBrequire_RC4\fR (also disable plaintext transmission after the
+initial encrypted handshake),
+\fBenable_retry\fR (if the initial outgoing connection fails, retry
+with encryption turned on if it was off or off if it was on), 
+\fBprefer_plaintext\fR (choose plaintext when peer offers a choice 
+between plaintext transmission and RC4 encryption, otherwise RC4 will be used).
+.TP
+\fBpeer_exchange = \fIyes | no\fB\fR
+Enable/disable peer exchange for torrents that aren't marked private. Disabled by default.
+.TP
+\fBschedule = \fIid\fB,\fIstart\fB,\fIinterval\fB,\fIcommand\fB\fR
+Call \fBcommand\fR every \fBinterval\fR
+seconds, starting from \fBstart\fR\&. An
+\fBinterval\fR of zero calls the task once, while a
+\fBstart\fR of zero calls it immediately. Currently
+\fBcommand\fR is forwarded to the option handler.
+\fBstart\fR and \fBinterval\fR may
+optionally use a time format, \fBdd:hh:mm:ss\fR\&. F.ex to
+start a task every day at \fB18:00\fR, use
+\fB18:00:00,24:00:00\fR\&.
+.TP
+\fBschedule_remove = \fIid\fB\fR
+Delete \fBid\fR from the scheduler.
+.TP
+\fBstart_tied =\fR
+Start torrents that are tied to filenames that have been re-added.
+.TP
+\fBstop_untied =\fR
+.TP
+\fBclose_untied =\fR
+.TP
+\fBremove_untied =\fR
+Stop, close or remove the torrents that are tied to filenames that
+have been deleted. Clear the association with the 'U' key.
+.TP
+\fBclose_low_diskspace = \fIspace\fB\fR
+Close any active torrents on filesystems with less than
+\fBspace\fR diskspace left. Use with
+the \fBschedule\fR option. A default scheduled event
+with id \fBlow_diskspace\fR is set to 500Mb.
+.TP
+\fBload = \fIfile\fB\fR
+.TP
+\fBload_verbose = \fIfile\fB\fR
+.TP
+\fBload_start = \fIfile\fB\fR
+.TP
+\fBload_start_verbose = \fIfile\fB\fR
+Load and possibly start a file, or possibly multiple files by using the
+wild-card "*". This is meant for use with
+\fBschedule\fR, though ensure that the
+\fBstart\fR is non-zero. The loaded file will be tied
+to the filename provided.
+.TP
+\fBimport = \fIfile\fB\fR
+.TP
+\fBtry_import = \fIfile\fB\fR
+Load a resource file. \fBtry_import\fR does not throw
+torrent::input_error exception on bad input.
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB\fR
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB,\fImin_upload\fB\fR
+.TP
+\fBstop_on_ratio = \fImin_ratio\fB,\fImin_upload\fB,\fImax_ratio\fB\fR
+Stop torrents when they reach the given upload ratio
+\fBmin_ratio\fR in percent. If the optional
+\fBmin_upload\fR is given, require a total
+upload amount of this many bytes as well. If the optional
+\fBmax_ratio\fR is given, stop the torrent
+when reaching this ratio regardless of the total upload
+amount. Exclude certain torrent by pressing 
+\fBShift+I\fR in the downlist list.
+Use with the \fBschedule\fR option.
+.TP
+\fBon_insert = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_erase = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_open = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_close = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_start = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_stop = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_queued = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_removed = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_hash_done = \fIid\fB,\fIcommand\fB\fR
+.TP
+\fBon_finished = \fIid\fB,\fIcommand\fB\fR
+Call a command on a download when its state changes. Only a subset of
+commands are available.
+.SH "THROTTLE SETTINGS"
+.TP
+\fBupload_rate = \fIKB\fB\fR
+.TP
+\fBdownload_rate = \fIKB\fB\fR
+Set the maximum global uploand and download rates.
+.TP
+\fBmin_peers = \fIvalue\fB\fR
+.TP
+\fBmax_peers = \fIvalue\fB\fR
+Set the minimum and maximum number of peers to allow in each download.
+.TP
+\fBmin_peers_seed = \fIvalue\fB\fR
+.TP
+\fBmax_peers_seed = \fIvalue\fB\fR
+Set the minimum nad maximum number of peers to allow while seeding, or
+-1 (default) to use max_peers.
+.TP
+\fBmax_uploads = \fIvalue\fB\fR
+Set the maximum number of simultaneous uploads per download.
+.TP
+\fBmax_uploads_div = \fIvalue\fB\fR
+.TP
+\fBmax_downloads_div = \fIvalue\fB\fR
+Change the divider used to calculate the max upload and download slots
+to use when the throttle is changed. Disable by
+setting \fB0\fR\&.
+.TP
+\fBmax_uploads_global = \fIvalue\fB\fR
+.TP
+\fBmax_downloads_global = \fIvalue\fB\fR
+Max upload and download slots allowed. Disable by
+setting \fB0\fR\&.
+.TP
+\fBthrottle_up = \fIname\fB, \fIupload_rate\fB\fR
+.TP
+\fBthrottle_down = \fIname\fB, \fIdownload_rate\fB\fR
+Define secondary throttle and/or set the given upload or download rate. Attach to a download with the d.set_throttle_name=name command
+or switch throttles with Ctrl-T. Download must be stopped when changing throttles. Note that secondary throttles only work if the
+global upload/download is throttled. Setting a download to use the \fBNULL\fR throttle makes the download unthrottled
+even when there is a global throttle. Note that this special case bypasses the global throttle entirely, and as such its rate and
+transfer amounts are not included in the global statistics.
+.TP
+\fBthrottle_ip = \fIname\fB, \fIhost\fB\fR
+.TP
+\fBthrottle_ip = \fIname\fB, \fInetwork/prefix\fB\fR
+.TP
+\fBthrottle_ip = \fIname\fB, \fIstart\fB, \fIend\fB\fR
+Use the given secondary throttle for a host, CIDR network or IP range. All peers with a matching IP will use this throttle instead
+of the global throttle or a custom download throttle. The name may be \fBNULL\fR to make these peers unthrottled, with
+the same caveats as explained above.
+.SH "TRACKER RELATED SETTINGS"
+.PP
+Tracker related settings.
+.TP
+\fBenable_trackers = \fIyes\fB\fR
+Set to \fBno\fR to disable all tracker requests. Useful
+for disabling rtorrent with the \fBschedule\fR command.
+.TP
+\fBtracker_dump = \fIfilename\fB\fR
+Dump tracker requests to \fBfilename\fR, disable by
+supplying an empty string. Only torrents loaded while
+\fBtracker_dump\fR contains a non-empty string will be
+logged at the moment, although disabling it will work as expected.
+.TP
+\fBtracker_numwant = \fInumber\fB\fR
+Set the numwant field sent to the tracker, which indicates how many
+peers we want. A negative value disables this feature.
+.TP
+\fBuse_udp_trackers = \fIyes\fB\fR
+Use UDP trackers. Disable if you are behind a firewall, etc, that does
+not allow connections to UDP trackers.
+.TP
+\fBdht = \fIdisabled|off|auto|on\fB\fR
+Support for querying the distributed hash table (DHT) to find peers for trackerless
+torrents or when all trackers are down. Set to \fBdisable\fR to completely
+disable DHT, \fBoff\fR (default) to enable DHT but to not start the
+DHT server, \fBauto\fR to automatically start and stop the DHT server
+as needed or \fBon\fR for permanently keeping the DHT server running.
+When set to automatic, the DHT server will start up when the first non-private torrent
+is started, and will stop 15-30 minutes after the last non-private torrent is
+stopped (or when rTorrent quits). For DHT to work, a session directory must be set (for
+saving the DHT cache).
+.TP
+\fBdht_port = \fInumber\fB\fR
+Set the UDP listen port for DHT. Defaults to 6881.
+.TP
+\fBdht_add_node = \fIhost[:port]\fB\fR
+Not intended for use in the configuration file but as one-time option in the
+client or on the command line to bootstrap an empty DHT node table. Contacts 
+the given node and attempts to bootstrap from it if it replies.
+The port is optional, with port 6881 being used by default.
+.TP
+\fBhttp_capath = \fIpath\fB\fR
+.TP
+\fBhttp_cacert = \fIfilename\fB\fR
+Set the certificates to use in http requests. See Curl's
+CURLOPT_CAPATH and CURLOPT_CAINFO options for further information.
+.SH "USER-INTERFACE SETTINGS"
+.PP
+Display related settings.
+.TP
+\fBview_add = \fIname\fB\fR
+Create a new view.
+.TP
+\fBview_sort = \fIname\fB\fR
+.TP
+\fBview_sort = \fIname\fB,\fIseconds\fB\fR
+Sort a view according the the criteria set by
+\fBview_sort_current\fR\&. If the optional argument is
+supplied, the view is not sorted if a change happened during the last
+\fBseconds\fR\&. This command is meant to be used with
+\fBschedule\fR\&.
+.TP
+\fBview_sort_new = \fIname\fB,\fI\&...\fB\fR
+.TP
+\fBview_sort_current = \fIname\fB,\fI\&...\fB\fR
+Set the sorting criteria for when new elements inserted or
+\fBview_sort\fR is called. The list can contain any
+number of criteria, including zero, from the following:
+
+\fBname\fR, \fBname_reverse\fR,
+\fBstopped\fR, \fBstarted\fR,
+\fBcomplete\fR, \fBincomplete\fR,
+\fBstate_changed\fR,
+\fBstate_changed_reverse\fR
+.TP
+\fBkey_layout = \fIqwerty|azerty|qwertz|dvorak\fB\fR
+Change the key-bindings.
+.SH "FILE-SYSTEM SETTINGS"
+.PP
+File-system related settings.
+.TP
+\fBmax_file_size = \fIsize\fB\fR
+Set the maximum size a file can have. Disable by
+passing \fB-1\fR\&.
+.TP
+\fBsplit_file_size = \fIsize\fB\fR
+Split files in a torrent larger than \fBsize\fR into
+seperate files. Disable by passing \fB-1\fR\&.
+.TP
+\fBsplit_suffix = \fIstring\fB\fR
+Set the suffix used on split files. Defaults
+to \fB\&.part\fR\&.
+.SH "DOWNLOAD SETTINGS"
+.PP
+Settings that require a download as a target, the options need to be
+called through f.ex \fBon_finished\fR\&.
+.TP
+\fBcreate_link = \fItype\fB,\fIpath\fB,\fIsuffix\fB\fR
+.TP
+\fBdelete_link = \fItype\fB,\fIpath\fB,\fIsuffix\fB\fR
+Create or delete a symbolic link. The link path is the concatenation
+of \fBpath\fR, the result of
+the \fBtype\fR on the download,
+and \fBsuffix\fR\&.
+
+Available types are; \fBbase_path\fR uses the base path
+of the download, \fBbase_filename\fR uses the base
+filename of the download, \fBtied\fR uses the path of
+the file the download is tied to, see \fBstart_tied\fR\&.
+.SH "ADVANCED SETTINGS"
+.PP
+This list contains settings users shouldn't need to touch, some may
+even cause crashes or similar if incorrectly set.
+.TP
+\fBhash_read_ahead = \fIMB\fB\fR
+Configure how far ahead we ask the kernel to read when doing hash
+checking. The hash checker uses madvise(..., MADV_WILLNEED) for the
+requests.
+.TP
+\fBhash_interval = \fIms\fB\fR
+Interval between attempts to check the hash when the chunk is not in
+memory, in milliseconds.
+.TP
+\fBhash_max_tries = \fItries\fB\fR
+Number of attempts to check the hash while using the mincore status,
+before forcing. Overworked systems might need lower values to get a
+decent hash checking rate.
+.TP
+\fBsafe_sync = \fIyes|no\fB\fR
+Always use MS_SYNC rather than MS_ASYNC when syncing chunks. This may
+be nessesary in case of filesystem bugs like NFS in linux ~2.6.13.
+.TP
+\fBmax_open_files = \fIvalue\fB\fR
+Number of files to simultaneously keep open. LibTorrent dynamically
+opens and closes files as necessary when mapping files to
+memory. Default is based on sysconf(_SC_OPEN_MAX).
+You probably only think you know what this option does, so don't touch
+it.
+.TP
+\fBmax_open_sockets = \fIvalue\fB\fR
+Number of network sockets to simultaneously keep open. This value is
+set to a reasonable value based on \fBsysconf(_SC_OPEN_MAX)\fR\&.
+.TP
+\fBmax_open_http = \fIvalue\fB\fR
+Number of sockets to simultaneously keep open. This value is set
+to \fB32\fR by default.
+.TP
+\fBmax_memory_usage = \fIbytes\fB\fR
+Set the max amount of memory space used to mapping file chunks. This
+may also be set using \fBulimit -m\fR where 3/4 will be
+allocated to file chunks.
+.TP
+\fBsend_buffer_size = \fIvalue\fB\fR
+.TP
+\fBreceive_buffer_size = \fIvalue\fB\fR
+Adjust the send and receive buffer size for socket.
+.TP
+\fBumask = \fI0022\fB\fR
+Set the umask for this process, which is applied to all files created
+by the program.
+.TP
+\fBcwd = \fIdirectory\fB\fR
+Changes the working directory of the process using
+\fBchdir\fR\&.
+.TP
+\fBsession_on_completion = \fIyes\fB\fR
+Controls if the session torrent is saved when a torrent finishes. By
+default on.
+.TP
+\fBsession_lock = \fIyes\fB\fR
+Controls if a lock file is created in the session directory on startup.
+.TP
+\fBsession_save = \fR
+Save the session files for all downloads.
+.TP
+\fBtos = \fIdefault|lowdelay|throughput|reliability|mincost\fB\fR
+.TP
+\fBtos = \fIhex\fB\fR
+Change the TOS of peer connections, by default set to
+\fBthroughput\fR\&. If the option is set to
+\fBdefault\fR then the system default TOS is used. A
+hex value may be used for non-standard settings.
+.TP
+\fBhandshake_log = \fIyes\fB\fR
+Enable logging of the peer handshake. This generates a large number of
+log messages, but may be useful to debug connection problems.
+.SH "AUTHORS"
+.PP
+
+Jari "Rakshasa" Sundell <jaris@ifi.uio.no>
diff --git a/net-p2p/rtorrent/rtorrent-0.9.3.ebuild b/net-p2p/rtorrent/rtorrent-0.9.3.ebuild
new file mode 100644
index 000000000000..8176f7233657
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.9.3.ebuild,v 1.1 2013/03/22 08:29:46 patrick Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="daemon debug ipv6 test xmlrpc"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+	>=dev-libs/libsigc++-2.2.2:2
+	>=net-misc/curl-7.19.1
+	sys-libs/ncurses
+	xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+	daemon? ( app-misc/screen )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cppunit )
+	virtual/pkgconfig"
+
+DOCS=( doc/rtorrent.rc )
+
+src_prepare() {
+	# bug #358271
+	epatch "${FILESDIR}"/${PN}-0.9.1-ncurses.patch
+
+	# upstream forgot to include
+	cp ${FILESDIR}/rtorrent.1 ${S}/doc/ || die
+}
+
+src_configure() {
+	# configure needs bash or script bombs out on some null shift, bug #291229
+	CONFIG_SHELL=${BASH} econf \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+	default
+	doman doc/rtorrent.1
+
+	if use daemon; then
+		newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
+		newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+	fi
+}
diff --git a/net-zope/zc-buildout/Manifest b/net-zope/zc-buildout/Manifest
index 9c311877ad34..b6b6e904d132 100644
--- a/net-zope/zc-buildout/Manifest
+++ b/net-zope/zc-buildout/Manifest
@@ -1,3 +1,4 @@
 DIST zc.buildout-1.4.4.tar.gz 253278 SHA256 fcc930f3366214fbe0eea6dbb1a7ea00703e8e2d65ec1c375d4d7df967030445
 DIST zc.buildout-1.5.2.tar.gz 331673 SHA256 0ac5a325d3ffbc5a988fb3ba87f4159d4769cc73e3331cb5234edc8839b6506b
 DIST zc.buildout-1.7.0.tar.gz 288618 SHA256 8607bb5fb25d0d32837b3cda4215afbcfaf9c70972f852eed071dc5802c054cc SHA512 06f82b5403a9d16658c2f8c2dc152d1440fe5af462027e871db008410c9b693f7663e8aee1a146f4ff2fc0c692bb355ebc788fb4d041f9db479e196c05ea7159 WHIRLPOOL 903276dbcbedbc6ad3b84011fa9e86c62e9f2f1b67f616f9ea36bd88d3c55f7f4908c4a831bbd8bc3d3350721699c6690ea7229aef8c4939a6dcc5bf1efc1785
+DIST zc.buildout-2.0.1.tar.gz 234329 SHA256 b9fc1ea9f8da076f1e9a671102a3c701a57ee98686a87565cfaa40a70b317c65 SHA512 fc15f8beaf9d2917ef5e9de26ba933eb03318fcb135741e20d42fa104226ddacd6db2b593582415c9204c00a27c96e67cf3386da5d163c79d4d8c2b065a75353 WHIRLPOOL a67a11fd36e7e47b503286e2afaceec5442340aad07a5e9954a7bc9cbe35668050ca0f027d1e7a1994519231264608d64501a386560f4d56d5fb34658b1ab975
diff --git a/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild b/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild
new file mode 100644
index 000000000000..70a822a5bed3
--- /dev/null
+++ b/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild,v 1.1 2013/03/22 05:41:11 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+MY_PN="${PN/-/.}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="System for managing development buildouts"
+HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES.rst todo.txt"
+PYTHON_MODNAME="${PN/-//}"
+
+src_install() {
+	distutils_src_install
+
+	# Remove README.txt installed in incorrect location.
+	rm -f "${D}usr/README.txt"
+}
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index a9ca7cc40d66..b25b7701ed25 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -1,5 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.70 2013/03/12 21:50:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.71 2013/03/21 15:12:48 jer Exp $
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
 # Samuli Suominen <ssuominen@gentoo.org> (12 Mar 2013)
@@ -282,11 +282,6 @@ java
 # No reliable java, no netbeans. bug 66762
 netbeans
 
-# 11 Nov 2011 Jeroen Roovers <jer@gentoo.org>
-# Unimplemented (bug #212517).
-acl
-xattr
-
 # 14 Mar 2003 Guy Martin <gmsoft@gentoo.org>
 # USE flags not related to hppa
 acpi
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b88c56d546f2..c39555af9775 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.164 2013/03/06 23:35:33 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.165 2013/03/22 01:20:27 zmedico Exp $
 
 # not ready for primetime
 packagekit
@@ -332,3 +332,7 @@ python_single_target_pypy2_0
 abi_x86_32
 abi_x86_64
 abi_x86_x32
+
+# Zac Medico <zmedico@gentoo.org> (21 Mar 2013)
+# Python 3.4 pre-releases not available in main tree yet.
+python_targets_python3_4
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index ac2b1ac10d73..4325c925ed33 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/python_targets.desc,v 1.7 2013/03/07 20:51:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/python_targets.desc,v 1.8 2013/03/21 23:02:46 zmedico Exp $
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
 
@@ -10,6 +10,7 @@ python2_7 - Build with Python 2.7
 python3_1 - Build with Python 3.1
 python3_2 - Build with Python 3.2
 python3_3 - Build with Python 3.3
+python3_4 - Build with Python 3.4
 jython2_5 - Build with Jython 2.5
 jython2_7 - Build with Jython 2.7
 pypy1_9 - Build with PyPy 1.9
diff --git a/profiles/eapi-5-files/use.stable.mask b/profiles/eapi-5-files/use.stable.mask
index bdbb343681c1..75d02ac4821c 100644
--- a/profiles/eapi-5-files/use.stable.mask
+++ b/profiles/eapi-5-files/use.stable.mask
@@ -1,10 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/use.stable.mask,v 1.2 2013/02/24 15:06:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/eapi-5-files/use.stable.mask,v 1.3 2013/03/22 11:12:17 olemarkus Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Ole Markus With <olemarkus@gentoo.org> (21 Mar 2013)
+# PHP 5.5 is not stable
+php_targets_php5-5
+
 # Michał Górny <mgorny@gentoo.org> (24 Feb 2013)
 # systemd is not stable.
 systemd
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index ae58d5bd240a..de1f34af75a6 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.8 2013/02/20 02:44:34 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.15 2013/03/21 22:14:33 hasufell Exp $
 
 # These are broken as reported by Halcy0n, Aug, 23, 2011
 games-action/shadowgrounds-bin
@@ -14,3 +14,10 @@ net-misc/teamviewer
 dev-lang/rebol-bin
 dev-lang/rebol
 games-action/trine2
+games-action/swordandsworcery
+games-action/beathazardultra
+games-action/solar2
+games-arcade/dynamitejack
+games-kids/crayon-physics
+games-rpg/dungeon-defenders
+games-rpg/bastion
diff --git a/profiles/license_groups b/profiles/license_groups
index 25690306a069..d82c5bfa6d56 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.200 2013/03/18 14:12:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.201 2013/03/21 21:47:22 hasufell Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -59,7 +59,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS
 # and share modifications
 FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 
-EULA AdobeFlash-10.3 AdobeFlash-11.x ArxFatalis-EULA-GOG ArxFatalis-EULA-JoWooD BCS Broadcom cadsoft DOOM3 ETQW FraunhoferFDK google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
+EULA AdobeFlash-10.3 AdobeFlash-11.x ArxFatalis-EULA-GOG ArxFatalis-EULA-JoWooD BCS Broadcom CAPYBARA-EULA cadsoft DOOM3 ETQW FraunhoferFDK google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
 
 # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml
 # Excerpt of the rules for this license group:
diff --git a/profiles/package.mask b/profiles/package.mask
index 57b5bd41b5a2..f64507a533f3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14564 2013/03/20 14:37:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14570 2013/03/22 10:39:20 ssuominen 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,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Tiziano Müller <dev-zero@gentoo.org> (21 Mar 2013)
+# Masked for removal in 30 days (bug #462590). Open bugs:
+# #310217, #339477, #343807, #439110
+# Recent test failures in dvutil show bugs in timezone handling.
+# No new release since >3 years, upstream is not responding.
+# Not recommended for new development. Use C++11, boost, poco, etc instead.
+dev-libs/dvacm4
+dev-libs/dvnet
+dev-libs/dvssl
+dev-libs/dvthread
+dev-libs/dvutil
+
 # Bernard Cafarelli <voyageur@gentoo.org> (20 Mar 2013)
 # Masked for removal in 30 days, bug #462472
 # Dead upstream (last website activity in 2010),
@@ -313,13 +325,6 @@ net-voip/telepathy-butterfly
 # Removal in 30 days
 www-client/xxxterm
 
-# Samuli Suominen <ssuominen@gentoo.org> (28 Jan 2013)
-# Uncompatible with current udev and baselayout
-# Bug 220121 and the ones it Blocks
-# Removal in 30 days
-x11-misc/mkxf86config
-<app-misc/livecd-tools-2.0
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (28 Jan 2013)
 # Beta versions masked for testing
 =net-misc/modemmanager-0.7*
@@ -458,10 +463,6 @@ net-dialup/hsfmodem
 dev-vcs/gitosis
 dev-vcs/gitosis-gentoo
 
-# Ole Markus With <olemarkus@gentoo.org> (15 Nov 2012)
-# Masked for testing
->=dev-lang/php-5.4.9999
-
 # Diego Elio Pettenò <flameeyes@gentoo.org> (14 Nov 2012)
 # Masked for testing as too many packages fail.
 # See bug #443230 for tracking the progress
@@ -649,6 +650,7 @@ sys-apps/systemd-sysv-utils
 # Opera Next and Opera snapshots are unsupported and eternally unstable.
 # <http://my.opera.com/desktopteam/blog>
 www-client/opera-next
+=www-client/opera-12.15*
 
 # Ulrich Mueller <ulm@gentoo.org> (13 Dec 2011)
 # SLOTs 21 and 22 of app-editors/emacs, corresponding to
diff --git a/profiles/use.desc b/profiles/use.desc
index 30bec33900da..1a2e92737d12 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.500 2013/01/27 18:04:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.501 2013/03/21 14:22:57 ulm Exp $
 
 # Keep them sorted
 
@@ -146,6 +146,7 @@ imap - Adds support for IMAP (Internet Mail Application Protocol)
 imlib - Adds support for imlib, an image loading and rendering library
 infiniband - Enable Infiniband RDMA transport support
 inifile - Adds dbm support for .ini files
+inotify - Enable inotify filesystem monitoring support
 introspection - Adds support for GObject based introspection
 iodbc - Adds support for iODBC library
 ios - Enable support for Apple's iDevice with iOS operating system (iPad, iPhone, iPod, etc)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5a1ed65489c4..ea98b57242b3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -355,7 +355,6 @@ app-editors/emacs-vcs:gtk3 - Link against version 3 of the GIMP Toolkit instead
 app-editors/emacs-vcs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs-vcs:hesiod - Enable support for net-dns/hesiod
 app-editors/emacs-vcs:imagemagick - Use media-gfx/imagemagick for image processing
-app-editors/emacs-vcs:inotify - Enable inotify filesystem monitoring support
 app-editors/emacs-vcs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
 app-editors/emacs-vcs:pax_kernel - Enable building under a PaX enabled kernel (sys-apps/paxctl)
 app-editors/emacs-vcs:source - Install C source files and make them available for find-function
@@ -1348,6 +1347,7 @@ dev-lang/php:intl - Enables the intl extension for extended internalization supp
 dev-lang/php:json - Enable JSON support
 dev-lang/php:ldap-sasl - Add SASL support for the PHP LDAP extension
 dev-lang/php:mysqlnd - Use native driver for mysql, mysqli, PDO_Mysql
+dev-lang/php:opcache - Enables built-in opcode cache, replacing pecl-apc et.al
 dev-lang/php:pdo - Enable the bundled PDO extensions
 dev-lang/php:phar - Enables the phar extension to provide phar archive support
 dev-lang/php:pic - Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)
@@ -1996,6 +1996,7 @@ dev-util/meld:highlight - Enable source code highlighting via dev-python/pygtkso
 dev-util/metro:ccache - Enable support for ccache
 dev-util/metro:git - Enable support for git snapshots
 dev-util/metro:threads - Enable support for pbzip2 tarball packing/unpacking
+dev-util/molecule:plugins - Add plugins provided by dev-util/molecule-plugins
 dev-util/monkeystudio:plugins - Build and install additional plugins
 dev-util/monodevelop:git - Enable Git version control support
 dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex.
@@ -2065,6 +2066,7 @@ dev-vcs/subversion:dso - Enable runtime module search
 dev-vcs/subversion:extras - Install extra scripts (examples, tools, hooks)
 dev-vcs/subversion:webdav-neon - Enable WebDAV support using net-libs/neon
 dev-vcs/subversion:webdav-serf - Enable WebDAV support using net-libs/serf
+games-action/beathazardultra:bundled-libs - Use the upstream provided bundled libraries.
 games-action/chromium-bsu:mixer - Enables media-libs/sdl-mixer sound backend instead of media-libs/openal one.
 games-action/d1x-rebirth:awe32 - Enable AWE32 support
 games-action/d1x-rebirth:demo - Use the demo data instead of the full game
@@ -2082,6 +2084,10 @@ games-action/d2x-rebirth:music - Support for ingame music
 games-action/d2x-rebirth:opl3-musicpack - Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip
 games-action/d2x-rebirth:sc55-musicpack - Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module
 games-action/openlierox:breakpad - Compile with support for breakpad crash reporting system
+games-action/solar2:bundled-libs - Use the upstream provided bundled libraries.
+games-action/super-hexagon:bundled-glew - Use the upstream provided bundled glew.
+games-action/super-hexagon:bundled-libs - Use the upstream provided bundled libraries.
+games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
 games-action/trine2:launcher - Install gtk+ launcher
 games-action/trine2:system-libs - Use system provided libraries.
 games-arcade/bomns:editor - enables building the level editor
@@ -2184,6 +2190,7 @@ games-fps/warsow:angelscript - Enable AngelScript support
 games-fps/warsow:irc - Enable IRC support
 games-fps/warsow:server - Build server binaries additionally
 games-fps/worldofpadman:maps - Install extra maps (PadPack)
+games-kids/crayon-physics:bundled-libs - Use the upstream provided bundled libraries.
 games-misc/katawa-shoujo:system-renpy - Use games-engines/renpy instead of the bundled one (experimental)
 games-misc/xcowsay:fortune - Installs the fortune-mod xcow binary
 games-mud/tf:atcp - enable ATCP support.
@@ -2191,6 +2198,7 @@ games-mud/tf:gmcp - enable GMCP support.
 games-mud/tf:option102 - enable telnet option 102 support.
 games-puzzle/cuyo:music - Enable playing of background music
 games-puzzle/jag:editor - Install level editor
+games-puzzle/nightsky:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/pingus:music - Enable playing of background music
 games-puzzle/xlogical:alt_gfx - Use alternate graphics which are closer to the original Amiga version
 games-roguelike/FTL:system-libs - Use system provided libraries.
@@ -2203,8 +2211,10 @@ games-rpg/arx-libertatis:crash-reporter - Build a dev-qt/qtgui-based tool that a
 games-rpg/arx-libertatis:debug - Enable asserts and debug logging.
 games-rpg/arx-libertatis:tools - Build tools that can extract the game's data and save files.
 games-rpg/arx-libertatis:unity-build - Build everything in one big source file, allowing for faster build times and better optimizations at the cost of higher memory usage.
+games-rpg/bastion:bundled-libs - Use the upstream provided bundled libraries.
 games-rpg/daimonin-client:music - Install extra music
 games-rpg/drascula:sound - Install optional audio files
+games-rpg/dungeon-defenders:bundled-libs - Use the upstream provided bundled libraries.
 games-rpg/eternal-lands-data:bloodsuckermaps - Will install Bloodsucker's Maps in place of the official map files.
 games-rpg/eternal-lands-data:music - Adds in-game music.
 games-rpg/eternal-lands-data:sound - Adds in-game sound effects.
@@ -4097,7 +4107,6 @@ net-im/ekg2:gadu - Enable Gadu-Gadu protocol support (requires net-libs/libgadu)
 net-im/ekg2:gif - GIF token support for Gadu-Gadu protocol.
 net-im/ekg2:gnutls - Enable SSL/TLS support through GnuTLS for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will be preferred where possible (and OpenSSL will be used elsewhere).
 net-im/ekg2:gpg - Enable jabber message encryption through app-crypt/gpgme.
-net-im/ekg2:inotify - Enable inotify-based filesystem monitoring support for xmsg&mail plugins.
 net-im/ekg2:jpeg - JPEG token support for Gadu-Gadu protocol.
 net-im/ekg2:minimal - Disable building extra plugins with no additional deps.
 net-im/ekg2:openssl - Support encryption in sim plugin, using OpenSSL.
diff --git a/sci-biology/profphd/profphd-1.0.39.ebuild b/sci-biology/profphd/profphd-1.0.39.ebuild
index 2d436a761a21..7803ab72437f 100644
--- a/sci-biology/profphd/profphd-1.0.39.ebuild
+++ b/sci-biology/profphd/profphd-1.0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/profphd-1.0.39.ebuild,v 1.1 2013/03/19 11:19:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/profphd/profphd-1.0.39.ebuild,v 1.2 2013/03/21 09:02:15 jlec Exp $
 
 EAPI=5
 
@@ -15,3 +15,17 @@ IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed \
+		-e '/ln -s/s:prof$:profphd:g' \
+		-i src/prof/Makefile || die
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install
+}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild
new file mode 100644
index 000000000000..2cf85c858024
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild,v 1.2 2013/03/22 10:38:35 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="ssl tk"
+
+inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+[[ -n ${PATCHSET} ]] \
+	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+opengl"
+
+RDEPEND="
+	dev-lang/tk[threads]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+	sed \
+		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+		-e "s:weights_s:weights:g" \
+		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+	local tk_ver
+	local myconf
+
+	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+
+	if use opengl; then
+		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
+		IGNORE_GL_FLAG=""
+		GL_FLAG="-DUSE_GL_TRUE"
+		GL_DIR="${EPREFIX}/usr"
+		GL_LIB="-lglut -lGLU -lGL"
+		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
+
+	else
+		IGNORE_GL_FLAG="-DIGNORE_GL"
+		GL_FLAG="-DUSE_GL_FALSE"
+	fi
+
+	GLUT_NOT_IN_GL=""
+	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+	rm -rf data model doc license || die
+
+	sed \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
+		c/environment_default.txt > c/environment.txt || die
+
+	sed \
+		-e 's:ln -s:cp -f:g' \
+		-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C c all
+	emake -C c links
+}
+
+src_install() {
+	local libdir
+	local tkver
+	local _wrapper
+
+	find . -name "*.pyc" -type f -delete || die
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPYTHON}|g" \
+			-e "s|gentoousr|${EPREFIX}/usr|g" \
+			-e "s|//|/|g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper}
+	done
+
+	local in_path=$(python_get_sitedir)/${PN}
+	local files
+	local pydocs
+
+	pydocs="$(find python -name doc -type d)"
+	rm -rf ${pydocs} || die
+
+	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+	sed \
+		-e 's|#from __future__|from __future__|g' \
+		-i ${i} || die
+	done
+
+	dodir ${in_path#${EPREFIX}}/c
+
+	ebegin "Installing main files"
+		python_moduleinto ${PN}
+		python_domodule python
+	eend
+
+	ebegin "Adjusting permissions"
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+	python_optimize
+}
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild
new file mode 100644
index 000000000000..4fd10f8d5c9d
--- /dev/null
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild,v 1.2 2013/03/22 09:06:42 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit eutils portability python-r1 versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN/-data}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR - Data"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www2.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!<sci-chemistry/ccpn-${PVR}"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}"/ccpnmr/ccpnmr2.2
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+}
+
+src_install() {
+	local i pydocs in_path ein_path
+
+	dodir /usr/share/doc/${PF}/html
+	sed \
+		-e "s:../ccpnmr2.1:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		../doc/index.html > "${ED}"/usr/share/doc/${PF}/html/index.html || die
+	treecopy $(find python/ -name doc -type d) "${ED}"/usr/share/doc/${PF}/html/
+
+	pydocs="$(find python -name doc -type d)"
+
+	linking() {
+		in_path=$(python_get_sitedir)/ccpn
+		ein_path="${in_path#${EPREFIX}}"
+		dosym ../../../../share/doc/${PF}/html ${ein_path}/doc
+		for i in ${pydocs}; do
+			dosym /usr/share/doc/${PF}/html/${i} ${ein_path}/${i}
+		done
+		dosym /usr/share/ccpn/data ${ein_path}/data
+		dosym /usr/share/ccpn/model ${ein_path}/model
+	}
+	python_foreach_impl linking
+
+	dohtml -r doc/*
+	insinto /usr/share/ccpn
+	doins -r data model
+}
diff --git a/sci-libs/ccpn-data/metadata.xml b/sci-libs/ccpn-data/metadata.xml
index 1837bbc07a6e..ae9ec7c5f6a4 100644
--- a/sci-libs/ccpn-data/metadata.xml
+++ b/sci-libs/ccpn-data/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index ecde900ac007..44b97a0a639f 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1,3 @@
 DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 WHIRLPOOL 912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
-DIST mathgl-1.11.2.tar.gz 4641427 SHA256 1602244136f42bf4b47a4880cb1ff599f6cce9dfb455f8accdbca668ed680e96
 DIST mathgl-2.0.3.tar.gz 4024665 SHA256 f2b7d6a0106d854e78bf6933596a04f09bc011eae50466cafcd0b979981ccb7a SHA512 6c47e985d0fefb635b5453b9d21ed2a77675edffbfe70738cf475d5c99c0f96c8c8515263ed20ba323a1ee24c30ae02317a66313e78c78d30414c597354528f7 WHIRLPOOL 26bf5e3301dc66974dfc14021cc41b4117b20b6c7e00f181af4bfc46bc85b46a4c347fef55975489151fb2817469707547965cecdfa8fc8885fdf8dd0cededc2
+DIST mathgl-2.1.2.tar.gz 5173804 SHA256 161c013ea2767b28fc887ee7a0aa875029666f8d88bea60f761b87083b0d18ec SHA512 d0f7605af31a7e0330b25f64619b724c87a429c60d1fb34129a749570c2a77b15214d9c74b652484f6b36a25e94b779c8e5a630d8bcdbd49075faca4ba04dd3b WHIRLPOOL 12fec240a1e11a33126c40967679f8f8908162591d1bff10c4577a12c46cf26c76125f34f4bcc84d1666db7bd741793f2c7f1b011cf96ecb608bf18a37af37c3
diff --git a/sci-libs/mathgl/files/mathgl-1.10.2-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.10.2-gcc43.patch
deleted file mode 100644
index 7a639bb9a4ab..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.10.2-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/mgl2gif.cpp.ORIG	2009-03-04 14:22:12.000000000 +0100
-+++ utils/mgl2gif.cpp	2009-04-22 10:15:02.000000000 +0200
-@@ -19,6 +19,7 @@
-  ***************************************************************************/
- #include <stdio.h>
- #include <string.h>
-+#include <cstdlib>
- #include <locale.h>
- #include <wchar.h>
- #include "mgl/mgl_zb.h"
diff --git a/sci-libs/mathgl/files/mathgl-1.11.2-cast.patch b/sci-libs/mathgl/files/mathgl-1.11.2-cast.patch
deleted file mode 100644
index ce73c9489352..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.11.2-cast.patch
+++ /dev/null
@@ -1,206 +0,0 @@
---- mgl/mgl_eps.cpp.ORIG	2011-05-30 13:12:29.000000000 +0200
-+++ mgl/mgl_eps.cpp	2012-02-29 11:26:55.651230100 +0100
-@@ -19,7 +19,7 @@
-  ***************************************************************************/
- #include <stdlib.h>
- #include <time.h>
--#include <zlib.h>
-+#include <zlib.h>
- #include "mgl/mgl_eps.h"
- #include "mgl/mgl_c.h"
- #include "mgl/mgl_f.h"
-@@ -85,7 +85,7 @@
- 	a.x[0]=p1[0];	a.y[0]=p1[1];	a.x[1]=p2[0];	a.y[1]=p2[1];
- 	a.zz[0]=p1[2];	a.zz[1]=p2[2];
- 	a.c[0]=(c1[0]+c2[0])/2;	a.c[1]=(c1[1]+c2[1])/2;	a.c[2]=(c1[2]+c2[2])/2;
--//	a.c[0]=c1[0];	a.c[1]=c1[1];	a.c[2]=c1[2];
-+//	a.c[0]=c1[0];	a.c[1]=c1[1];	a.c[2]=c1[2];
- 	a.style=all? 0xffff:PDef;	a.s = pPos;
- 	add_prim(a);
- 	pPos = fmod(pPos+hypot(p2[0]-p1[0], p2[1]-p1[1])/pw/1.5, 16);
-@@ -197,7 +197,7 @@
- {
- 	mglPrim a(4);
- 	a.s = fscl/PlotFactor;	a.w = ftet;
--	a.x[0] = (xPos - zoomx1*Width) /zoomx2;
-+	a.x[0] = (xPos - zoomx1*Width) /zoomx2;
- 	a.y[0] = (yPos - zoomy1*Height)/zoomy2;
- 	a.x[1] = x;		a.y[1] = y;
- 	a.zz[1] = f/fnt->GetFact(s&3);
-@@ -260,10 +260,10 @@
- }
- //-----------------------------------------------------------------------------
- void mglGraphPS::add_light(mreal *b, mreal n0,mreal n1, mreal n2)
--{
--	mreal n[3]={n0,n1,n2};
--	unsigned char r[4];
--	col2int(b,n,r);
-+{
-+	mreal n[3]={n0,n1,n2};
-+	unsigned char r[4];
-+	col2int(b,n,r);
- 	b[0]=r[0]/255.;	b[1]=r[1]/255.;	b[2]=r[2]/255.;	b[3]=r[3]/255.;
- }
- //-----------------------------------------------------------------------------
-@@ -303,9 +303,9 @@
- 	if(!Finished)	Finish();
- 	time_t now;
- 	time(&now);
--
--	bool gz = fname[strlen(fname)-1]=='z';
--	void *fp = gz ? gzopen(fname,"wt") : fopen(fname,"wt");
-+
-+	bool gz = fname[strlen(fname)-1]=='z';
-+	void *fp = gz ? (void*)gzopen(fname,"wt") : (void*)fopen(fname,"wt");
- 	if(!fp)		{	SetWarn(mglWarnOpen,fname);	return;	}
- 	mgl_printf(fp, gz, "%%!PS-Adobe-3.0 EPSF-3.0\n%%%%BoundingBox: 0 0 %d %d\n",Width,Height);
- 	mgl_printf(fp, gz, "%%%%Creator: MathGL library\n%%%%Title: %s\n",descr ? descr : fname);
-@@ -320,9 +320,9 @@
- 	mgl_printf(fp, gz, "/m_c {ss 0.3 mul 0 360 arc} def\n");
- 	mgl_printf(fp, gz, "/d0 {[] 0 setdash} def\n/sd {setdash} def\n");
- 
--	bool m_p=false,m_x=false,m_d=false,m_v=false,m_t=false,
--		m_s=false,m_a=false,m_o=false,m_T=false,
--		m_V=false,m_S=false,m_D=false,m_Y=false,m_l=false,
-+	bool m_p=false,m_x=false,m_d=false,m_v=false,m_t=false,
-+		m_s=false,m_a=false,m_o=false,m_T=false,
-+		m_V=false,m_S=false,m_D=false,m_Y=false,m_l=false,
- 		m_L=false,m_r=false,m_R=false,m_X=false,m_P=false;
- 	register long i;
- 	// add mark definition if present
-@@ -336,11 +336,11 @@
- 		if(P[i].m=='S')	m_S = true;		if(P[i].m=='D')	m_D = true;
- 		if(P[i].m=='V')	m_V = true;		if(P[i].m=='T')	m_T = true;
- 		if(P[i].m=='<')	m_l = true;		if(P[i].m=='L')	m_L = true;
--		if(P[i].m=='>')	m_r = true;		if(P[i].m=='R')	m_R = true;
--		if(P[i].m=='Y')	m_Y = true;
-+		if(P[i].m=='>')	m_r = true;		if(P[i].m=='R')	m_R = true;
-+		if(P[i].m=='Y')	m_Y = true;
- 		if(P[i].m=='P')	m_P = true;		if(P[i].m=='X')	m_X = true;
--	}
--	if(m_P)	{	m_p=true;	m_s=true;	}
-+	}
-+	if(m_P)	{	m_p=true;	m_s=true;	}
- 	if(m_X)	{	m_x=true;	m_s=true;	}
- 	if(m_p)	mgl_printf(fp, gz, "/m_p {sm 0 rm s2 0 rl sm sm rm 0 s2 rl d0} def\n");
- 	if(m_x)	mgl_printf(fp, gz, "/m_x {sm sm rm s2 s2 rl 0 sm 2 mul rm sm 2 mul s2 rl d0} def\n");
-@@ -453,7 +453,7 @@
- 	}
- 	for(i=0;i<pNum;i++)		if(P[i].type==-1)	P[i].type = 1;
- 	mgl_printf(fp, gz, "\nshowpage\n%%%%EOF\n");
--	if(gz)	gzclose(fp);	else	fclose((FILE *)fp);
-+	if(gz)	gzclose((gzFile_s*)fp);	else	fclose((FILE *)fp);
- }
- //-----------------------------------------------------------------------------
- void mglGraphPS::WriteSVG(const char *fname,const char *descr)
-@@ -463,8 +463,8 @@
- 	time_t now;
- 	time(&now);
- 
--	bool gz = fname[strlen(fname)-1]=='z';
--	void *fp = gz ? gzopen(fname,"wt") : fopen(fname,"wt");
-+	bool gz = fname[strlen(fname)-1]=='z';
-+	void *fp = gz ? (void*)gzopen(fname,"wt") : (void*)fopen(fname,"wt");
- 	if(!fp)		{	SetWarn(mglWarnOpen,fname);	return;	}
- 	mgl_printf(fp, gz, "<?xml version=\"1.0\" standalone=\"no\"?>\n");
- 	mgl_printf(fp, gz, "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20000303 Stylable//EN\" \"http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd\">\n");
-@@ -576,10 +576,10 @@
- //			const char *dash[]={"", "8 8","4 4","1 3","7 4 1 4","3 2 1 2"};
- 			mgl_printf(fp, gz, "<g stroke=\"#%02x%02x%02x\"",
- 					int(255*P[i].c[0]),int(255*P[i].c[1]),int(255*P[i].c[2]));
--			if(P[i].style)
--			{
--				mgl_printf(fp, gz, " stroke-dasharray=\"%s\"", mgl_get_dash(P[i].style,P[i].w));
--				mgl_printf(fp, gz, " stroke-dashoffset=\"%g\"", P[i].s*P[i].w);
-+			if(P[i].style)
-+			{
-+				mgl_printf(fp, gz, " stroke-dasharray=\"%s\"", mgl_get_dash(P[i].style,P[i].w));
-+				mgl_printf(fp, gz, " stroke-dashoffset=\"%g\"", P[i].s*P[i].w);
- 			}
- 			if(P[i].w>1)	mgl_printf(fp, gz, " stroke-width=\"%g\"", P[i].w);
- 			memcpy(cp,P[i].c,3*sizeof(mreal));
-@@ -620,7 +620,7 @@
- 
- 	for(i=0;i<pNum;i++)		if(P[i].type==-1)	P[i].type = 1;
- 	mgl_printf(fp, gz, "</g></svg>");
--	if(gz)	gzclose(fp);	else	fclose((FILE *)fp);
-+	if(gz)	gzclose((gzFile_s*)fp);	else	fclose((FILE *)fp);
- }
- //-----------------------------------------------------------------------------
- void mglGraphPS::Finish()
-@@ -643,31 +643,31 @@
- #define imax(a,b)	(a)>(b) ? (a) : (b)
- #define imin(a,b)	(a)<(b) ? (a) : (b)
- void mglPrim::Draw(mglGraphPS *gr)
--{
--	mreal pp[12]={x[0],y[0],z,	x[1],y[1],z,	x[2],y[2],z,	x[3],y[3],z};
--	gr->draw_prim(this, pp, c);
--}
-+{
-+	mreal pp[12]={x[0],y[0],z,	x[1],y[1],z,	x[2],y[2],z,	x[3],y[3],z};
-+	gr->draw_prim(this, pp, c);
-+}
- //-----------------------------------------------------------------------------
--void mglGraphPS::draw_prim(mglPrim *pr, mreal *pp, mreal *c)
--{
-+void mglGraphPS::draw_prim(mglPrim *pr, mreal *pp, mreal *c)
-+{
- 	ObjId = pr->id;	memcpy(CDef,c,4*sizeof(mreal));
--	bool ul=UseLight;	UseLight=false;
--	int m = pr->m, s = pr->style;
--	switch(pr->type)
--	{
--	case 0:	mglGraphAB::mark_plot(pp,pr->m);	break;
--	case 1:	PDef = pr->style;	pPos = pr->s;
-+	bool ul=UseLight;	UseLight=false;
-+	int m = pr->m, s = pr->style;
-+	switch(pr->type)
-+	{
-+	case 0:	mglGraphAB::mark_plot(pp,pr->m);	break;
-+	case 1:	PDef = pr->style;	pPos = pr->s;
- 			mglGraphAB::line_plot(pp,pp+3,c,c);	break;
- 	case 2:	mglGraphAB::trig_plot(pp,pp+3,pp+6,c,c,c);	break;
- 	case 3:	mglGraphAB::quad_plot(pp,pp+3,pp+6,pp+9,c,c,c,c);	break;
- 	case 4:
- 		mreal pf=PlotFactor;	Push();
--		SetPosScale(pp[0],pp[1],pp[2],pr->s*PlotFactor);	RotateN(pr->w,0,0,1);
-+		SetPosScale(pp[0],pp[1],pp[2],pr->s*PlotFactor);	RotateN(pr->w,0,0,1);
- 		mglGraphAB::Glyph(pr->x[1],pr->y[1],pr->zz[1]*fnt->GetFact(s&3),s,m,0);
--		Pop();	PlotFactor=pf;
-+		Pop();	PlotFactor=pf;
- 		break;
- 	}
--	UseLight=ul;
-+	UseLight=ul;
- }
- //-----------------------------------------------------------------------------
- void mglGraphPS::pnt_plot(long x,long y, mreal, unsigned char c[4])
---- mgl/mgl_export.cpp.ORIG	2011-05-30 13:12:29.000000000 +0200
-+++ mgl/mgl_export.cpp	2012-02-29 11:52:31.496163039 +0100
-@@ -232,7 +232,7 @@
- 	va_start(lst,str);
- 	vsprintf(buf,str,lst);
- 	va_end(lst);
--	if(gz)	gzprintf(fp, "%s", buf);
-+	if(gz)	gzprintf((gzFile_s*)fp, "%s", buf);
- 	else	fprintf((FILE *)fp, "%s", buf);
- }
- //---------------------------------------------------------------------------
-@@ -243,7 +243,7 @@
- 	register long i,j;
- 	bool gz = fname[strlen(fname)-1]=='z';
- 
--	void *fp = gz ? gzopen(fname,"wt") : fopen(fname,"wt");
-+	void *fp = gz ? (void*)gzopen(fname,"wt") : (void*)fopen(fname,"wt");
- 	mgl_printf(fp, gz, "%%!PS-Adobe-3.0 EPSF-3.0\n%%%%BoundingBox: 0 0 %d %d\n",w,h);
- 	mgl_printf(fp, gz, "%%%%Creator: MathGL library\n%%%%Title: %s\n", fname);
- 	mgl_printf(fp, gz, "%%%%CreationDate: %s\n",ctime(&now));
-@@ -255,7 +255,7 @@
- 		mgl_printf(fp, gz, "%02x%02x%02x",p[j][3*i],p[j][3*i+1],p[j][3*i+2]);
- 	}
- 	mgl_printf(fp, gz, "\n\nshowpage\n%%%%EOF\n");
--	if(gz)	gzclose(fp);	else	fclose((FILE *)fp);
-+	if(gz)	gzclose((gzFile_s*)fp);	else	fclose((FILE *)fp);
- 	return 0;
- }
- //-----------------------------------------------------------------------------
diff --git a/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch b/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch
deleted file mode 100644
index 401f5b0d9fcf..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mgl/Makefile.am
-+++ mgl/Makefile.am
-@@ -16,7 +16,7 @@
- WIDGETS += -DWITH_GLUT
- endif
- 
--libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) $(LOPENMP)
-+libmgl_la_LIBADD = $(PNG_LIBS) -lz $(GL_LIBS) $(LOPENMP)
- libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
- 
- libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \
---- mgl/mgl_data_png.cpp
-+++ mgl/mgl_data_png.cpp
-@@ -18,6 +18,7 @@
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
- #include <stdlib.h>
-+#include <zlib.h>
- #ifndef NO_PNG
- #include <png.h>
- #endif
diff --git a/sci-libs/mathgl/files/mathgl-octave-3.4.patch b/sci-libs/mathgl/files/mathgl-octave-3.4.patch
deleted file mode 100644
index ac982bfdf308..000000000000
--- a/sci-libs/mathgl/files/mathgl-octave-3.4.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -r -U1 mathgl-1.11.1.1.orig/configure.ac mathgl-1.11.1.1/configure.ac
---- mathgl-1.11.1.1.orig/configure.ac	2011-03-22 02:13:29.000000000 +0600
-+++ mathgl-1.11.1.1/configure.ac	2011-03-29 22:04:59.000000000 +0700
-@@ -364,2 +364,3 @@
-     OCTAVE_INCFLAGS="-I`$OCTAVE -p OCTINCLUDEDIR`"
-+    OCTAVE_INCFLAGS=`echo ${OCTAVE_INCFLAGS} | sed -e 's|/octave$||'`
-     AC_MSG_RESULT([$OCTAVE_ARCH])
diff --git a/sci-libs/mathgl/mathgl-1.11.2.ebuild b/sci-libs/mathgl/mathgl-1.11.2.ebuild
deleted file mode 100644
index 8d96b07233ba..000000000000
--- a/sci-libs/mathgl/mathgl-1.11.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.5 2013/03/02 23:23:19 hwoarang Exp $
-
-EAPI=4
-
-WX_GTK_VER=2.8
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python toolchain-funcs versionator wxwidgets
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg mpi octave python qt4 wxwidgets static-libs"
-
-RDEPEND="
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	glut? ( media-libs/freeglut )
-	gsl? ( sci-libs/gsl )
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg )
-	octave? ( >=sci-mathematics/octave-3.4.0 )
-	python? ( dev-python/numpy )
-	qt4? ( dev-qt/qtgui:4 )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool:2
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	octave? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-REQUIRED_USE="mpi? ( hdf5 ) "
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.2-gcc43.patch
-	"${FILESDIR}"/${PN}-octave-3.4.patch
-	"${FILESDIR}"/${P}-zlib.patch
-	"${FILESDIR}"/${P}-cast.patch
-	)
-
-pkg_setup() {
-	if ! version_is_at_least "4.3.0" "$(gcc-version)"; then
-		eerror "You need >=gcc-4.3.0 to compile this package"
-		die "Wrong gcc version"
-	fi
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-	fi
-	use python && python_pkg_setup
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# correct location of numpy/arrayobject.h
-	if use python; then
-		sed \
-			-e '/SUBDIRS/s:lang::g' \
-			-i Makefile.am || die
-	fi
-
-	echo "#!${EPREFIX}/bin/sh" > config/py-compile
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable glut)
-		$(use_enable qt4 qt)
-		$(use_enable wxwidgets wx)
-		$(use_enable fltk)
-		$(use_enable gif)
-		$(use_enable jpeg)
-		$(use_enable hdf5 hdf5_18)
-		$(use_enable python)
-		$(use_enable octave)
-		$(use_enable gsl)
-		$(use_enable doc docs)
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && MAKEOPTS+=" -j1"
-
-	autotools-utils_src_compile
-
-	if use python; then
-		python_copy_sources lang
-		compilation() {
-			local numpy_h
-			numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h
-			einfo "fixing numpy.i for Python-${PYTHON_ABI}"
-			sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \
-				-i numpy.i \
-				|| die "sed failed"
-			emake PYTHON_HEADERS="-I$(python_get_includedir)" pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir lang compilation
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" PYTHON="$(PYTHON)" pyexecdir="$(python_get_sitedir)" pythondir="$(python_get_sitedir)" install
-		}
-		python_execute_function -s --source-dir lang installation
-		python_clean_installation_image
-	fi
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install /usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/sci-libs/mathgl/mathgl-2.1.2.ebuild b/sci-libs/mathgl/mathgl-2.1.2.ebuild
new file mode 100644
index 000000000000..4ffccd68b545
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.1.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.2.ebuild,v 1.1 2013/03/21 15:40:47 bicatali Exp $
+
+EAPI=5
+
+WX_GTK_VER=2.8
+
+inherit cmake-utils eutils python wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl pdf
+	png python qt4 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( sci-libs/gsl )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng )
+	python? ( dev-python/numpy )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:2.8 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="mpi? ( hdf5 ) png? ( zlib ) pdf? ( png )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python_pkg_setup
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
+	cd "${S}"/fonts
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		$(cmake-utils_use doc enable-doc)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+		# fix location of numpy
+		use python && append-cppflags \
+			-I$(echo "import numpy; print(numpy.get_include())" | "$(PYTHON)" - 2>/dev/null)
+	fi
+
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}
diff --git a/sci-libs/matio/matio-1.5.1.ebuild b/sci-libs/matio/matio-1.5.1.ebuild
index dd9aaab80aff..1658d8ea4808 100644
--- a/sci-libs/matio/matio-1.5.1.ebuild
+++ b/sci-libs/matio/matio-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.1.ebuild,v 1.1 2013/03/20 21:33:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/matio/matio-1.5.1.ebuild,v 1.2 2013/03/22 10:50:10 grozin Exp $
 
 EAPI=5
 
@@ -37,7 +37,10 @@ src_compile() {
 
 src_install() {
 	autotools-utils_src_install
-	use doc && dodoc documentation/matio_user_guide.pdf
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${WORKDIR}"/${P}_build/documentation/matio_user_guide.pdf
+	fi
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins test/test*
diff --git a/sci-mathematics/yafu/files/fix-Makefile.patch b/sci-mathematics/yafu/files/fix-Makefile.patch
new file mode 100644
index 000000000000..82b8e0d7d2ff
--- /dev/null
+++ b/sci-mathematics/yafu/files/fix-Makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2013-03-17 11:20:40.248683894 +0400
++++ Makefile	2013-03-17 11:20:47.352683657 +0400
+@@ -87,7 +87,7 @@ ifeq ($(CC),icc)
+ 	CFLAGS += -mtune=core2 -march=core2
+ endif
+ 
+-LIBS += -lecm -lgmp
++LIBS += -lecm -lgmp -lgomp
+ 
+ CFLAGS += $(OPT_FLAGS) $(WARN_FLAGS) $(INC)
+ 	
diff --git a/sci-mathematics/yafu/yafu-1.34.3.ebuild b/sci-mathematics/yafu/yafu-1.34.3.ebuild
index 12573055e1c7..4af8ab80ddfc 100644
--- a/sci-mathematics/yafu/yafu-1.34.3.ebuild
+++ b/sci-mathematics/yafu/yafu-1.34.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.34.3.ebuild,v 1.3 2013/03/08 03:05:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.34.3.ebuild,v 1.4 2013/03/21 08:09:43 patrick Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}/fix-Makefile.patch"
 	# This is not nice. But then the Makefile is quite special :)
 	sed -i -e 's:../gmp/include:gmp:' Makefile 		|| die "Failed to rectify things"
 	sed -i -e 's:../gmp-ecm/include:gmp-ecm:' Makefile 	|| die "Failed to rectify things"
diff --git a/sys-apps/attr/attr-2.4.46-r2.ebuild b/sys-apps/attr/attr-2.4.46-r2.ebuild
index d42abbe1d173..32fff3900a1d 100644
--- a/sys-apps/attr/attr-2.4.46-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.46-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.46-r2.ebuild,v 1.1 2013/03/20 06:05:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.46-r2.ebuild,v 1.2 2013/03/21 15:11:57 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 045a6c186a7c..a97ce2a670f5 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -7,3 +7,4 @@ DIST file-5.10.tar.gz 608726 SHA256 73ae51889006b1ddb95db729237d411eb8d353884dfb
 DIST file-5.11.tar.gz 610019 SHA256 c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7 SHA512 a3f740e1a950f84ae53ef477ff255370050b52dd39fa309c8b8c4b0dc061e96fce585eb4a587037003509c01cd067d49e5193f1d0905e5c28347223a15aa271b WHIRLPOOL 175076c321b5679567c560ed1fb1a1032ee8865ab779ec39f7ce67b21e890e2d16b7ba810414933a171b7896db221a8243e400e1f877ff8e0cfc7e1dca3edcc8
 DIST file-5.12-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch.bz2 13636 SHA256 1694161e8a34d68fa481f362e5df81a06dee44678503f8a6113e42700c0b0ddb SHA512 641294ffb6f156dbcccf53afca4afa72fe7f2fcf7ff8c4b1815b62af3db805f761f0863948fbc435652053f7adca5a746197602c27fee1b1cca9523ab28bd152 WHIRLPOOL 2ed9ef157bddd35b7c93d4147b6dba180304676a6dfff1311ee06b9da8c3d042203c9b51c1c1f7d27502bdbe17e851b290ff313574440a034483fe9655bb2168
 DIST file-5.12.tar.gz 632808 SHA256 199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22 SHA512 eea292ea39256c0aede271676321e6076125b02bc8656d867f8d99caea4e54849e79840236c6f38f0024273d81c12cb87a966d1670da3fda77f7d739da3dd2f8 WHIRLPOOL 0d2b7733581afd65c71afdffb39f2d9693c5b29734d99c2f61d835756d522659dec2e35c50716a368c758cc7473835d646bd5638d2bb839edbb9393c97a19642
+DIST file-5.14.tar.gz 648552 SHA256 461ba01dd0900a3b7c2dcd901b04903192c07887a9c1928af0be507572c77fe4 SHA512 76b1802234a4da30221e3f0bbbda3416fb40fb4cbaf1129f7b27e8dced16b074be1a14679170e9ef96ba75ef0e301eea48a1a0c084c68440efacc275b3e91857 WHIRLPOOL 319aa31cb90f6a07def6ee89d6b5e4cac9c37866d93208220eacc95c8db0591f8d1eacbf654ea40ad3cd3a859d99fa85b339c4ceb979b8b880b205a4b76be270
diff --git a/sys-apps/file/file-5.14.ebuild b/sys-apps/file/file-5.14.ebuild
new file mode 100644
index 000000000000..63c8ada3f1fe
--- /dev/null
+++ b/sys-apps/file/file-5.14.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.14.ebuild,v 1.1 2013/03/21 21:18:12 vapier Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils distutils libtool toolchain-funcs
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
+SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
+	ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="python static-libs zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="magic.py"
+
+src_prepare() {
+	elibtoolize
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+wd() { echo "${WORKDIR}"/build-${CHOST}; }
+do_configure() {
+	ECONF_SOURCE=${S}
+
+	mkdir "$(wd)"
+	pushd "$(wd)" >/dev/null
+
+	econf "$@"
+
+	popd >/dev/null
+}
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		tc-export_build_env BUILD_C{C,XX}
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		do_configure --disable-shared
+	fi
+
+	export ac_cv_header_zlib_h=$(usex zlib) ac_cv_lib_z_gzopen=$(usex zlib)
+	do_configure $(use_enable static-libs static)
+}
+
+do_make() {
+	emake -C "$(wd)" "$@" || die
+}
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		CHOST=${CBUILD} do_make -C src file
+		PATH=$(CHOST=${CBUILD} wd)/src:${PATH}
+	fi
+	do_make
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	do_make DESTDIR="${D}" install || die
+	dodoc ChangeLog MAINT README
+
+	use python && cd python && distutils_src_install
+	use static-libs || rm -f "${D}"/usr/lib*/libmagic.la
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sys-apps/kmod/kmod-12-r1.ebuild b/sys-apps/kmod/kmod-12-r1.ebuild
index a7596b03e428..9bfb4bfa0d13 100644
--- a/sys-apps/kmod/kmod-12-r1.ebuild
+++ b/sys-apps/kmod/kmod-12-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.14 2013/03/06 19:55:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.15 2013/03/22 08:50:44 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool multilib linux-info
+inherit autotools eutils libtool multilib linux-mod
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -96,3 +96,12 @@ src_install()
 	insinto /lib/modprobe.d
 	doins "${T}"/usb-load-ehci-first.conf #260139
 }
+
+pkg_postinst() {
+	# Upgrade path from sys-apps/module-init-tools
+	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			update_depmod
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 0ec5d2d735b5..06ceaec8ee1a 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.48 2013/02/15 18:33:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.49 2013/03/22 08:50:44 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool multilib linux-info
+inherit autotools eutils libtool multilib linux-mod
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -96,3 +96,12 @@ src_install()
 	insinto /lib/modprobe.d
 	doins "${T}"/usb-load-ehci-first.conf #260139
 }
+
+pkg_postinst() {
+	# Upgrade path from sys-apps/module-init-tools
+	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			update_depmod
+		fi
+	fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a6d43bd0eaa6..69699813f30e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,6 +2,7 @@ DIST portage-2.1.11.50.tar.bz2 895469 SHA256 39f61e4f2256cbc9f7b6e5da9d6eeb43ff1
 DIST portage-2.1.11.52.tar.bz2 903416 SHA256 30f5985f1a92137bfc1399bf6d7a3a32548dedc011d1c694bd0de0bf8ac62882 SHA512 d3d779c29b9b79c4581f64645739b5b1f2d5e8f1590013026908eb90f905a37390501e3de61d0c24cf73c2b5aad06369249604de2755f9ec1503170fe37c6879 WHIRLPOOL d97848f23a5d6d2b2dd789dc440acef57de2b343708e8b053471ef80eece040ad430bb7a845754769a5359314211686abbc55b556dd63eb50f64e53b30b3baf9
 DIST portage-2.1.11.55.tar.bz2 906931 SHA256 555aeaa2e69a6655650a145d149827de24e668a2f199111bdd31a8144f33a3aa SHA512 2605058e2fcf4fc3fd0e30261d19d67518dd03b8050c1022e224738886179bae8ce8c80e391c97026cc7dc3d6e7a5bb7f7df2b0cf3572d7ac629528cd21d92e2 WHIRLPOOL 99e1008d818484a7da15bb656979b5af6935db1c4a3e4bf6cd3309ff984ed70bf36441c85a08b38523481ee5b2625bfbc08f4fa23d53a8caede6512f36c21c14
 DIST portage-2.1.11.57.tar.bz2 912032 SHA256 643eb5cf4ee775bea910db97bdb258d50bdbebc475ee50bb798d0bed8f15946d SHA512 1182c833bab5525dac5e13550f042c0ba3cd48e8468216d11cc4c7a3329f912bfb460689170ab9bc95701cee7ae91c1900092941aba1f3dba728229a2edae6e4 WHIRLPOOL 17cb6ff73ee5daa02e58dd17256367f4f66b3e3ef1c5a0349d12b77e1e7049c47469c570a985ea6bb9626b17b333b35606858791498602fc6e7342782e7f8947
+DIST portage-2.1.11.58.tar.bz2 912988 SHA256 0f89d03f301a0fcdee000dd95fbea683f0268d24baca3ab0cfc2166f94914e82 SHA512 b6467fb58ef3b82bcc3b57ae530d316e032f4a66d1f9470e83397e3085dfc265720ceb389a71b850a07823fac8ef99614069ae5d6dc490f93addefa7cdbff132 WHIRLPOOL 4a76bab514cee87fcd8d1118dfe11685de2f3474058a6ab21b81e66522fc2cb087ed90030cf7a8b4a70ed7212d52e0edb78337e92bda3ff483f2110259294a22
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
 DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 SHA512 d035f84601802ecaea3c0edea037a783fec743733bd40895eb5bb8a220449eb24cf1e2623cbca2e378197caba63a833d8cc54f1e49d886266307288b0adcfbdc WHIRLPOOL 25b6a6e3810f428c630ec7a6dc3cf2cfbe6bfdf276553786e1436b2630532ab442186e427bc75f249a224c5171b508a92303ce352b07be1a8a4d805c568ec10f
@@ -9,4 +10,5 @@ DIST portage-2.2.0_alpha160.tar.bz2 895123 SHA256 25741e1a0cb2169008a20a3eda9966
 DIST portage-2.2.0_alpha163.patch.bz2 28204 SHA256 f17b3e4a1af61c235922856399086928ad36fd07f5ae9639e8b1f68c1991b4bd SHA512 0797b2d875e14cfea1b28ab353d97f3f414d9214ab74bb654a4936e3d36bc89df02ab5b3c7111cc368ae8a8037fdc8d16bc842d5f97ce129789376c8da645059 WHIRLPOOL ee9c0849a2e319e0c0cbbc6039fd52eebe3bd7b500e6eddcf3a96361820011bbd6d1bbdc1ea6468cb4822dd7bba33f1ead7204e647628be7efeb0637b7c1400c
 DIST portage-2.2.0_alpha166.tar.bz2 906770 SHA256 d73a78cb22f68db503fdc587ba594eacd871aa8f7e8d2bb909223d473fff4e55 SHA512 4b7ce8ec60546186fd26a1070dc02be23e4bd7f6b99f3abec7680e33fe1b98592d9fada27ba19f47d5954c919a3448e9cfb8198bd53b9f5dceb4ee03cf000c78 WHIRLPOOL f57158ed7d77e40e8673f5fa1088f4cd625fd1623ac6a5a80c4c69ead861ff12459d0b7b81ec836ff8b0f493bf3b3accf383803824b0e6402362bc5a466287e2
 DIST portage-2.2.0_alpha168.patch.bz2 22408 SHA256 cdcf3170620a6e90ba60c0c106e3e3b9a02deb1a6528a4fe2b800aeade500e67 SHA512 c5afb408866435f1360cfff9003ffa64b435b311c2198509103f870f011fbb1c0ce22c5e5063087f40809ece29ce3fa0ca553c110cce2243c704e84cff5b0964 WHIRLPOOL 3b3ba5006651d67903d9c394ace1a793b7324b6ae38bf4d7be0be481f7dab8cf5641b8c32e7dd7296180fcc705ee7b68acf03e0bf9cafc887128482260584c9b
+DIST portage-2.2.0_alpha169.patch.bz2 26215 SHA256 76855492f86040fdc4f00f5cfbd93d971f4a610d259dc20864515af6e535495a SHA512 c9621cc9d1f6cf181105c923f618894ff4b0981d108eb90d3faa51a076f0db3a64398f2eb8d6365436f08264d33e08928bd96431dd24866de82409f0b5c74e04 WHIRLPOOL 87dc006c432c8200f68f781a0de58c8ebb9e0e9dea4f4a2291b1171ff2f26b364c5b05fd9ca546558f8c206cb6ab49fe6f585d665aa1eae1caca2f2457ec1285
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
diff --git a/sys-apps/portage/portage-2.1.11.58.ebuild b/sys-apps/portage/portage-2.1.11.58.ebuild
new file mode 100644
index 000000000000..e5f7823ef759
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.11.58.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.58.ebuild,v 1.1 2013/03/22 02:41:18 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+PYTHON_COMPAT=(
+	pypy1_9 pypy2_0
+	python3_1 python3_2 python3_3 python3_4
+	python2_6 python2_7
+)
+inherit eutils python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
+
+for _pyimpl in ${PYTHON_COMPAT[@]} ; do
+	IUSE+=" python_targets_${_pyimpl}"
+done
+unset _pyimpl
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy2_0? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+python_dep="${python_dep_ssl//\[ssl\]}"
+python_dep="${python_dep//,ssl}"
+python_dep="${python_dep//ssl,}"
+
+python_dep="${python_dep}
+	python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+	python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+	python_targets_python2_6? ( dev-lang/python:2.6 )
+	python_targets_python2_7? ( dev-lang/python:2.7 )
+	python_targets_python3_1? ( dev-lang/python:3.1 )
+	python_targets_python3_2? ( dev-lang/python:3.2 )
+	python_targets_python3_3? ( dev-lang/python:3.3 )
+	python_targets_python3_4? ( dev-lang/python:3.4 )
+"
+
+# The pysqlite blocker is for bug #282760.
+# make-3.82 is for bug #455858
+DEPEND="${python_dep}
+	>=sys-devel/make-3.82
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=$PV
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	/usr/bin/python -c 'import xattr' 2>/dev/null
+}
+
+pkg_setup() {
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in /usr/bin/python2.* ; do
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="/etc" \
+		prefix="/usr" \
+		install || die
+
+	# Extended set config is currently disabled in portage-2.1.x.
+	rm -rf "${D}/usr/share/portage/config/sets" || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
+	fi
+
+	# Allow external portage API consumers to import portage python modules
+	# (this used to be done with PYTHONPATH setting in /etc/env.d).
+	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+	# site-packages, and compile with the corresponding interpreter.
+	local impl files mod_dir dest_mod_dir python relative_path files x
+	for impl in "${PYTHON_COMPAT[@]}" ; do
+		use "python_targets_${impl}" || continue
+		while read -r mod_dir ; do
+			cd "${S}/pym/${mod_dir}" || die
+			files=$(echo *.py)
+			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+				# __pycache__ directories contain no py files
+				continue
+			fi
+			dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+			dodir "${dest_mod_dir}" || die
+			relative_path=../../../lib/portage/pym/${mod_dir}
+			x=/${mod_dir}
+			while [ -n "${x}" ] ; do
+				relative_path=../${relative_path}
+				x=${x%/*}
+			done
+			for x in ${files} ; do
+				dosym "${relative_path}/${x}" \
+					"${dest_mod_dir}/${x}" || die
+			done
+		done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+		dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+		case "${impl}" in
+			python*)
+				python=${impl/_/.}
+				python=/usr/bin/${python}
+				"${python}" -m compileall -q -f -d "${dest_mod_dir}" "${D}${dest_mod_dir#/}" || die
+				"${python}" -OO -m compileall -q -f -d "${dest_mod_dir}" "${D}${dest_mod_dir#/}" || die
+				;;
+			pypy*)
+				python=${impl/_/.}
+				python=/usr/bin/${python/pypy/pypy-c}
+				"${python}" -m compileall -q -f -d "${dest_mod_dir}" "${D}${dest_mod_dir#/}" || die
+				;;
+		esac
+	done
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$D" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	if [[ -d ${ROOT}var/log/portage && \
+		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
+		has_version '<sys-apps/portage-2.1.10.11' ; then
+		# Initialize permissions for bug #378451 and bug #377177, since older
+		# portage does not create /var/log/portage with the desired default
+		# permissions.
+		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+		chown portage:portage "${ROOT}var/log/portage"
+		chmod g+ws "${ROOT}var/log/portage"
+	fi
+
+	if has_version '<sys-apps/portage-2.1.10.61' ; then
+		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
+		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
+		ewarn "files that have not been modified since they were installed."
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/portage/pym
+}
diff --git a/sys-apps/portage/portage-2.2.0_alpha169.ebuild b/sys-apps/portage/portage-2.2.0_alpha169.ebuild
new file mode 100644
index 000000000000..e6b044a104d2
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.0_alpha169.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha169.ebuild,v 1.1 2013/03/22 02:43:09 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=3
+PYTHON_COMPAT=(
+	pypy1_9 pypy2_0
+	python3_1 python3_2 python3_3 python3_4
+	python2_6 python2_7
+)
+inherit eutils python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
+
+for _pyimpl in ${PYTHON_COMPAT[@]} ; do
+	IUSE+=" python_targets_${_pyimpl}"
+done
+unset _pyimpl
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy2_0? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+python_dep="${python_dep_ssl//\[ssl\]}"
+python_dep="${python_dep//,ssl}"
+python_dep="${python_dep//ssl,}"
+
+python_dep="${python_dep}
+	python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+	python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+	python_targets_python2_6? ( dev-lang/python:2.6 )
+	python_targets_python2_7? ( dev-lang/python:2.7 )
+	python_targets_python3_1? ( dev-lang/python:3.1 )
+	python_targets_python3_2? ( dev-lang/python:3.2 )
+	python_targets_python3_3? ( dev-lang/python:3.3 )
+	python_targets_python3_4? ( dev-lang/python:3.4 )
+"
+
+# The pysqlite blocker is for bug #282760.
+# make-3.82 is for bug #455858
+DEPEND="${python_dep}
+	>=sys-devel/make-3.82
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=2.2.0_alpha166
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
+}
+
+pkg_setup() {
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy2_0 && use python3 ; then
+		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy2_0 && use python2 ; then
+		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy2_0 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in "${EPREFIX}"/usr/bin/python2.* ; do
+			x=${x#${EPREFIX}/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	elif use pypy2_0; then
+		python_set_active_version 2.7-pypy-2.0
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use pypy2_0; then
+		einfo "Converting shebangs for pypy-c2.0..."
+		python_convert_shebangs -r 2.7-pypy-2.0 .
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		find . -type f -print0 | \
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done
+
+		einfo "Adjusting make.globals ..."
+		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
+		|| die "failed to append to make.globals"
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
+	fi
+
+	# Allow external portage API consumers to import portage python modules
+	# (this used to be done with PYTHONPATH setting in /etc/env.d).
+	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+	# site-packages, and compile with the corresponding interpreter.
+	local impl files mod_dir dest_mod_dir python relative_path files x
+	for impl in "${PYTHON_COMPAT[@]}" ; do
+		use "python_targets_${impl}" || continue
+		while read -r mod_dir ; do
+			cd "${S}/pym/${mod_dir}" || die
+			files=$(echo *.py)
+			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+				# __pycache__ directories contain no py files
+				continue
+			fi
+			dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+			dodir "${dest_mod_dir}" || die
+			relative_path=../../../lib/portage/pym/${mod_dir}
+			x=/${mod_dir}
+			while [ -n "${x}" ] ; do
+				relative_path=../${relative_path}
+				x=${x%/*}
+			done
+			for x in ${files} ; do
+				dosym "${relative_path}/${x}" \
+					"${dest_mod_dir}/${x}" || die
+			done
+		done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+		dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+		case "${impl}" in
+			python*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				"${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+			pypy*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+		esac
+	done
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$ED" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
+		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
+
+	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
+	# assume that the NEEDED.ELF.2 files have already been generated.
+	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
+}
+
+pkg_postinst() {
+	if $WORLD_MIGRATION_UPGRADE && \
+		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
+		einfo "moving set references from the worldfile into world_sets"
+		cd "${EROOT}/var/lib/portage/"
+		grep "^@" world >> world_sets
+		sed -i -e '/^@/d' world
+	fi
+
+	if $NEEDED_REBUILD_UPGRADE ; then
+		einfo "rebuilding NEEDED.ELF.2 files"
+		for cpv in "${EROOT}/var/db/pkg"/*/*; do
+			if [ -f "${cpv}/NEEDED" ]; then
+				rm -f "${cpv}/NEEDED.ELF.2"
+				while read line; do
+					filename=${line% *}
+					needed=${line#* }
+					needed=${needed//+/++}
+					needed=${needed//#/##}
+					needed=${needed//%/%%}
+					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
+					newline=${newline//  -  }
+					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+				done < "${cpv}/NEEDED"
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/portage/pym
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 26cbfa72cdd3..bca9a6ad5654 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,9 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.68 2013/02/06 19:46:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.70 2013/03/22 00:04:25 zmedico Exp $
 
 EAPI=3
-inherit git-2 eutils python
+PYTHON_COMPAT=(
+	pypy1_9 pypy2_0
+	python3_1 python3_2 python3_3 python3_4
+	python2_6 python2_7
+)
+inherit git-2 eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -12,6 +17,11 @@ KEYWORDS=""
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
 
+for _pyimpl in ${PYTHON_COMPAT[@]} ; do
+	IUSE+=" python_targets_${_pyimpl}"
+done
+unset _pyimpl
+
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
 python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
@@ -24,6 +34,17 @@ python_dep="${python_dep_ssl//\[ssl\]}"
 python_dep="${python_dep//,ssl}"
 python_dep="${python_dep//ssl,}"
 
+python_dep="${python_dep}
+	python_targets_pypy1_9? ( dev-python/pypy:1.9 )
+	python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+	python_targets_python2_6? ( dev-lang/python:2.6 )
+	python_targets_python2_7? ( dev-lang/python:2.7 )
+	python_targets_python3_1? ( dev-lang/python:3.1 )
+	python_targets_python3_2? ( dev-lang/python:3.2 )
+	python_targets_python3_3? ( dev-lang/python:3.3 )
+	python_targets_python3_4? ( dev-lang/python:3.4 )
+"
+
 # The pysqlite blocker is for bug #282760.
 # make-3.82 is for bug #455858
 DEPEND="${python_dep}
@@ -100,8 +121,8 @@ pkg_setup() {
 		! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
+		for x in "${EPREFIX}"/usr/bin/python2.* ; do
+			x=${x#${EPREFIX}/usr/bin/python2.}
 			if [[ $x -ge 6 ]] 2>/dev/null ; then
 				eselect python set python2.$x
 				if compatible_python_is_selected ; then
@@ -240,12 +261,48 @@ src_install() {
 	# Use dodoc for compression, since the Makefile doesn't do that.
 	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
 
-	# Set PYTHONPATH for portage API consumers. This way we don't have
-	# to rely on patched python having the correct path, since it has
-	# been known to incorrectly add /usr/libx32/portage/pym to sys.path.
-	echo "PYTHONPATH=\"${EPREFIX}/usr/lib/portage/pym\"" > \
-		"${T}/05portage" || die
-	doenvd "${T}/05portage"
+	# Allow external portage API consumers to import portage python modules
+	# (this used to be done with PYTHONPATH setting in /etc/env.d).
+	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
+	# site-packages, and compile with the corresponding interpreter.
+	local impl files mod_dir dest_mod_dir python relative_path files x
+	for impl in "${PYTHON_COMPAT[@]}" ; do
+		use "python_targets_${impl}" || continue
+		while read -r mod_dir ; do
+			cd "${S}/pym/${mod_dir}" || die
+			files=$(echo *.py)
+			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
+				# __pycache__ directories contain no py files
+				continue
+			fi
+			dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages/${mod_dir}
+			dodir "${dest_mod_dir}" || die
+			relative_path=../../../lib/portage/pym/${mod_dir}
+			x=/${mod_dir}
+			while [ -n "${x}" ] ; do
+				relative_path=../${relative_path}
+				x=${x%/*}
+			done
+			for x in ${files} ; do
+				dosym "${relative_path}/${x}" \
+					"${dest_mod_dir}/${x}" || die
+			done
+		done < <(cd "${S}"/pym || die ; find * -type d ! -path "portage/tests*")
+		dest_mod_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
+		case "${impl}" in
+			python*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				"${python}" -OO -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+			pypy*)
+				python=${impl/_/.}
+				python=${EPREFIX}/usr/bin/${python/pypy/pypy-c}
+				"${python}" -m compileall -q -f -d "${EPREFIX}${dest_mod_dir}" "${ED}${dest_mod_dir#/}" || die
+				;;
+		esac
+	done
 }
 
 pkg_preinst() {
@@ -276,10 +333,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/lib/portage/pym
-
 	if $WORLD_MIGRATION_UPGRADE && \
 		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
 		einfo "moving set references from the worldfile into world_sets"
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 2f04a33f4798..21df8da52a7f 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.40 2013/03/19 12:42:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.41 2013/03/21 09:12:55 chithanh Exp $
 
 EAPI=5
 
@@ -99,7 +99,8 @@ src_prepare() {
 		|| die "FileCheck Makefile sed failed"
 
 	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
+#	Patch fails to apply, bug #462444
+#	epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
 
 	# User patches
 	epatch_user
diff --git a/sys-fs/aufs3/aufs3-3_p20130318.ebuild b/sys-fs/aufs3/aufs3-3_p20130318.ebuild
index 3c11856f8731..6725ae028579 100644
--- a/sys-fs/aufs3/aufs3-3_p20130318.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20130318.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130318.ebuild,v 1.1 2013/03/15 09:36:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130318.ebuild,v 1.2 2013/03/21 08:39:21 jlec Exp $
 
 EAPI=5
 
@@ -76,8 +76,8 @@ pkg_setup() {
 		if use kernel-patch; then
 			cd ${KV_DIR}
 			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null
-			epatch "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
 			ewarn "You need to compile your kernel with the applied patch"
 			ewarn "to be able to load and use the aufs kernel module"
 		else
@@ -142,7 +142,7 @@ src_install() {
 
 	use doc && doins -r Documentation
 
-	use kernel-patch || doins "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
 
 	dodoc Documentation/filesystems/aufs/README
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index da092f931e36..050c5d3181f3 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.25 2013/03/18 22:50:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.26 2013/03/21 15:40:27 floppym Exp $
 
 EAPI=4
 
@@ -22,9 +22,12 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="sys-libs/zlib
+DEPEND="
+	dev-libs/lzo
+	sys-libs/zlib
 	sys-apps/acl
-	sys-fs/e2fsprogs"
+	sys-fs/e2fsprogs
+"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/sys-fs/safecopy/metadata.xml b/sys-fs/safecopy/metadata.xml
index 643bf067e09e..a40624fba8f0 100644
--- a/sys-fs/safecopy/metadata.xml
+++ b/sys-fs/safecopy/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
-	<email>corvus-gentoo@cybertrench.com</email>
-	<name>Corvus Corax</name>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
index ba7b82fb444d..99f4cbf4b3ed 100644
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild,v 1.1 2013/03/20 23:32:20 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/simple-mtpfs/simple-mtpfs-0.1.ebuild,v 1.3 2013/03/21 22:16:18 sochotnicky Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils
+inherit autotools-utils eutils
 
 DESCRIPTION="Simple MTP fuse filesystem driver"
 HOMEPAGE="https://github.com/phatina/simple-mtpfs"
@@ -15,25 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="media-libs/libmtp
+CDEPEND="media-libs/libmtp
 		>=sys-fs/fuse-2.8"
-RDEPEND="${DEPEND}"
-
-src_prepare()
-{
-	default
-	# run autoreconf since we are running from git tag
-	eautoreconf
-}
-
-src_compile()
-{
-	# make sure we use verbose make
-	emake V=1
-}
-
-src_install()
-{
-	default
-	doman man/${PN}.1
-}
+
+DEPEND="virtual/pkgconfig
+		${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
+
+AUTOTOOLS_AUTORECONF=1
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 6ff640c42fa6..1ddd3f4b5ed1 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,2 +1,3 @@
 DIST udev-init-scripts-23.tar.bz2 4438 SHA256 38759cefae630ce7ad5ccca4e16c41da64a96f60508a9a8087ad9ff0f7de8b99 SHA512 49d7af884ba1c82889169b4710a399653c8be6a621a80266b3a9232994bce3fbe9b9360b998595617ab78f2658f77b7002584c7cfb31e794ccae0a16a1a0405b WHIRLPOOL 2a977e0bbed64bad09ea4514e00941e59b050c268b18502fbe7840ac91454ae4754cac6d20fcb479cecb1b9412a03c370b9ca69173a9ac21c18c872b927c54e6
 DIST udev-init-scripts-24.tar.bz2 4403 SHA256 1657d2db0dbe5249af865c0dc3d6b76dad6bd803d6e0674f6092621c2137b18d SHA512 f429e52504aae965650d30339ce1d0b53925e264d136afbdfa699453f0662b63de27f70c942129d52db67ff7023e3320839ed596b235a492b29e4f13fa5cdcb1 WHIRLPOOL 11a5ae54f173a2f1a76ba1f40e0769766b7c65be8f850ae2ee888968139c526143e42063635ffd496583c8627f1464ac2f60ea80f40c0c397633348ae7f7761d
+DIST udev-init-scripts-25.tar.bz2 4911 SHA256 2210a0c76b1169d136b3f7c8f8c6ca36b4546aea7e88c355c81009cf10fb9bc3 SHA512 c3b1729c309fa2a74a5887b22239451529238a646df010be685720efe24dd29f09958aac9910aac8defeebe32f427f928376ebfee4184ca88e66f171de792795 WHIRLPOOL 7eeb60031504e9418f9cfa4097634bc1da1835d06c53a3d6e9d9c85e1a8ca6f18a545c1c198528f0c88fc67690061a7f0f755ae2559856f6e60571701fd41174
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-25.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-25.ebuild
new file mode 100644
index 000000000000..e6d9d9f759cf
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-25.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-25.ebuild,v 1.1 2013/03/21 21:01:17 williamh Exp $
+
+EAPI=4
+
+inherit eutils
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
+	inherit git-2
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=virtual/udev-180
+	sys-apps/openrc
+	!<sys-fs/udev-186"
+
+src_prepare()
+{
+	epatch_user
+}
+
+pkg_postinst()
+{
+	# Add udev and udev-mount to the sysinit runlevel automatically if this is
+	# the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		if [[ -x "${ROOT}"etc/init.d/udev \
+			&& -d "${ROOT}"etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+		fi
+		if [[ -x "${ROOT}"etc/init.d/udev-mount \
+			&& -d "${ROOT}"etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev-mount \
+				"${ROOT}"etc/runlevels/sysinit/udev-mount
+		fi
+	fi
+
+	# Warn the user about adding the scripts to their sysinit runlevel
+	if [[ -e "${ROOT}"etc/runlevels/sysinit ]]
+	then
+		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev ]]
+		then
+			ewarn
+			ewarn "You need to add udev to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev sysinit"
+		fi
+		if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
+		then
+			ewarn
+			ewarn "You need to add udev-mount to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev-mount sysinit"
+		fi
+	fi
+
+	if [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 43d3a0a90c15..4324baa255e2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -4,7 +4,6 @@ DIST udev-171-gentoo-patchset-v2.tar.bz2 2961 SHA256 9a4a11f8da06337a48291fad02e
 DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253
 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
 DIST udev-197-patches-5.tar.bz2 4009 SHA256 bc497ec33de05cceb40ad23f5c64965438c747cfce5d6d26dd59e0866764da9b SHA512 5f7529c49bea5f1779dfd6e12e792c53f22a20655257e92d23b142f051bacf01ebea07ad2fd9c7c4c33be65f3fccd91024864412dbd1c707710b661aed03debd WHIRLPOOL 0ff7acf7d10202d86576713d4050ce788fc01135e7cf69b71428009b817c1e39c8f097c744dc7ecf88f411b8705fbadf82bcdd9f109744032093ce4045f05f43
-DIST udev-198-patches-1.tar.xz 1188 SHA256 caa7da013a1960c6fcb6c5b8381336ce4859f36978d29693393af0c886ffae48 SHA512 1e3778260938585abc86330964aa842542b333296cf8ff6727475d504e58017825dde7937a2d7907361426561f6295b369ec2cbe25e81063fb65b80191f479ff WHIRLPOOL fe5a148f58a69163bbfce5f611e14bebd57386d488e51304ce98e6b461f842fa23b36fc7852f2d1dd3e44c51373300a255ec20904e3f03f343784fbce8e0fa63
-DIST udev-198-patches-3.tar.xz 1912 SHA256 7d3652f1c070dec29879468ae2638f8342ca1dbccae2cc6d52dd49b473abc5a4 SHA512 b57f52d042c07421d36b114098fe3110f2144e9da385ec3d26014641b48f0a006dd17b6935205a34045450b17ba838d7fa6b3f472b1442719f86d22e3fb2545c WHIRLPOOL ba9aa0978474e8ad085077852f38d1d85eadc4d3121c666813460a0dafffcef2b7150fb7e44ad4416a737307d0f870d2ddc01f9eb1d84552e2eebcad8f3f6a13
+DIST udev-198-patches-4.tar.xz 2496 SHA256 96665cf9d491f2af7ef167278abd528c49478b3a452284f3d0284647347baea8 SHA512 261e57af4b31cba9ffa37eb660c16cbe9e5426778cc489c06245d6b6609845ca45d03b83b2e656c7e95ddf2a4f73cc64076b9414850061ff92e2c5ee49bdb65b WHIRLPOOL 3dbd720bd4abe7e9c49e7ce6e3dd0349d7e0cfb5444b4d7bd126cdeea5209998a443d0a4455bafb5a25878f457c4c517ee46c9c8808432fbedbfdd68fba695ce
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
diff --git a/sys-fs/udev/udev-198-r1.ebuild b/sys-fs/udev/udev-198-r1.ebuild
deleted file mode 100644
index ca7e06ceaa0f..000000000000
--- a/sys-fs/udev/udev-198-r1.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-198-r1.ebuild,v 1.14 2013/03/19 12:30:32 ssuominen Exp $
-
-EAPI=4
-
-# accept4() patch is only in non-live version
-if [[ ${PV} = 9999* ]]; then
-	KV_min=2.6.39
-else
-	KV_min=2.6.32
-fi
-
-inherit autotools eutils linux-info multilib systemd toolchain-funcs versionator
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
-	inherit git-2
-else
-	patchset=1
-	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
-	if [[ -n "${patchset}" ]]; then
-				SRC_URI="${SRC_URI}
-					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
-					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
-			fi
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	acl? ( sys-apps/acl )
-	gudev? ( >=dev-libs/glib-2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-12 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!<sys-apps/systemd-${PV}"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	keymap? ( dev-util/gperf )"
-
-if [[ ${PV} = 9999* ]]; then
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		dev-util/gperf
-		>=dev-util/intltool-0.50"
-fi
-
-RDEPEND="${COMMON_DEPEND}
-	openrc? ( !<sys-apps/openrc-0.9.9 )
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.97-r1
-	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-22
-	!<sys-kernel/dracut-017-r1
-	!<sys-kernel/genkernel-3.4.25
-	!<sec-policy/selinux-base-2.20120725-r10"
-
-PDEPEND=">=virtual/udev-197-r1
-	hwdb? ( >=sys-apps/hwids-20130309-r1[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-23 )"
-
-S=${WORKDIR}/systemd-${PV}
-
-udev_check_KV() {
-	if kernel_is lt ${KV_min//./ }; then
-		return 1
-	fi
-	return 0
-}
-
-check_default_rules() {
-	# Make sure there are no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	local udev_rules_md5=a3e16362de3750807b52eae9525c102c
-	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
-	MD5=${MD5/  -/}
-	if [[ ${MD5} != ${udev_rules_md5} ]]; then
-		eerror "50-udev-default.rules has been updated, please validate!"
-		eerror "md5sum: ${MD5}"
-		die "50-udev-default.rules has been updated, please validate!"
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL"
-
-	linux-info_pkg_setup
-
-	if ! udev_check_KV; then
-		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-		eerror "It must be at least ${KV_min}!"
-	fi
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	if ! udev_check_KV; then
-		eerror
-		eerror "Your running kernel version (${KV_FULL}) is too old"
-		eerror "for this version of udev."
-		eerror "You must upgrade your kernel or downgrade udev."
-	fi
-}
-
-src_prepare() {
-	if ! [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-
-		# gperf disable if keymaps are not requested wrt bug #452760
-	if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	fi
-
-	# backport some patches
-	if [[ -n "${patchset}" ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-
-	# These are missing from upstream 50-udev-default.rules
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific usb group
-	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	# Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
-	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
-	EOF
-
-	# Remove requirements for gettext and intltool wrt bug #443028
-	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
-		sed -i \
-			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
-			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
-			configure || die
-		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
-		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
-	fi
-
-	# apply user patches
-	epatch_user
-
-	# compile with older versions of gcc #451110
-	version_is_at_least 4.6 $(gcc-version) || \
-		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
-
-	# change rules back to group uucp instead of dialout for now wrt #454556
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	if [[ ! -e configure ]]; then
-		if use doc; then
-			gtkdocize --docdir docs || die "gtkdocize failed"
-		else
-			echo 'EXTRA_DIST =' > docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		check_default_rules
-		elibtoolize
-	fi
-
-	if ! use elibc_glibc; then #443030
-		echo '#define secure_getenv(x) NULL' >> config.h.in
-		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
-	fi
-
-	# link udevd(8) to systemd-udevd.service(8) manpage
-	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
-}
-
-src_configure() {
-	use keymap || export ac_cv_path_GPERF=true #452760
-
-	local econf_args
-
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--bindir=/bin
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-html-dir=/usr/share/doc/${PF}/html
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
-		--with-bashcompletiondir=/usr/share/bash-completion
-		--without-python
-		--disable-audit
-		--disable-coredump
-		--disable-hostnamed
-		--disable-ima
-		--disable-libcryptsetup
-		--disable-localed
-		--disable-logind
-		--disable-myhostname
-		--disable-nls
-		--disable-pam
-		--disable-quotacheck
-		--disable-readahead
-		--enable-split-usr
-		--disable-tcpwrap
-		--disable-timedated
-		--disable-xz
-		--disable-silent-rules
-		--disable-polkit
-		$(use_enable acl)
-		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable keymap)
-		$(use_enable kmod)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-	)
-	if use introspection; then
-		econf_args+=(
-			--enable-introspection=$(usex introspection)
-		)
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_compile() {
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		systemd-udevd
-		udevadm
-		libudev.la
-		ata_id
-		cdrom_id
-		collect
-		scsi_id
-		v4l_id
-		accelerometer
-		mtd_probe
-		man/udev.7
-		man/udevadm.8
-		man/systemd-udevd.8
-		man/systemd-udevd.service.8
-	)
-	use keymap && targets+=( keymap )
-	use gudev && targets+=( libgudev-1.0.la )
-
-	emake "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev
-		use gudev && emake -C docs/gudev
-	fi
-}
-
-src_install() {
-	local lib_LTLIBRARIES="libudev.la" \
-		pkgconfiglib_DATA="src/libudev/libudev.pc"
-
-	local targets=(
-		install-libLTLIBRARIES
-		install-includeHEADERS
-		install-libgudev_includeHEADERS
-		install-binPROGRAMS
-		install-rootlibexecPROGRAMS
-		install-udevlibexecPROGRAMS
-		install-dist_systemunitDATA
-		install-dist_udevconfDATA
-		install-dist_udevhomeSCRIPTS
-		install-dist_udevkeymapDATA
-		install-dist_udevkeymapforcerelDATA
-		install-dist_udevrulesDATA
-		install-girDATA
-		install-man3
-		install-man7
-		install-man8
-		install-nodist_systemunitDATA
-		install-pkgconfiglibDATA
-		install-sharepkgconfigDATA
-		install-typelibsDATA
-		install-dist_docDATA
-		libudev-install-hook
-		install-directories-hook
-		install-dist_bashcompletionDATA
-	)
-
-	if use gudev; then
-		lib_LTLIBRARIES+=" libgudev-1.0.la"
-		pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-	fi
-
-	# add final values of variables:
-	targets+=(
-		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
-		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/udev.7 man/udevadm.8 \
-				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
-		dist_systemunit_DATA="units/systemd-udevd-control.socket \
-				units/systemd-udevd-kernel.socket"
-		nodist_systemunit_DATA="units/systemd-udevd.service \
-				units/systemd-udev-trigger.service \
-				units/systemd-udev-settle.service"
-		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
-		systemunitdir="$(systemd_get_unitdir)"
-		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
-				$(sysconfdir)/udev/hwdb.d'
-		dist_bashcompletion_DATA="shell-completion/bash/udevadm"
-	)
-	emake -j1 DESTDIR="${D}" "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev DESTDIR="${D}" install
-		use gudev && emake -C docs/gudev DESTDIR="${D}" install
-	fi
-	dodoc TODO
-
-	prune_libtool_files --all
-	rm -f "${D}"/lib/udev/rules.d/99-systemd.rules
-	rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.*
-
-	# install gentoo-specific rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-
-	# install udevadm symlink
-	dosym ../bin/udevadm /sbin/udevadm
-
-	# move udevd where it should be and remove unlogical /lib/systemd
-	mv "${ED}"/lib/systemd/systemd-udevd "${ED}"/sbin/udevd || die
-	rm -r "${ED}"/lib/systemd
-
-	# install compability symlink for systemd and initramfs tools
-	dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
-	find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
-		sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
-
-	# see src_prepare() where this is created
-	doman "${T}"/udevd.8
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-}
-
-# This function determines if a directory is a mount point.
-# It was lifted from dracut.
-ismounted() {
-	while read a m a; do
-		[[ $m = $1 ]] && return 0
-	done < "${ROOT}"/proc/mounts
-	return 1
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT}"dev/loop 2>/dev/null
-	if [[ -d ${ROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# 64-device-mapper.rules is related to sys-fs/device-mapper which we block
-	# in favor of sys-fs/lvm2
-	old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
-	if [[ -f ${old_dm_rules} ]]; then
-		rm -f "${old_dm_rules}"
-		einfo "Removed unneeded file ${old_dm_rules}"
-	fi
-
-	if ismounted /usr; then
-		ewarn
-		ewarn "Your system has /usr on a separate partition. This means"
-		ewarn "you will need to use an initramfs to pre-mount /usr before"
-		ewarn "udev runs."
-		ewarn
-		ewarn "If this is not set up before your next reboot, udev may work;"
-		ewarn "However, you also may experience failures which are very"
-		ewarn "difficult to troubleshoot."
-		ewarn
-		ewarn "For a more detailed explanation, see the following URL:"
-		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
-		ewarn
-		ewarn "For more information on setting up an initramfs, see the"
-		ewarn "following URL:"
-		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
-	fi
-
-	local fstab="${ROOT}"etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, http://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT}usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	if [[ -f ${old_net_name} ]]; then
-		local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32
-		MD5=$(md5sum < "${old_net_name}")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} == ${old_net_sum} ]]; then
-			ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable"
-			ewarn "the new predictable network interface naming."
-			rm -f "${old_net_name}"
-		fi
-	fi
-
-	local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	if has_version sys-apps/biosdevname; then
-		ewarn
-		ewarn "You have sys-apps/biosdevname installed which has been deprecated"
-		ewarn "in favor of the predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "The new predictable network interface names are used by default, see:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "Example command to get the information for the new interface name before booting"
-	ewarn "(replace ifname with, for example, eth0):"
-	ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if use hwdb && has_version sys-apps/hwids; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-fs/udev/udev-198-r2.ebuild b/sys-fs/udev/udev-198-r3.ebuild
similarity index 99%
rename from sys-fs/udev/udev-198-r2.ebuild
rename to sys-fs/udev/udev-198-r3.ebuild
index 51707fb8849f..51efc30c37f4 100644
--- a/sys-fs/udev/udev-198-r2.ebuild
+++ b/sys-fs/udev/udev-198-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-198-r2.ebuild,v 1.1 2013/03/20 05:42:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-198-r3.ebuild,v 1.1 2013/03/21 23:02:35 ssuominen Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
 	inherit git-2
 else
-	patchset=3
+	patchset=4
 	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
 	if [[ -n "${patchset}" ]]; then
 				SRC_URI="${SRC_URI}
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 86bbaa379275..adeb5bc4a07d 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -13,6 +13,8 @@ DIST genpatches-3.7-14.base.tar.xz 225800 SHA256 08b64adbcfa825e50bad2fe78d93fb1
 DIST genpatches-3.7-14.extras.tar.xz 16572 SHA256 262c89233ec3ebfb5c0729529993cb4821b38992878f551965b2b14c1b1b131a SHA512 b91d228200957a36e39b99f18ebde3396abecbdfadc7d281278cf91d1699d8eb3fdd9376aa6b8b56756d66b44d48470d376922fe6a61ac4e3c13f3d4ee305c4f WHIRLPOOL 9657eca89d9f874dbc5f45aa688756cd5a280bae0325476990bbcdcf00f42307d1bca25e0864abac448d36aaacf1ed68954348a29c6f04342a24c80ead778a33
 DIST genpatches-3.8-6.base.tar.xz 121148 SHA256 f80c3471a59ed925da62d640878e0c23273b5f41924218f0d9b0ee11dedfcb00 SHA512 a26f6b9c3afc1a43f82f40122ff94f04f5641e3b67a1bc66123c24297587b4becd673d391530e957c157f11772cd393b3fc939ead257fd9c7fec322d73c9c1e7 WHIRLPOOL bbd8ca38a47306ba56e089d5d20a34f664f4f6bdc75bc3df45f07b39c9d39779720574b5a7ed5afaaa3ab63d2b00848a924deffc25215448d4d502124249685d
 DIST genpatches-3.8-6.extras.tar.xz 16568 SHA256 2ea61060a1525c4a8572af0b8258b222e84cc7fdc538b1b71b29784cea0dd424 SHA512 3601f4e2e5f428a18615a7b8f6c6ce00a8cc6476cb7a0d39665e66e2f49b89f091ec28ac01c6c1e288f68da1dedb23c64dec7bc1d93892e84350bdb83039fbc6 WHIRLPOOL 24d54663df1423f3110011d335d1128b55622daa306d70e6a010b42bb1859e5b479c8766f39e3a467096db6fcef08b37885f0d1d6e8fff2c58d5f31dfb593a4e
+DIST genpatches-3.8-7.base.tar.xz 141664 SHA256 5c6e0eaa2f01311c926780b59553deb36ce0eaf1832a8725045f1c9681bab077 SHA512 05e93edf8220f7159dbb807bc93c12c4c778cac660d6fb54ad41e5bcf7474d2daf7ac63f7d76bb81740a717188b8551018d7fb2227f8d91e66038a9d062c4798 WHIRLPOOL ce71cebd7b56abba67843feb389ee172b3d154d863c0b8590de30ed55b56d9d848310c7b2e2ff3eaef08d65e0903429476a91049a5873d7ceee44fbe89503474
+DIST genpatches-3.8-7.extras.tar.xz 16568 SHA256 2ea61060a1525c4a8572af0b8258b222e84cc7fdc538b1b71b29784cea0dd424 SHA512 3601f4e2e5f428a18615a7b8f6c6ce00a8cc6476cb7a0d39665e66e2f49b89f091ec28ac01c6c1e288f68da1dedb23c64dec7bc1d93892e84350bdb83039fbc6 WHIRLPOOL 24d54663df1423f3110011d335d1128b55622daa306d70e6a010b42bb1859e5b479c8766f39e3a467096db6fcef08b37885f0d1d6e8fff2c58d5f31dfb593a4e
 DIST linux-3.6.tar.xz 68667080 SHA256 4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f SHA512 6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1 WHIRLPOOL 50b16de4f099e411cfc1f920f3bec57a624b3b336bb3970dcd8fffc0ba8d6ad749a36d2f6609eeca264c137e196885dcb35ab5fdeeb9b576ef216bebdc2ad028
 DIST linux-3.7.tar.xz 69736096 SHA256 60a64d0bf76eeec3355f115c577935757b84629c8c129ce5b8bb02075f6b9458 SHA512 91d65d658e9b6d0c0f03533e631ef1cc46c79ec5c1425a0914e1fe97ac4069230ee2f7d947df5cf76dd8865eb78f149d46140a3ec6509de21094ef70f27f6f61 WHIRLPOOL db9d25f5a479fef45808e85fdac9e72e5508cb94358e012f522ad5dce4b4777811ce57fd33649704400f54592c4dc3306b0099eb85fca60dd9544b8fd918ca1d
 DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.4.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.4.ebuild
new file mode 100644
index 000000000000..37010df60471
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.8.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.8.4.ebuild,v 1.1 2013/03/21 12:25:50 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2 eutils
+detect_version
+detect_arch
+
+AUFS_VERSION=3.8_p20130318
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.8 > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob module proc"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}"
+
+UNIPATCH_LIST="
+	"${WORKDIR}"/aufs3-kbuild.patch
+	"${WORKDIR}"/aufs3-base.patch"
+
+PDEPEND=">=sys-fs/aufs-util-3.8"
+
+src_unpack() {
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch"
+	unpack ${AUFS_TARBALL}
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	if ! use proc; then
+		sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die
+	cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -ri "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util && \
+		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 665547f94416..a8b2a3b106cb 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -18,12 +18,18 @@ DIST genpatches-3.0-26.base.tar.xz 618332 SHA256 073c6989068541a86c47399d14ebb3e
 DIST genpatches-3.0-26.extras.tar.xz 16752 SHA256 e81cef2badd9e097073df7ff3c3b6427a7e37366c62a137e89415dee233a86cf SHA512 83ba21d4b2387187eb0c09b7a92ec5e9f6613ebe85f893559eb105acade1f5bd1db6cc99a2c5f71f64afa46b1dc9623408af06a52dd92e7bd6beca1bf28d9b31 WHIRLPOOL 20b1f9a9e33948eb052b2be99fa7e00680fb45d7b837ba5564c81c2c4dc188c905aebaa4db149430c3f5ba4da43384f33285a3e891866c5581547e318c8554f9
 DIST genpatches-3.0-40.base.tar.xz 892600 SHA256 dcc4ac742bb4c76ff8d698a915240f26195f4a7d615d106bde1e7202de2bbb01 SHA512 4a3ef7bbbc7b49bcef5a308a3beaa0f6c4f8ce80f64d125eaceb25d8b6148a28a9618e87b976be79d2d83c2c94404faadbcf4e12d375a4d69b34fb11565d24b6 WHIRLPOOL d0b9df920835bc3b59baa6887ae815a24f87c22ed02284c44b32f5ae16b0a30bc108dc7060ce08c41fcd3dd81991087b9e951ee1c1d72b94c0a97b5361311760
 DIST genpatches-3.0-40.extras.tar.xz 16760 SHA256 f41f09a944b08d354dc286c3b0775a1adac62fc4ce74b29c9a3c77768b88b79f SHA512 2bab6415b7cc12de7b40c686290f53baa22026e29d5ed4075dd1ed9e60e4ebdf65425c0cdbeed49d8a21f02a4461717e520c42052debbe57cacfedcfd0bac406 WHIRLPOOL 834881583d5732a9c1aaff4c9c3db0fa2600bf56aa494399b6d2c34c4eec9f1f8f854f728d680c5ec252c9dfb26f8cf42c066505f2df46ed6e2a3541ff44bbaf
+DIST genpatches-3.0-41.base.tar.xz 898248 SHA256 a6c52e3ffe96c406a0329c82173fce24870685eb47f30fcbbbc4140d2acd09c3 SHA512 c1dfbacd549bcefe771cd0ef38a7e6781b57d1340d1555e4693250d4e850ee259f5ffd958c25b94535832179e3d56e3e3f97d4231f292dbdace172e74689b56f WHIRLPOOL 20eab178084a3128554b85205186a9e675c1c054ef5a80a778886f98f0ac6081a3cd9749c52d5c1c8269653ce65447f309b621f323ae2bd2a5e0001df6615066
+DIST genpatches-3.0-41.extras.tar.xz 16760 SHA256 f41f09a944b08d354dc286c3b0775a1adac62fc4ce74b29c9a3c77768b88b79f SHA512 2bab6415b7cc12de7b40c686290f53baa22026e29d5ed4075dd1ed9e60e4ebdf65425c0cdbeed49d8a21f02a4461717e520c42052debbe57cacfedcfd0bac406 WHIRLPOOL 834881583d5732a9c1aaff4c9c3db0fa2600bf56aa494399b6d2c34c4eec9f1f8f854f728d680c5ec252c9dfb26f8cf42c066505f2df46ed6e2a3541ff44bbaf
 DIST genpatches-3.2-20.base.tar.xz 867844 SHA256 d2574f94a5fa86b48481c2359ef09a19d30386539f1c61e72e6e1ae1fa32267c SHA512 128d15c45502ff20843ff52c75d22869938d02e58bff8b5a69b5e98f6215c871345a9db8bffef80b666f80b8d23a9cc631d836dca464629abbda05b45f1a901f WHIRLPOOL 2f5625228c5cb99e93a24b28099b892dfe261fc7a4210e4d8d7f974fd0d35b19375646c3a9bcefbf13cf76f3f3ab72c88215977a70116530db2be08c7a0e8291
 DIST genpatches-3.2-20.extras.tar.xz 16756 SHA256 6752561737f91846822fb43507743f30693622cec84b2974c3b2a537ca20db72 SHA512 e5965a1b33995ddf431768551c4118a2340101210c34ff24c571e635e1ddf61cc2b5dbcb9049e0d0492727c90b8797aa2de0b29544597c8db574ff56cf35ea8a WHIRLPOOL 14d09ca9cddbf4285cb7be83f3f06ce733a2d4664b2a1ef5f0a7c461941237e99959ea18918b5df7cae5793ff36cfc2368945f7f15cf183e1bcbfc76e17a9b4d
+DIST genpatches-3.2-21.base.tar.xz 885848 SHA256 018706f2a21051bb7cf8aa4c534bf091d5c15310ecce239c004b0fbe7e7933be SHA512 882ec736dcf101b2458124f9544f0fc2a4ee60a3b37ba4bc62ef44562d84a607993ff5b56b6510a2591a456957a67bdf5c4cbc4734688c5f44a97eb1d5df1124 WHIRLPOOL a9072adef22310db4a982bd0977a1a7c6a1408dcc0517972eabb04dcd30a0ab233b698513cc3e22e661e42793760fa7e92b366457380f4572aef746795985e78
+DIST genpatches-3.2-21.extras.tar.xz 16756 SHA256 6752561737f91846822fb43507743f30693622cec84b2974c3b2a537ca20db72 SHA512 e5965a1b33995ddf431768551c4118a2340101210c34ff24c571e635e1ddf61cc2b5dbcb9049e0d0492727c90b8797aa2de0b29544597c8db574ff56cf35ea8a WHIRLPOOL 14d09ca9cddbf4285cb7be83f3f06ce733a2d4664b2a1ef5f0a7c461941237e99959ea18918b5df7cae5793ff36cfc2368945f7f15cf183e1bcbfc76e17a9b4d
 DIST genpatches-3.4-16.base.tar.xz 595712 SHA256 2ab1ab760630bb040f5bc560c470115c7333e359a6593b93ad0d9a0f060a8620 SHA512 0958e1b40b737e333a7cd03f8bcefb7d727c060115bfa6c812a88f6249084396a8ade6dad38d238cc5650042ca97ee45b0a2b3af65625746f67f5867a9768c70 WHIRLPOOL 0b2681a99c693509d721a2b862f8a45099f6b2a80f25bbd29c7fff7e4eb2c28c7f8214117da4737b417469261aef7dd021a4b540d319745c39ca7e030e9a5594
 DIST genpatches-3.4-16.extras.tar.xz 16992 SHA256 1f06fd131f6c69ae7d6900c9404de4bf87793cad4d9f693e7094d4e2d74ae342 SHA512 444660569084827bf816dc8c91016c29fd1f694ca621c20eafe4f9e39a9b5f4cdd1a241e9bae72919622f917b6e63dcc3ce958035706a73e2fef343535362588 WHIRLPOOL 519a34f1b9a04ad36d6f811f83285f8a8bcb4f4c78ae109e55c3289967e057b58e2572cae229ce923f9883a0cb0915774e46752e06fde7dad136ebdbe4c531ef
 DIST genpatches-3.4-18.base.tar.xz 614500 SHA256 c7e8cfbe10188ae8e5d7619d31508465c3dda1b5b03d4aa2cf512a368d21b6ec SHA512 28318d0c94464284fd19d0f3de7c0abd2522ccfd4ff761b0b15fc5d76fc5e4fd3cde32697c8d5ae94989fac73e284f182609c280f2b2138c09de99afe5c58918 WHIRLPOOL f7d3b60f0a8867c65b0e7d9f6928deed51542eef0600ab8aeed6cc201280a8d3238eb220eb5b01267ed06a20bc014f428187c112d1863f853e511ee5af15009d
 DIST genpatches-3.4-18.extras.tar.xz 16992 SHA256 1f06fd131f6c69ae7d6900c9404de4bf87793cad4d9f693e7094d4e2d74ae342 SHA512 444660569084827bf816dc8c91016c29fd1f694ca621c20eafe4f9e39a9b5f4cdd1a241e9bae72919622f917b6e63dcc3ce958035706a73e2fef343535362588 WHIRLPOOL 519a34f1b9a04ad36d6f811f83285f8a8bcb4f4c78ae109e55c3289967e057b58e2572cae229ce923f9883a0cb0915774e46752e06fde7dad136ebdbe4c531ef
+DIST genpatches-3.4-19.base.tar.xz 622284 SHA256 4dfd045a0e96a0cef3f54b6eae74f31b3219cd4e5082c7bfcfc662d4bee42aca SHA512 61eb861643e182bda6c34a7fac0f59bfc1b7a35d3c2f01b2ba8c13a4f61ddce1aed7911bb9c7902e185a98af3f57b80c74e3eeba6b3ef75deb312de83e13cff6 WHIRLPOOL 795a36730ad0bb955ae6795252ed3d0666bab0184e678616cfd07344f0f39e8117f9ed48c3410e8927904855ee452b68088b1f33748f89e78b44169920760e24
+DIST genpatches-3.4-19.extras.tar.xz 16992 SHA256 1f06fd131f6c69ae7d6900c9404de4bf87793cad4d9f693e7094d4e2d74ae342 SHA512 444660569084827bf816dc8c91016c29fd1f694ca621c20eafe4f9e39a9b5f4cdd1a241e9bae72919622f917b6e63dcc3ce958035706a73e2fef343535362588 WHIRLPOOL 519a34f1b9a04ad36d6f811f83285f8a8bcb4f4c78ae109e55c3289967e057b58e2572cae229ce923f9883a0cb0915774e46752e06fde7dad136ebdbe4c531ef
 DIST genpatches-3.5-8.base.tar.xz 245060 SHA256 2af67e97d43b60b17c036701cf8299417f0743c5df75efc50fbc5e820d448d81 SHA512 6c5e560d946ebdf4b209f47b4ea17d2ba47c53f159cb4cc595e1255bd505b651d9aa1a6c608b9dbbb0bae80305f09a835d1369b8f9ef9f426eabd0506d893fff WHIRLPOOL ce243ae97e78848dd5cf6e98a58dc5ec739a0de0feb0de31f78ec734be574170e69e4ca2ab369f24d75cf8635f49d09d275c4bf9a67b11326e4e33048480559e
 DIST genpatches-3.5-8.extras.tar.xz 17000 SHA256 44dc558cf558f24f00d2df612b367d7038e506199a234cfa689353bd8eef3dca SHA512 eacbd4a9c980f2bf2acb5fb89da4fe37c6e291076edfc23641bd8c2acc2fb35a5c6312bb52fe7500ffadf474053e1e85fc22192eb55fcef35889c9dec5be1a8f WHIRLPOOL 999855d4b37f4bbaab1f601896fd579128208ef31a05b15630db41489a90df8d9d80b6928111351f179c91704d066e75c39b4996d1e6bb03f2ccbdca244aeb2b
 DIST genpatches-3.6-12.base.tar.xz 233392 SHA256 74f5d3cbfef1f7bb165b800f7ece523b1bbd5b59f47837716fd4577c0d659da9 SHA512 15e2a18c9b18776ad308628e3f9ef6789148a7ad93d95c7d37bf6eb21ce6c465532b9c4465bc51deca922891d5df5dbf6b230db5802a14261208dc5376b992c5 WHIRLPOOL 4a715a29fe57c92f10a12e3c03c3e85cb45b71a015a4ff6d2205f447f9b347e2511aefe94cdc21d20c7281adac72c17f906f78cf145d030557e970ca45afc487
@@ -36,6 +42,8 @@ DIST genpatches-3.7-14.base.tar.xz 225800 SHA256 08b64adbcfa825e50bad2fe78d93fb1
 DIST genpatches-3.7-14.extras.tar.xz 16572 SHA256 262c89233ec3ebfb5c0729529993cb4821b38992878f551965b2b14c1b1b131a SHA512 b91d228200957a36e39b99f18ebde3396abecbdfadc7d281278cf91d1699d8eb3fdd9376aa6b8b56756d66b44d48470d376922fe6a61ac4e3c13f3d4ee305c4f WHIRLPOOL 9657eca89d9f874dbc5f45aa688756cd5a280bae0325476990bbcdcf00f42307d1bca25e0864abac448d36aaacf1ed68954348a29c6f04342a24c80ead778a33
 DIST genpatches-3.8-6.base.tar.xz 121148 SHA256 f80c3471a59ed925da62d640878e0c23273b5f41924218f0d9b0ee11dedfcb00 SHA512 a26f6b9c3afc1a43f82f40122ff94f04f5641e3b67a1bc66123c24297587b4becd673d391530e957c157f11772cd393b3fc939ead257fd9c7fec322d73c9c1e7 WHIRLPOOL bbd8ca38a47306ba56e089d5d20a34f664f4f6bdc75bc3df45f07b39c9d39779720574b5a7ed5afaaa3ab63d2b00848a924deffc25215448d4d502124249685d
 DIST genpatches-3.8-6.extras.tar.xz 16568 SHA256 2ea61060a1525c4a8572af0b8258b222e84cc7fdc538b1b71b29784cea0dd424 SHA512 3601f4e2e5f428a18615a7b8f6c6ce00a8cc6476cb7a0d39665e66e2f49b89f091ec28ac01c6c1e288f68da1dedb23c64dec7bc1d93892e84350bdb83039fbc6 WHIRLPOOL 24d54663df1423f3110011d335d1128b55622daa306d70e6a010b42bb1859e5b479c8766f39e3a467096db6fcef08b37885f0d1d6e8fff2c58d5f31dfb593a4e
+DIST genpatches-3.8-7.base.tar.xz 141664 SHA256 5c6e0eaa2f01311c926780b59553deb36ce0eaf1832a8725045f1c9681bab077 SHA512 05e93edf8220f7159dbb807bc93c12c4c778cac660d6fb54ad41e5bcf7474d2daf7ac63f7d76bb81740a717188b8551018d7fb2227f8d91e66038a9d062c4798 WHIRLPOOL ce71cebd7b56abba67843feb389ee172b3d154d863c0b8590de30ed55b56d9d848310c7b2e2ff3eaef08d65e0903429476a91049a5873d7ceee44fbe89503474
+DIST genpatches-3.8-7.extras.tar.xz 16568 SHA256 2ea61060a1525c4a8572af0b8258b222e84cc7fdc538b1b71b29784cea0dd424 SHA512 3601f4e2e5f428a18615a7b8f6c6ce00a8cc6476cb7a0d39665e66e2f49b89f091ec28ac01c6c1e288f68da1dedb23c64dec7bc1d93892e84350bdb83039fbc6 WHIRLPOOL 24d54663df1423f3110011d335d1128b55622daa306d70e6a010b42bb1859e5b479c8766f39e3a467096db6fcef08b37885f0d1d6e8fff2c58d5f31dfb593a4e
 DIST linux-3.0.tar.xz 63798008 SHA256 ef5e8c2dedb20a6eab01bb379e9982cd7d47cf95bd87c9ee3e872272e85c24b6 SHA512 d1ce2369a8f6d73043b7cd992c47953c227afa591bca31e8d5ae8a549052cc2f70c035382332335ae9cf6af2d183cc88c3a41e7f0a582c7f493b8022f82816f5 WHIRLPOOL 0ea5069df287b2d86f148b59f38193ec40d5add585213bfac3efe4aa9e250ecea96017d9c54be6004894106049eac5e8fbef1d8605fd39441795d0c88c96a1c3
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.70.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.70.ebuild
new file mode 100644
index 000000000000..39ede68bd952
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.0.70.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.70.ebuild,v 1.1 2013/03/21 10:48:20 tomwij Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="41"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.41.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.41.ebuild
new file mode 100644
index 000000000000..21c63c194286
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.2.41.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.2.41.ebuild,v 1.1 2013/03/21 10:48:20 tomwij Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="21"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.37.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.37.ebuild
new file mode 100644
index 000000000000..e42b757cda27
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.37.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.4.37.ebuild,v 1.1 2013/03/21 10:48:20 tomwij Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="19"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.8.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.8.4.ebuild
new file mode 100644
index 000000000000..3bd10c6f1dfe
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.8.4.ebuild,v 1.1 2013/03/21 10:48:20 tomwij Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index f2bd7edaf946..6816453d77a7 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -18,7 +18,11 @@ DIST linux-3.7.tar.xz 69736096 SHA256 60a64d0bf76eeec3355f115c577935757b84629c8c
 DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
 DIST patch-2.6.32.60.xz 922192 SHA256 495accb613e5569ffe71a1f7483af7da294153f111fc49611e0291a28767ddc7 SHA512 71a0b4f24a60c68856154beb1e074055d017aeb4f933d317768bff70fb4df3c0766e0fb2fff686c1f1197e80d2ccf5b4e9cf7f355d39944799f3ede279e2b027 WHIRLPOOL 89a6ff1a43f91696a407e1681a9c6d3166fdf55dc23e1d7d5d3187da3a70d11c4c82a3fb728c3920214e0f117a2f79fcb05922a5ace707a3c515cee9cb8934fa
 DIST patch-3.0.69.xz 814784 SHA256 c09ab9b9a1b5de6f070cffe39b23d96b34d9dc4d0753b308eb6baf7601f342a7 SHA512 d5bd1ca85051953da9afd1a632c67adeaa2161ca3231ab815b742cd4024f0d709e2dac85a1396960cf488753d69433b236fe49dc254ddb04fc893dfcc17cbfc7 WHIRLPOOL 0644b8a6aa568374f2f45f9d6cd272aa72bdfba8aecec704261c80f4e166adda6d0e2eea996d250d6aa0212cb0dfd31f075fa14abb422278abba34913fc92198
+DIST patch-3.0.70.xz 818224 SHA256 0b3d05efbdcb7661b18732fd690c2c569e3ccc477fdd6c296f527f19a2a2bc33 SHA512 81380d2bdd25e7d16a81c18df0cffa165f1e1b87fb3dd04e4087909548dcb53456ce89ca8666ffc0f39136fa98a4a838597ec170cd745d0eeec8b9fb21fe4741 WHIRLPOOL 2db0964273944c0c4e3aa91f7ee90cd9fba4b3f36a5c28ba3ecc11696615a9a7bc115d72ba6029c1785c6c5d05626c5c292408bdf1cdeb9e44a4f0196c6ea561
 DIST patch-3.2.40.xz 796532 SHA256 0a246f95049ac45d91416ee978085a3afbed9dd824074bb3dc84ff2574330f4c SHA512 1a88040649bbfe2cdc23d19f1c9982d5fd46a55c66cb3bfc5f4c76582cfdab4512fdc639342acd6fd255cc6ef531fa4532a2089fe772089ea2242a3731f1accc WHIRLPOOL 78282e8b7d569d2f13d8192ce8c43e9f175f09073c506761e74cf6d272c26b87a39e5fbfc76290bca3b0c44c5aec5aeb627c7f607cec18a35b71d7d0ff074da0
+DIST patch-3.2.41.xz 812672 SHA256 3fa06e19bfe7c32afd0684eaa824b77c0ad5fc9b84448905149f2466e638f1c1 SHA512 a0dbdad1a06cbb65ff109a813cdde789d4266ae088d8b3e90071fddea3699070dde21fe0e0ea3368d868df5d72656d66cdb1336b5e3dd57e4c0a17a47d8f5ad4 WHIRLPOOL 6c9ef215c67da8b5fdf6276891f42284715a325155d7cc41d5ce0a35d825c9e5e21b7bf7f3f976e4523f5ea204184b817d50d76dff42370b7521f3f750f5fa96
 DIST patch-3.4.36.xz 575512 SHA256 0b4023d7bea8721e4a1e1e6139ace925a035ca12bf7c595f7e550063c9ed602c SHA512 34bdcdfb51a56f75c156439197608928d9ea3484ce58da2e8905d4eccc3c5af9b5a88d76adb4a4c0192c5372a00b8aca5b9c3de80205fffdc2b9f9c82a584987 WHIRLPOOL bd10aae4bd1b6d69cd4a2318657e5f572263939b8971cef0b72b748b7c08c91ae653c06fa3703bd793e49b730a83bdbae5a04856a3f554253208489d43f48fce
+DIST patch-3.4.37.xz 581156 SHA256 4f2472a6612283107a9642e43f151383b6e0b58e3c55f0da7b892ecb1f5abef5 SHA512 f564365747030f1ee0777d4d41dd8d417b8eade7de9ce880dcc15c5921fa0fa7d0a63d3ef580c029cd34f56c674c25f0ffe222d10c3c01a5cf80b423e9ea6581 WHIRLPOOL 1c1a8ccea71cf2747869a5567ac1d23f86aedb4ac47473632b0e6729d93d0ca1148d614a022e452030c81bd053b6a52a0183bfb9e9f6666a0c8fe6bfa7810f81
 DIST patch-3.7.10.xz 212936 SHA256 e5db8a0f0fb0a7ad466b4673489c1a438fe7e6482203e34702e7180d6e2e515a SHA512 939e3290a0e3bc19c519ca05181f673bffc745aa69456b51872c5ea718b64c250dac6926b07f1a195f87ee4aab67c01f7bc746d8bfb9201a983937c12c72823d WHIRLPOOL cdc62c7fe819328356678c85eb6939d1b6281f8b8ceb684e7c7794ea0215f6acfc31f34126f3333c1d7dd982faed5aeebd24d2a1efcd5b3dd99e86a6b281435e
 DIST patch-3.8.3.xz 114028 SHA256 02b70097dcfbce05ccbfbd5fae6449a811b26a776f89d3c2fdd155b7d086ea82 SHA512 14c4ffe8da8024ec77b16b21e959453c84b3693027a1746533c03dac74e4f8f8d1b385d9e697207cbb701a7a60aa1950d44e02dde9f3a964d4b49467cb07f0be WHIRLPOOL 5390f9f0e39ba14faaf77dc4e4aa1479626757d1b9efbfeec38c6be148b30bd19bb04143c7036e851f9532188ffdf3befde836ff6ee03d9830838201ffe32923
+DIST patch-3.8.4.xz 133152 SHA256 6609b846a01fc4e03ec1f12c6e965297d42e18b3fd13a1dfb0b2f68d18e7e204 SHA512 3a3476c62535286c294ab1dfc3c6e7cd46ba08bd598a53cc185452a4ad8b0f0ed39c53f1cf28a2c5ae391fb418fac99e89d9211f33bb270e359c2561b7733b3c WHIRLPOOL 920eff50c32cbb8194d85f6aa19d135cefc0ca8b86e672d40dc2c05394c550ec8956011a6f9706f4a27b0ad83547e65122c1c411e94c9decaf92fe3d5e611d6b
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.70.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.70.ebuild
new file mode 100644
index 000000000000..893fb37c65e8
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.0.70.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.0.70.ebuild,v 1.1 2013/03/21 21:23:11 ago Exp $
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.41.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.41.ebuild
new file mode 100644
index 000000000000..3718448ce48e
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.41.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.41.ebuild,v 1.1 2013/03/21 21:23:11 ago Exp $
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.4.37.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.37.ebuild
new file mode 100644
index 000000000000..9336468f2651
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.4.37.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.4.37.ebuild,v 1.1 2013/03/21 21:23:11 ago Exp $
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.8.4.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.8.4.ebuild
new file mode 100644
index 000000000000..bcde567c435c
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.8.4.ebuild,v 1.1 2013/03/21 21:23:11 ago Exp $
+
+EAPI="5"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch b/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
new file mode 100644
index 000000000000..850e010bc17c
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
@@ -0,0 +1,30 @@
+From 232d70155c45d24afabe47ed37954cc000678295 Mon Sep 17 00:00:00 2001
+From: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date: Wed, 20 Mar 2013 16:51:14 +0000
+Subject: Find hidraw devices correctly with systemd udev >= v196.
+
+udev v196 libraries changed behaviour of g_udev_device_get_sysfs_attr()
+by stopping following symlinks for "device" attribute [1]. That change
+broke hiddev finding for unifying devices. Fix that by getting sysfs
+path from parent hiddev device.
+
+1. http://cgit.freedesktop.org/systemd/systemd/commit/?id=5ae18ddc0d86673520c0dd6b59ccac8afc8aa605
+
+Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/linux/up-device-unifying.c b/src/linux/up-device-unifying.c
+index c7f0103..4b659c3 100644
+--- a/src/linux/up-device-unifying.c
++++ b/src/linux/up-device-unifying.c
+@@ -165,7 +165,7 @@ up_device_unifying_coldplug (UpDevice *device)
+ 	hidraw_list = g_udev_client_query_by_subsystem (client, "hidraw");
+ 	for (l = hidraw_list; l != NULL; l = l->next) {
+ 		if (g_strcmp0 (g_udev_device_get_sysfs_path (parent),
+-			       g_udev_device_get_sysfs_attr (l->data, "device")) == 0) {
++			       g_udev_device_get_sysfs_path(g_udev_device_get_parent(l->data))) == 0) {
+ 			receiver = g_object_ref (l->data);
+ 			break;
+ 		}
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/upower-0.9.20-r2.ebuild b/sys-power/upower/upower-0.9.20-r2.ebuild
new file mode 100644
index 000000000000..b1f42a79bd01
--- /dev/null
+++ b/sys-power/upower/upower-0.9.20-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.20-r2.ebuild,v 1.1 2013/03/21 17:59:52 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+deprecated doc +introspection ios kernel_FreeBSD kernel_linux systemd"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.22
+	sys-apps/dbus
+	>=sys-auth/polkit-0.110
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? (
+		virtual/libusb:1
+		>=virtual/udev-197[gudev]
+		ios? (
+			>=app-pda/libimobiledevice-1
+			>=app-pda/libplist-1
+			)
+		systemd? ( sys-apps/systemd )
+		)"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		deprecated? ( >=sys-power/pm-utils-1.4.1 )
+		systemd? ( app-shells/bash )
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+REQUIRED_USE="kernel_linux? ( !deprecated? ( systemd ) )"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	epatch "${FILESDIR}"/${P}-hidraw_with_udev-196.patch
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+		myconf="$(use_enable deprecated)"
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable introspection) \
+		--disable-static \
+		${myconf} \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		--disable-tests \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-backend=${backend} \
+		$(use_with ios idevice) \
+		"$(systemd_with_utildir)" \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" udevrulesdir="$(get_udevdir)"/rules.d install
+
+	dodoc AUTHORS HACKING NEWS README
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}
diff --git a/virtual/awk/awk-0.ebuild b/virtual/awk/awk-0.ebuild
index 1c8a3f2ad28e..52661f930ab3 100644
--- a/virtual/awk/awk-0.ebuild
+++ b/virtual/awk/awk-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/awk/awk-0.ebuild,v 1.7 2013/02/25 08:26:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/awk/awk-0.ebuild,v 1.8 2013/03/21 12:39:49 jlec Exp $
 
 DESCRIPTION="Virtual for awk implementation"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
index 6ce7863fe532..4651ee5209cd 100644
--- a/virtual/awk/metadata.xml
+++ b/virtual/awk/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<herd>base-system</herd>
+  <maintainer>
+    <email>ottxor@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <herd>base-system</herd>
 </pkgmetadata>
diff --git a/www-apps/tt-rss/tt-rss-1.7.4.ebuild b/www-apps/tt-rss/tt-rss-1.7.4.ebuild
index d3500a562204..94576f435ed6 100644
--- a/www-apps/tt-rss/tt-rss-1.7.4.ebuild
+++ b/www-apps/tt-rss/tt-rss-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.7.4.ebuild,v 1.1 2013/03/17 19:23:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.7.4.ebuild,v 1.2 2013/03/21 18:09:40 hwoarang Exp $
 
 EAPI="2"
 
@@ -45,6 +45,8 @@ src_prepare() {
 
 	sed -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" -i config.php \
 			|| die "sed failed"
+	# per 462578
+	epatch_user
 }
 
 src_install() {
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b45a88116823..e63fc82c0173 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
 DIST chromium-25.0.1364.160-lite.tar.bz2 125544021 SHA256 e16a1f103df9e9054e7ad341037842a71214f2e8ac5e6ae3e0a64dfa10297a3e SHA512 0d4aabc3960e59b169e8868d7005788f7272f7ca8596e165534f53135feeabd30fd2b7b0787fed5d06b23db5e1530f0b1e4b4b63dfd3aefa49f2e2408798a1f2 WHIRLPOOL 696d5458a56dd5e4686d91e91440e5ab0be4f389691b4affac987f9f54fe4c9c9e58853a75426e01a059cb1cb74f8384832df471f2bb2438f401e011d1859267
 DIST chromium-25.0.1364.172-lite.tar.bz2 125949496 SHA256 673c946ba7097b292d152d51dbd69a4cde95bda68e5e8cd0cd25b7cfae2c28bc SHA512 704a5add0cf09d9c892cc6e7ae709480f6fbaea8dc0c89805df247a23f71caa388687b09ebc4e8b1ab67e409ee13ccf9031b095bc3944e1c08759fc0d634feee WHIRLPOOL ba513b315aac3ee45ab8ccfd13aa553294af643b18fe5bd30120d6e4fcefdd5207ae72e75a4e626418e2a31f748544ee387f1924f7acd165e75480d5ecc8aadc
-DIST chromium-26.0.1410.28.tar.xz 140799808 SHA256 341ebfbf9f0f7bc693831aab7d56f7a26f1c32a66ea007229d587703a0ef62bc SHA512 84fdbe6408289020f3626d9385ff720b82fb42576a3f3ce758fa6251f0995ccd8c3975f68dad1610945d41c3c1a530e90efd849c8e4cba88cd4a09720df8cc28 WHIRLPOOL 24785eefdf88dda1fa71d8400d5e21ec6ee3941b793c508cd03f0619f57488b9dd732832c87db7bd0944147793f1dc07edda793a79b37ba7f9ffaa727416f1ad
 DIST chromium-26.0.1410.33.tar.xz 141026528 SHA256 0446368df340e4f27e1cbe78e304407475928869240277d75c57e4bef36d5b29 SHA512 89e6519b85172a65c574408b0dbb461d0d4f4fae48e084b401a5ca07c9ce735d6dc4776c6c7ab8f5efa3fc9b7944c7b837dc2cc96c028abc5f40411b4e26860c WHIRLPOOL b3cab004d1824732a314f084a8a031dfc3fac2eb5cf42474d5c733a9e6aa543fabd9cd2cc8e082ce8b8a7f9d2b26d7e59e32ef10d1f3dd8981cb84a77388c295
+DIST chromium-26.0.1410.40.tar.xz 141023256 SHA256 58b7dd6b5e5a88da4df96a19f169152c4acfc583742cf951e2ffaf67648ac48d SHA512 313e37a87a36e9c21cfb1858b29dcc0c74606a65c20caa324bedb023258aeec793e39d6ea800ae4587c4512316a062571003f373d94c2b0117c0e93eb570933b WHIRLPOOL 0e59021759d4b1bdb050c7b6e9f3620f98dd92c4c2a4314f5e766cf7c09440f7798583af0eea05d4cf5dffe08e3b800e78d9e1cc8c9be81f7df05544479b2e6f
 DIST chromium-27.0.1438.7-lite.tar.xz 106730216 SHA256 8fa5b7bef3aa51b3d0c55eeecbf79ddcb29bd485aa7366264ed3042b87022c18 SHA512 c5e380d3dbbbd4b4afdd58759468e6d4fc6672620b4c37fc54a074d55dfedde67be6e5ba9d81a5c77aa5df6696618f838ecb8ac112393de7577762ef30c58ddf WHIRLPOOL 6fad3afa2b972f8ad0046f59bbc8d08a8d6379af061b8d4a728a179ca654aa916322e0a48f2b7a0161a3e5df1c1fb539e9feed7cec92811cb25d66d6687bea96
 DIST chromium-27.0.1444.3-lite.tar.xz 107020592 SHA256 040677f9b25a411c0b5333bbc0d3ed51d8affbc8fa21bd5b401708b9bab00dbb SHA512 cae282336bce963f1f4fc262ab45d9b2c0951b6608fb3e2b4f122664627cde08dad4a46337899958f09ab00e1eab300c8ffc75d55586d2fd48e756b081d8d52a WHIRLPOOL 01bb5ae0b5b2ffb1fc410a777c7db000c6fde9960b68f5a3e63dc0f18b598d87746f00c5b28bff8d1723f97c7b0d8f6c8606f9e8beff86ef9d67a53bf2dae8eb
diff --git a/www-client/chromium/chromium-26.0.1410.28.ebuild b/www-client/chromium/chromium-26.0.1410.40.ebuild
similarity index 98%
rename from www-client/chromium/chromium-26.0.1410.28.ebuild
rename to www-client/chromium/chromium-26.0.1410.40.ebuild
index b994afe688b0..1378a8b98084 100644
--- a/www-client/chromium/chromium-26.0.1410.28.ebuild
+++ b/www-client/chromium/chromium-26.0.1410.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.28.ebuild,v 1.3 2013/03/14 00:59:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.40.ebuild,v 1.1 2013/03/22 02:55:43 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -50,13 +50,13 @@ RDEPEND="app-accessibility/speech-dispatcher
 	media-libs/harfbuzz
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
+	media-libs/libvpx
 	>=media-libs/libwebp-0.2.0_rc1
 	!arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) )
 	media-libs/opus
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] )
-	>=net-libs/libsrtp-1.4.4_p20121108
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/zlib[minizip]
@@ -160,7 +160,7 @@ src_prepare() {
 		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libXNVCtrl/*' \
 		\! -path 'third_party/libyuv/*' \
@@ -220,9 +220,9 @@ src_configure() {
 
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_libvpx (http://crbug.com/174287).
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -232,8 +232,8 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libsrtp=1
 		-Duse_system_libusb=1
+		-Duse_system_libvpx=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_minizip=1
@@ -259,6 +259,10 @@ src_configure() {
 			-Duse_system_yasm=1"
 	fi
 
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=0"
+
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
@@ -350,7 +354,7 @@ src_configure() {
 src_compile() {
 	local test_targets
 	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing sql; do
+		googleurl gpu net printing sql; do
 		test_targets+=" ${x}_unittests"
 	done
 
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 35281ee85142..8c209a51c96f 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,3 +1,6 @@
 DIST opera-next-12.14-1737.i386.freebsd.tar.xz 13519432 SHA256 709bc515c1a92002db2fe5c308932d47196311632a2bc1d29584187807f798af SHA512 de9b2cb584981dcfe4742f747a2d774f5ddb25e36a16d3f6d618420f3bf55a2b4e226c484aea1895dad092de6da031dbc95b2b8ce199449d111f7bf21254a49e WHIRLPOOL d4d94031cd24b9e368081a79a508eb54adc44ad74adbcc07a8457ebed491dbaa1e7550989dff3800b5380d8357fc660a92d846ae7907104582837f996af4726d
 DIST opera-next-12.14-1737.i386.linux.tar.xz 13554708 SHA256 cba39bf41c676394f3adeaa61f96ddfed28607366651370f7ab230a8ce6e25c8 SHA512 1fe25d3cf16c787c7c59a8de05097a99aced99b999af08e9890ed9d945f420c4174ea1a17c8619c87ddf156f526bf803c12f82a1e1be500a46c0014276cb53ad WHIRLPOOL 1ac1c239ff51daa56810ce24a0093b419a69301aa7b8cd8f75c65254cc4b2b20ef9adc94bf59463a788be48713b9cf4c4c6c6c1db21c0e87952ce1d8e7b26a30
 DIST opera-next-12.14-1737.x86_64.linux.tar.xz 13679612 SHA256 0e0153158a4836b76e3134b94a53e8141527f3ff86b27c682cb3c48307d041e9 SHA512 981c6480cfc4d548ffe81286024039159d82ade75c6cbc03b4fd01b656e1e7dc11c9ed158ff6d2b326ea19eb4584f136577fc2335ba51771f156bba28c6f7893 WHIRLPOOL a1ab4f5bb3c0482404050946a48474c414779d041a60dc3c53d3860a1c2c7a0d76a093fef1a41bd9b267b94aa03e5db307076d7fe6e13a26d6188f1342239d9c
+DIST opera-next-12.15-1742.i386.freebsd.tar.xz 13527956 SHA256 816aa67a6d72c549b9184225d16dd603da8c1aa60fcf8ccc344d0bfe97e973b9 SHA512 64ccece32b4a6eeb37835fc6ff4b70089af8048730ac81906a01f2f0f67620bfab6f5b41e5844990c30cfb60db4746591f0cb84d20e44cfa6b08db5cecf101e5 WHIRLPOOL eca2ecda9dfe078ecf6eeb215ff66f6c7c1ef410bcb9ac245943c8fd9c9407b01d544ecc6eda7ad09563e5d449c2a4c5c55b15e52061600d4d2eb1737fd9514f
+DIST opera-next-12.15-1742.i386.linux.tar.xz 13601084 SHA256 0c64067772477000ced635d4c3c4574d9308ad3d1e6016ca051d8a31fda7078e SHA512 3269a26e0cb43285e02968ef77dee59dbd6ecc5ae18320d58db67585d20035255206457576f721f5441a513c97726da69beacc6da1a6a767d7b24bb928e8fcf2 WHIRLPOOL 10b9c54a8203756ed167c48c524556a15a49454928394507dbbaccc912442f921e270ab58a94bce20fe014a6706fdefb9b411eca7f313fec65be3cd9e4348d15
+DIST opera-next-12.15-1742.x86_64.linux.tar.xz 13687272 SHA256 9a05570fa0c57a7226149f3d3cd538b541eaa649eb2a3aa23e475819b262ba62 SHA512 1f787a2d8835efd4fa54385270fc876568319cf20e7683c1b112c648a32d78c7b283fa8221c89ca085858b70b257a4ba6dddef789aa9fc7259414fbac41f8cb7 WHIRLPOOL 2d1b0d94cad3e3122d8c86a24c24c1dd4a661ed718e0d7e5c48ca52c669579fa11ac3f47dd16ca6ea84231d78c828b2828ec80841302ba5ea38b58bd971dd436
diff --git a/www-client/opera-next/opera-next-12.15_pre1742.ebuild b/www-client/opera-next/opera-next-12.15_pre1742.ebuild
new file mode 100644
index 000000000000..153de5ddae42
--- /dev/null
+++ b/www-client/opera-next/opera-next-12.15_pre1742.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.15_pre1742.ebuild,v 1.1 2013/03/21 16:40:43 jer Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-12 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+
+O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
+O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
+
+# == Variables that often change ==
+# All other variables should be accounted for by _pre/_p
+
+O_K="sepr" # The key to the snapshot URL
+
+O_LINGUAS="
+	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
+	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
+	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+" # Supported linguas
+
+# == End of variables that often change ==
+
+if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then	# snapshot: _pre
+	HOMEPAGE="http://my.opera.com/desktopteam/blog/"
+
+	O_D="${O_K}_${O_V}-${O_B/pre}"			# directory string
+	O_P="${PN}-${O_V}-${O_B/pre}"			# package string
+	O_U="http://snapshot.opera.com/unix/"	# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+		x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+		x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+	"
+else							# release: _p
+	O_D="${O_V/./}"				# directory string
+	O_P="${PN}-${O_V}-${O_B/p}"	# package string
+	O_U="mirror://opera/"		# base URI
+
+	SRC_URI="
+		amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+		x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+		x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
+	"
+fi
+
+for O_LINGUA in ${O_LINGUAS}; do
+	IUSE+=" linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+	>=sys-apps/sed-4
+	app-arch/xz-utils
+"
+GTKRDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	x11-libs/pango
+	x11-libs/pixman
+"
+KDERDEPEND="
+	kde-base/kdelibs
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+GSTRDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	media-plugins/gst-plugins-meta:0.10
+"
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXt
+	gtk? ( ${GTKRDEPEND} )
+	kde? ( ${KDERDEPEND} )
+	gstreamer? ( ${GSTRDEPEND} )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+	local LNGDIR="share/${PN}/locale"
+
+	# Count linguas
+	count() { echo ${#}; }
+	local lingua_count=$(count ${O_LINGUAS} en)
+	local locale_count=$(count ${LNGDIR}/*)
+	[[ ${lingua_count} = ${locale_count} ]] \
+		|| die "Number of LINGUAS does not match number of locales"
+	unset count
+
+	# Remove unwanted linguas
+	for LINGUA in ${O_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+		fi
+	done
+
+	# Remove doc directory but keep the LICENSE under another name (bug #315473)
+	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+	rm -rf share/doc
+	for locale in share/${PN}/locale/*; do
+		rm -f "${locale}/license.txt"
+		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+			|| die
+	done
+
+	# Remove package directory
+	rm -rf share/${PN}/package
+
+	# Optional libraries
+	if ! use gtk; then
+		rm lib/${PN}/liboperagtk2.so || die
+		rm lib/${PN}/liboperagtk3.so || die
+	fi
+	if ! use kde; then
+		rm lib/${PN}/liboperakde4.so || die
+	fi
+	if ! use gstreamer; then
+		rm -r lib/${PN}/gstreamer || die
+	fi
+	if use amd64 && ! use multilib; then
+		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip share/man/man1/* || die
+
+	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+	if [[ ${PN} = opera-next ]]; then
+		OPERA_SUFFIX="-next"
+		OPERA__SUFFIX=" Next"
+		OPERA_USUFFIX="-NEXT"
+	fi
+
+	# Replace PREFIX, SUFFIX and PN in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
+		share/man/man1/* \
+		share/mime/packages/* \
+		share/applications/${PN}-*.desktop \
+		|| die
+
+	# Create /usr/bin/opera wrapper
+	echo '#!/bin/sh' > ${PN}
+	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+		>> ${PN}
+	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+		while read i; do
+			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+			then
+				export SANITY_CHECK_LIBZ_FAILED=1
+				break
+			fi
+			sed -i \
+				"$i" \
+				-e 's/libz\.so\.3/libz.so.1/g'
+		done
+		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+	fi
+}
+
+src_install() {
+	# We install into usr instead of opt as Opera does not support the latter
+	dodir /usr
+	rm lib/${PN}/opera_autoupdatechecker || die
+	mv lib/ "${D}/${OPREFIX}" || die
+	mv share/ "${D}/usr/" || die
+
+	# Install startup scripts
+	dobin ${PN}
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+		> "${D}"/etc/revdep-rebuild/90${PN}
+
+	# Set PaX markings for hardened/PaX (bug #344267)
+	pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-apps/ardesia/Manifest b/x11-apps/ardesia/Manifest
index 7723fa8bc7ea..244ac5fa44d8 100644
--- a/x11-apps/ardesia/Manifest
+++ b/x11-apps/ardesia/Manifest
@@ -1,2 +1,3 @@
 DIST ardesia-0.6.tar.gz 15190407 SHA256 13ae6040e8243504173368dc810c108003d0397f6846d63b809d01a743741578
 DIST ardesia-0.7.tar.bz2 1917438 SHA256 961b4812fb7148d485df6ec38a032e73459aeb8e2b06e87f0c6b558754d500ca
+DIST ardesia-1.0.tar.bz2 2831274 SHA256 6386ef36353220951d0f6c891df62976e171c359fad99451cd017e3c79b8ef32 SHA512 cbd3a95cd8a628830f79d9920dd7a58af295fbc335648f4bdaf720cbcc8d87a74da52195649b54f3b651aa52b4d655505f47d081511468caabace21e40481e00 WHIRLPOOL bb40783111fca1f3bb5a3ddf4ebab72bf5b073b836d2afd8681bc00bb5c1c6b23002ca0acc80680e5ac2dafb0c7c7770950d468edc64f05b8d58c843e9b08d90
diff --git a/x11-apps/ardesia/ardesia-1.0.ebuild b/x11-apps/ardesia/ardesia-1.0.ebuild
new file mode 100644
index 000000000000..29889d409a28
--- /dev/null
+++ b/x11-apps/ardesia/ardesia-1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ardesia/ardesia-1.0.ebuild,v 1.1 2013/03/21 21:10:25 hwoarang Exp $
+
+EAPI=4
+
+HOMEPAGE="http://code.google.com/p/ardesia/"
+SRC_URI="http://ardesia.googlecode.com/files/${P}.tar.bz2"
+DESCRIPTION="Color, record and share free-hand annotations on screen and on network."
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cwiid"
+
+RDEPEND="dev-libs/atk
+	dev-libs/libsigsegv
+	media-libs/fontconfig
+	media-libs/libpng
+	sci-libs/gsl
+	sys-devel/gettext
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	gnome-extra/libgsf
+	cwiid? ( app-misc/cwiid )"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils"
+
+src_install() {
+	emake DESTDIR="${D}" ardesiadocdir="/usr/share/doc/${P}" install || die "make install ardesia failed"
+}
+
+pkg_postinst() {
+	elog "Ardesia requires a Composite Manager, such as Compiz"
+	elog "Metacity with compositing, Kwin, etc in order to run"
+	echo
+}
diff --git a/x11-apps/ardesia/metadata.xml b/x11-apps/ardesia/metadata.xml
index 499a4762c79e..1ab497645126 100644
--- a/x11-apps/ardesia/metadata.xml
+++ b/x11-apps/ardesia/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
-<maintainer>
-	<email>lxnay@gentoo.org</email>
-	<name>Fabio Erculiani</name>
-	<description>Feel free to touch my pkgs (tm)</description>
-</maintainer>
 <maintainer>
 	<email>ziapannocchia@gmail.com</email>
 	<name>Marco Clocchiatti</name>
diff --git a/x11-misc/mkxf86config/Manifest b/x11-misc/mkxf86config/Manifest
deleted file mode 100644
index 6efcc6702f96..000000000000
--- a/x11-misc/mkxf86config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mkxf86config-0.9.10.tar.bz2 6461 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829
diff --git a/x11-misc/mkxf86config/files/mkxf86config.initd b/x11-misc/mkxf86config/files/mkxf86config.initd
deleted file mode 100644
index 98f19a604c4e..000000000000
--- a/x11-misc/mkxf86config/files/mkxf86config.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/runscript
- 
-depend() {
-    before local xdm
-}
- 
-start() {
-    ebegin "Creating X Configuration"
-    /usr/sbin/mkxf86config.sh
-	eend $?
-}
diff --git a/x11-misc/mkxf86config/metadata.xml b/x11-misc/mkxf86config/metadata.xml
deleted file mode 100644
index 041ba182ca20..000000000000
--- a/x11-misc/mkxf86config/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>livecd</herd>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
-</pkgmetadata>
-
diff --git a/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild b/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild
deleted file mode 100644
index a0be1c4d68f9..000000000000
--- a/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/mkxf86config/mkxf86config-0.9.10.ebuild,v 1.4 2008/09/04 12:53:08 yngwin Exp $
-
-inherit eutils
-
-DESCRIPTION="xorg-x11 configuration builder - used only on LiveCD"
-HOMEPAGE="http://wolf31o2.org"
-SRC_URI="http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ~mips ppc x86"
-IUSE=""
-
-RDEPEND="!mips? ( sys-apps/hwsetup )"
-
-pkg_setup() {
-	ewarn "This package is designed for use on the LiveCD only and will do "
-	ewarn "unspeakably horrible and unexpected things on a normal system."
-	ewarn "YOU HAVE BEEN WARNED!!!"
-}
-
-src_install() {
-	insinto /etc/X11
-	if use mips
-	then
-		doins xorg.conf.impact xorg.conf.newport xorg.conf.o2-fbdev
-	else
-		doins xorg.conf.in
-	fi
-	exeinto /usr/sbin
-	doexe mkxf86config.sh
-	newinitd "${FILESDIR}"/mkxf86config.initd mkxf86config
-}