diff --git a/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild b/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild
deleted file mode 100644
index d2143f7f5168..000000000000
--- a/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/389-ds-console/389-ds-console-1.2.3-r1.ebuild,v 1.4 2010/10/17 10:07:00 lxnay Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PV=${PV/_alpha/.a}
-MY_PV=${MY_PV/_rc/.rc}
-MY_MV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Java based remote management console used for Managing 389-admin 389-ds"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jss:3.4
-	dev-java/ldapsdk:4.1
-	>=dev-java/idm-console-framework-1.1
-	net-nds/389-ds-base"
-RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
-	${COMMON_DEP}"
-DEPEND="sys-apps/sed
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-src_prepare() {
-	# Gentoo java rules say no jars with version number
-	# so sed away the version indicator '-'
-	sed -e "s!-\*!\*!g" -i build.xml || die "sed failed"
-
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
-	java-pkg_jar-from idm-console-framework-1.1
-}
-
-src_compile() {
-	eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.location="${S}" \
-	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags}
-	use doc && eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.location="${S}" \
-	     -Djss.location="${S}" \
-	     -Dconsole.location="${S}" ${antflags} javadoc
-}
-
-src_install() {
-	java-pkg_jarinto /usr/share/dirsrv/html/java
-	java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}.jar 389-ds-${MY_PV}.jar
-	java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}_en.jar 389-ds-${MY_PV}_en.jar
-
-	dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds.jar
-	dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds_en.jar
-	dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}.jar
-	dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}_en.jar
-
-	insinto /usr/share/dirsrv/manual/en/slapd
-	doins "${S}"/help/en/*.html
-	doins "${S}"/help/en/tokens.map
-
-	insinto /usr/share/dirsrv/manual/en/slapd/help
-	doins "${S}"/help/en/help/*.html
-
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc src/com
-}
diff --git a/app-admin/389-ds-console/Manifest b/app-admin/389-ds-console/Manifest
index 18bdd77fb73e..681aca50118c 100644
--- a/app-admin/389-ds-console/Manifest
+++ b/app-admin/389-ds-console/Manifest
@@ -1,2 +1 @@
-DIST 389-ds-console-1.2.3.tar.bz2 786681 SHA256 a866e4cbef6445d8540b250c0f4ea9617501f6ea1b9c183b4745455bb59eefed SHA512 a8a3318d8f89e6af6a22e1e4052d3ade55ad5661f05fb80812c65d48d7dce031118257550a2612e923ad549ab372ed888b937ffe877aaac8f3592f70689f0768 WHIRLPOOL aeef0781c33100185ebe06ec1bb7b95ca6be8b53323aaa495665867fcdf9762df98b1e1ddfbaffd639db96a5e80635ee7ffff92a800712f51cbcca83051dd639
 DIST 389-ds-console-1.2.6.tar.bz2 791388 SHA256 142a8e1e22bb4c617d2bcdb3d2257e92f2b34d2cd839ed1325f59fc52b70f410 SHA512 ae62afec7860365156f991a420c701e7057190793f577823e5f8b0e1e3d9c9fb240f8d2f30d9a9160baa86aa968e242ef6a9d9faf6608e1218da8f071a620e02 WHIRLPOOL def2e14fb8c7771711efde18cb53f6d6c36de077221c27e219cf97797a5d5c6fb126bf9485a2133676be2f239c065970fb8731c9ddccf3088bcc18ab485169f5
diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/app-admin/equo/equo-183.ebuild b/app-admin/equo/equo-183.ebuild
new file mode 100644
index 000000000000..f1d3155a7af9
--- /dev/null
+++ b/app-admin/equo/equo-183.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/equo/equo-183.ebuild,v 1.1 2013/03/14 18:09:19 lxnay Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils python bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager text-based client"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}"
+
+DEPEND="~sys-apps/entropy-${PV}"
+RDEPEND="${DEPEND} sys-apps/file[python]"
+
+src_compile() {
+	cd "${S}"/client || die
+	emake || die "make failed"
+}
+
+src_install() {
+	cd "${S}"/client || die
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	newbashcomp "${S}/misc/equo-completion.bash" equo
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/entropy/client"
+	echo
+	elog "If you would like to allow users in the 'entropy' group"
+	elog "to update available package repositories, please consider"
+	elog "to install sys-apps/rigo-daemon"
+	echo
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/client"
+}
diff --git a/app-admin/eselect/eselect-1.3.4.ebuild b/app-admin/eselect/eselect-1.3.4.ebuild
index 0d3d1d1ac013..c65ac5618531 100644
--- a/app-admin/eselect/eselect-1.3.4.ebuild
+++ b/app-admin/eselect/eselect-1.3.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/app-admin/eselect/eselect-1.3.4.ebuild,v 1.9 2013/03/14 07:49:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.4.ebuild,v 1.11 2013/03/14 16:20:41 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch b/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch
new file mode 100644
index 000000000000..3299442cb0de
--- /dev/null
+++ b/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch
@@ -0,0 +1,32 @@
+From dd849a9be540bedd4fd904cc0b86ccd9c3e34af2 Mon Sep 17 00:00:00 2001
+From: Stuart McLaren <stuart.mclaren@hp.com>
+Date: Thu, 14 Mar 2013 13:43:36 +0000
+Subject: [PATCH] Do not return location in headers
+
+In some cases credentials were being leaked when downloading a cached
+v1 image.
+
+Fixes bug 1135541, CVE-2013-1840
+
+Change-Id: I3ec0a8f484fe1bdc32c3c56fce810fcef347a7f6
+---
+ glance/api/middleware/cache.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
+index 8e24ef0..dcd59b6 100644
+--- a/glance/api/middleware/cache.py
++++ b/glance/api/middleware/cache.py
+@@ -111,6 +111,9 @@ class CacheFilter(wsgi.Middleware):
+ 
+     def _process_v1_request(self, request, image_id, image_iterator):
+         image_meta = registry.get_image_metadata(request.context, image_id)
++        # Don't display location
++        if 'location' in image_meta:
++            del image_meta['location']
+ 
+         if not image_meta['size']:
+             # override image size metadata with the actual cached
+-- 
+1.8.1.5
+
diff --git a/app-admin/glance/glance-2012.2.3.ebuild b/app-admin/glance/glance-2012.2.3-r1.ebuild
similarity index 93%
rename from app-admin/glance/glance-2012.2.3.ebuild
rename to app-admin/glance/glance-2012.2.3-r1.ebuild
index 7a35f339312e..657b52e4dba2 100644
--- a/app-admin/glance/glance-2012.2.3.ebuild
+++ b/app-admin/glance/glance-2012.2.3-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-admin/glance/glance-2012.2.3.ebuild,v 1.1 2013/02/07 18:02:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.3-r1.ebuild,v 1.1 2013/03/14 21:07:12 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -47,6 +47,10 @@ RDEPEND="${DEPEND}
 	postgres? ( dev-python/sqlalchemy[postgres] )
 	ldap? ( dev-python/python-ldap )"
 
+PATCHES=(
+			"${FILESDIR}/glance-folsom-3-CVE-2013-1840.patch"
+)
+
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest
new file mode 100644
index 000000000000..f45ef1e5885f
--- /dev/null
+++ b/app-admin/matter/Manifest
@@ -0,0 +1 @@
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/app-admin/matter/matter-183.ebuild b/app-admin/matter/matter-183.ebuild
new file mode 100644
index 000000000000..5fce74d33fab
--- /dev/null
+++ b/app-admin/matter/matter-183.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/matter/matter-183.ebuild,v 1.1 2013/03/14 18:21:19 lxnay Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils python bash-completion-r1
+
+DESCRIPTION="Automated Packages Builder for Portage and Entropy"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+entropy"
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/${PN}"
+
+DEPEND=""
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV} )
+	sys-apps/file[python]"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" base-install || die "make base-install failed"
+	if use entropy; then
+		emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/matter"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/matter"
+}
diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
new file mode 100644
index 000000000000..f5967f80f9a8
--- /dev/null
+++ b/app-admin/matter/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<use>
+		<flag name='entropy'>Add Entropy support</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/app-admin/puppet/puppet-2.7.21.ebuild b/app-admin/puppet/puppet-2.7.21.ebuild
index da94370331a1..c2f9cc05dfd7 100644
--- a/app-admin/puppet/puppet-2.7.21.ebuild
+++ b/app-admin/puppet/puppet-2.7.21.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-admin/puppet/puppet-2.7.21.ebuild,v 1.2 2013/03/13 18:55:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.21.ebuild,v 1.5 2013/03/14 15:09:59 ago Exp $
 
 EAPI="4"
 USE_RUBY="ruby18 ruby19"
@@ -17,7 +17,7 @@ HOMEPAGE="http://puppetlabs.com/"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~sparc x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/facter-1.5.6
diff --git a/app-admin/rigo/Manifest b/app-admin/rigo/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/app-admin/rigo/Manifest
+++ b/app-admin/rigo/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/app-admin/rigo/rigo-183.ebuild b/app-admin/rigo/rigo-183.ebuild
new file mode 100644
index 000000000000..dc7fca6496e9
--- /dev/null
+++ b/app-admin/rigo/rigo-183.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/app-admin/rigo/rigo-183.ebuild,v 1.1 2013/03/14 18:25:14 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils gnome2-utils fdo-mime python
+
+DESCRIPTION="Rigo, the Sabayon Application Browser"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/rigo"
+
+RDEPEND="
+	|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] )
+	~sys-apps/entropy-${PV}
+	~sys-apps/rigo-daemon-${PV}
+	sys-devel/gettext
+	x11-libs/gtk+:3
+	x11-libs/vte:2.90
+	>=x11-misc/xdg-utils-1.1.0_rc1_p20120319"
+DEPEND=""
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	python_mod_optimize "/usr/lib/rigo/${PN}"
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	python_mod_cleanup "/usr/lib/rigo/${PN}"
+}
diff --git a/app-arch/unrar/unrar-4.2.4.ebuild b/app-arch/unrar/unrar-4.2.4.ebuild
index 591ea39d2ab5..d6fb25842f4a 100644
--- a/app-arch/unrar/unrar-4.2.4.ebuild
+++ b/app-arch/unrar/unrar-4.2.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/app-arch/unrar/unrar-4.2.4.ebuild,v 1.9 2013/03/14 07:48:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.4.ebuild,v 1.11 2013/03/14 16:18:34 ago Exp $
 
 EAPI=4
 inherit flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="unRAR"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-doc/elisp-manual/Manifest b/app-doc/elisp-manual/Manifest
index 141359779f01..64e02a5aedbe 100644
--- a/app-doc/elisp-manual/Manifest
+++ b/app-doc/elisp-manual/Manifest
@@ -9,3 +9,4 @@ DIST elisp-manual-21.2.8-patches.tar.gz 1736 SHA256 e9d78d341c365e6ee8b2e716415c
 DIST elisp-manual-22-2.9.tar.bz2 669809 SHA256 2e2b830af263c7313072d181af47aef2ee4d5cddb98d49793e0aa498c23e77a6 SHA512 386020d0ba1f26985c5a31597a96c64eef358a35f409ec7ec6616ac70b661220c692e2b7c2dae47525e7389d058659c6a4fb0a6d44fea12cb5dd5c877049d56e WHIRLPOOL 237513530156bf43821ce6394fed10cba95cf30614c9fd755bbc5a2af657d615fbfca0a096655a9558a982264a97ce2480f0794259f372b9286af8350b34046b
 DIST elisp-manual-23.4.tar.xz 686868 SHA256 cb129eb4e026147d5a19d071dd0960467874a0e97ecfae2a3988421c37ea5c70 SHA512 bf71dd18cdce1dce8880b9e67276d9cb71ef54023b5ef2f6555c85c1ffe9b9b8f0d7434227643564c9403fe484bfaeac10ea8911f9c53a9acb3d502eddc1d62d WHIRLPOOL 276b7249e3535af4208d8671e81e5ceb522d1b0c66a261c315ea0c8024c80d58f1c2677b54d8a9c29807273812c841fcc9f70085af9c9e53b0998854dbbbc3f7
 DIST elisp-manual-24.2.tar.xz 726116 SHA256 e6688d44388fad2df5b15dee8c5971611e9ecc2373370fb41df58095674d87ad SHA512 204527671c2bc9108e8ea7692479db8d128612f09d5450402bc1ac1ea6e41e28bc395a46971ebcef639b7dd8651ad10a0ab78adbc6e50e0329160f1f38dbaec6 WHIRLPOOL a10722d6142f65e82b42817746c3e27cdfed04a75a72517539e157fcd5b7ed4590409a06219acfad8d88a982eea3f36c03f2ac031337387a2aa752241aff122d
+DIST elisp-manual-24.3.tar.xz 739784 SHA256 7d58eecad819cf11f6cdc7763e680b526d02d6e17ba4b21a5d405dc8d581a9cc SHA512 432245cfc93d9c82e728d8ed62e288bd135b1da1c65b1fa0ab5b265b2dbd4b644c54cb2f63af53db983025da2838b4d40bb418e80d33eb524a7d6ccdaf48e217 WHIRLPOOL 2298179901069a219bad536827c9ef024741c38aa3a6cbc2172715807056757022a8cbe570712da269d370f544314c73cd42f35011e41b29e0eb5538b684b812
diff --git a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
index 41201db7780f..618ca2a2df18 100644
--- a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-21.2.8-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-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.11 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.12 2013/03/15 08:41:27 ulm Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz
 	mirror://gentoo/${P}-patches.tar.gz"
 
-LICENSE="FDL-1.1"
+LICENSE="FDL-1.1+"
 SLOT="21"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
index 96f0f56c623a..e933b5ad94f3 100644
--- a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-22.2.9.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-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.7 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.8 2013/03/15 08:41:27 ulm Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 # Taken from lispref/ of emacs-22.3
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
-LICENSE="FDL-1.2"
+LICENSE="FDL-1.2+"
 SLOT="22"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
index b3be4395c209..e61771b31486 100644
--- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.6 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.7 2013/03/15 08:41:27 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 # taken from doc/lispref/ of emacs-${PV}
 SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="FDL-1.3"
+LICENSE="FDL-1.3+"
 SLOT="23"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-doc/elisp-manual/elisp-manual-24.2.ebuild b/app-doc/elisp-manual/elisp-manual-24.2.ebuild
index d3ef06e8529f..e230a9134eec 100644
--- a/app-doc/elisp-manual/elisp-manual-24.2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-24.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/app-doc/elisp-manual/elisp-manual-24.2.ebuild,v 1.4 2013/01/13 11:35:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.2.ebuild,v 1.5 2013/03/15 08:41:27 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 # taken from doc/lispref/ of emacs-${PV}
 SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="FDL-1.3"
+LICENSE="FDL-1.3+"
 SLOT="24"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
diff --git a/app-doc/elisp-manual/elisp-manual-24.3.ebuild b/app-doc/elisp-manual/elisp-manual-24.3.ebuild
new file mode 100644
index 000000000000..ded97c8f8e8f
--- /dev/null
+++ b/app-doc/elisp-manual/elisp-manual-24.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.1 2013/03/15 08:41:27 ulm Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="The GNU Emacs Lisp Reference Manual"
+HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
+# taken from doc/lispref/ of emacs-${PV}
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="FDL-1.3+"
+SLOT="24"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+DEPEND="app-arch/xz-utils"
+
+S="${WORKDIR}/lispref"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-direntry.patch"
+	echo "@set EMACSVER ${PV}" >emacsver.texi || die
+}
+
+src_compile() {
+	makeinfo elisp.texi || die "makeinfo failed"
+}
+
+src_install() {
+	doinfo elisp${SLOT}.info*
+	dodoc ChangeLog README
+}
diff --git a/app-doc/elisp-manual/files/elisp-manual-24.3-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-24.3-direntry.patch
new file mode 100644
index 000000000000..aeb949489e69
--- /dev/null
+++ b/app-doc/elisp-manual/files/elisp-manual-24.3-direntry.patch
@@ -0,0 +1,22 @@
+--- lispref-orig/elisp.texi
++++ lispref/elisp.texi
+@@ -1,6 +1,6 @@
+ \input texinfo  @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename elisp
++@setfilename elisp24.info
+ 
+ @ifset VOL1
+ @set volflag
+@@ -117,9 +117,9 @@
+ 
+ @documentencoding ISO-8859-1
+ 
+-@dircategory GNU Emacs Lisp
++@dircategory Emacs
+ @direntry
+-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
++* Elisp 24: (elisp24).  The Emacs Lisp Reference Manual for Emacs 24.
+ @end direntry
+ 
+ @titlepage
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index a575732ab324..08b737b15240 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,2 +1 @@
-DIST mp-5.2.1.tar.gz 566513 SHA256 e91ff7b94427a5c49815f091c67c20f47f63fd473318dbd9dce52a68a6a6f9d4 SHA512 9b7a6b87a7bb853bc91beae156280676046281c5d5582ede6cdcf902d289d1572cfcbf53067da3a55f013536891195f8e17bd97b8f83b08c7ad89479902c66e9 WHIRLPOOL 6cd9a8a3d6d150ecedd43b9825ea3d3574b7eda7af383502a03bcc7685faea28a011f931f1d636fed99d940d6a4fe6bb05a298796fd744b179b2cc39fdb54779
 DIST mp-5.2.2.tar.gz 583918 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f SHA512 44c9b7ded38c294ffc90240ac73848a799294584f20bb981d95f8dde4f281ea9242b6ff8aefdb490e9e02effaab6cbc5bdf94ea489af838a89038113c43da131 WHIRLPOOL 0feba9d14b0f0a5addf153e0ce4d4186b90392c78d2154200cea665880861cef07fdcbfc7d841ef736a3852d8523290d2f5fdbad87f1ab20894e2a32e9df78d7
diff --git a/app-editors/mp/mp-5.2.1.ebuild b/app-editors/mp/mp-5.2.1.ebuild
deleted file mode 100644
index 101a49bbb51b..000000000000
--- a/app-editors/mp/mp-5.2.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.1.ebuild,v 1.8 2012/07/20 08:24:58 jlec Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Minimum Profit: A text editor for programmers"
-HOMEPAGE="http://www.triptico.com/software/mp.html"
-SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk iconv kde ncurses nls pcre qt4"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses )
-	gtk? ( x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 )
-	!gtk? ( sys-libs/ncurses )
-	nls? ( sys-devel/gettext )
-	pcre? ( dev-libs/libpcre )
-	iconv? ( virtual/libiconv )
-	app-text/grutatxt"
-DEPEND="${RDEPEND}
-	app-text/grutatxt
-	virtual/pkgconfig
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.2.1-prll.patch
-}
-
-src_configure() {
-	local myconf="--prefix=${EPREFIX}/usr --without-win32"
-
-	if use gtk; then
-		! use ncurses && myconf="${myconf} --without-curses"
-	else
-		myconf="${myconf} --without-gtk2"
-	fi
-
-	use iconv || myconf="${myconf} --without-iconv"
-
-	use kde || myconf="${myconf} --without-kde4"
-
-	use nls || myconfig="${myconf} --without-gettext"
-
-	myconf="${myconf} $(use_with pcre)"
-	use pcre || myconf="${myconf} --with-included-regex"
-
-	use qt4 || myconf="${myconf} --without-qt4"
-
-	tc-export CC
-	sh config.sh ${myconf} || die "Configure failed"
-
-	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
-		echo ${CFLAGS} >> $i/config.cflags
-		echo ${CFLAGS} >> $i/config.ldflags
-		echo ${LDFLAGS} >> $i/config.ldflags
-	done
-}
-
-src_install() {
-	dodir /usr/bin
-	sh config.sh --prefix="${EPREFIX}/usr"
-	emake DESTDIR="${D}" install
-}
diff --git a/app-editors/mp/mp-5.2.2.ebuild b/app-editors/mp/mp-5.2.2.ebuild
index dbd80770bcf6..43ec77aa1a2a 100644
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.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/app-editors/mp/mp-5.2.2.ebuild,v 1.10 2013/02/15 23:01:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.12 2013/03/15 12:46:35 pinkbyte Exp $
 
 EAPI=4
 
@@ -81,7 +81,7 @@ src_configure() {
 
 	use qt4 || myconf="${myconf} --without-qt4"
 
-	tc-export CC
+	tc-export AR CC
 	sh config.sh ${myconf} || die "Configure failed"
 
 	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
@@ -91,6 +91,10 @@ src_configure() {
 	done
 }
 
+src_compile() {
+	emake CPP="$(tc-getCXX)" CCLINK="$(tc-getCXX)"
+}
+
 src_install() {
 	dodir /usr/bin
 	sh config.sh --prefix="${EPREFIX}/usr"
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index 32c54fad15d0..835b117c954f 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -1,2 +1 @@
-DIST ted-2.21.src.tar.gz 3956815 SHA256 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a SHA512 f926d49c1c68ae54b7b4871cccc48e1ff1ad217baa915735be6f12944b710050fe358b1e85b75a3d8ffc236563dc81364be1f64079805993978dccfdb819f735 WHIRLPOOL a55f61613af80477b9399b43e0ada313e78be5f867acfafb6ee80a530f8939780b3eff63fd8a701e4e83613bc7a1b53bf699c70605ff22bc974cfd6a742bfa71
 DIST ted-2.22.src.tar.gz 4267772 SHA256 93040d5ff259dbf7707a97f8c1ab4a7c1ec8adae63d35760e20dd6f60520fa4a SHA512 52099f1ddc93c1fda4849e62cd610d6b6701e152589124ba90bcd678c09ec7be82273f0f54d96fb8fa8718dab64f99e5576d0c467e035f8c0baffd91b84faa4f WHIRLPOOL fd584a285198731cbe7b53de0ddae465b0f7efe472984ad99835d19bccadb20ec076cf2fb4e22992ee4419093c1b7b0c8cea2fd7cbd07cc9f7f8fc745157d896
diff --git a/app-editors/ted/files/ted-2.21-libpng15.patch b/app-editors/ted/files/ted-2.21-libpng15.patch
deleted file mode 100644
index afd30f9a429b..000000000000
--- a/app-editors/ted/files/ted-2.21-libpng15.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-This patch is from netbsd pkgsrc
-
-ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
-
---- bitmap/bmpng.c
-+++ bitmap/bmpng.c
-@@ -20,23 +20,32 @@
- /*									*/
- /************************************************************************/
- 
--static int bpPngiToBitmap(	const png_info *		pngi,
-+static int bpPngiToBitmap(	const png_structp		pngp,
-+				png_info *			pngi,
- 				BitmapDescription *		bd )
-     {
-     unsigned int	col;
-+    png_uint_32		res_x, res_y;
-+    int			unit_type= 0;
- 
--    bd->bdPixelsWide= pngi->width;
--    bd->bdPixelsHigh= pngi->height;
-+    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
-+    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
-     bd->bdHasAlpha= 0;
- 
--    switch( pngi->color_type )
-+    switch( png_get_color_type( pngp, pngi ) )
- 	{
- 	case PNG_COLOR_TYPE_PALETTE:
-+	    {
-+	    int		num_palette;
-+	    png_colorp	palette;
-+
-+	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
-+
- 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
--	    bd->bdColorCount= pngi->num_palette;
-+	    bd->bdColorCount= num_palette;
- 	    bd->bdBitsPerSample= 8;
- 	    bd->bdSamplesPerPixel= 3;
--	    bd->bdBitsPerPixel= pngi->bit_depth;
-+	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
- 
- 	    bd->bdRGB8Palette= (RGB8Color *)
- 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
-@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	    for ( col= 0; col < bd->bdColorCount; col++ )
- 		{
--		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
--		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
--		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
-+		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
-+		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
-+		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
- 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
- 		}
-+	    }
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB:
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY:
- 	    bd->bdColorEncoding= BMcoWHITEBLACK;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB_ALPHA:
- 	    bd->bdHasAlpha= 1;
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY_ALPHA:
- 	    bd->bdHasAlpha= 1;
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 
- 	default:
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 	}
- 
--    bd->bdBytesPerRow= pngi->rowbytes;
-+    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
-     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
- 
--    switch( pngi->phys_unit_type )
-+    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
-+	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
-+
-+    switch( unit_type )
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
- 	    bd->bdUnit= BMunPIXEL;
-@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	case PNG_RESOLUTION_METER:
- 	    bd->bdUnit= BMunM;
--	    bd->bdXResolution= pngi->x_pixels_per_unit;
--	    bd->bdYResolution= pngi->y_pixels_per_unit;
-+	    bd->bdXResolution= res_x;
-+	    bd->bdYResolution= res_y;
- 	    break;
- 
- 	default:
--	    LDEB(pngi->phys_unit_type);
-+	    LDEB(unit_type);
- 	    return -1;
- 	}
- 
-@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
-     unsigned char *		buffer;
- 
-     numberOfPasses= 1;
--    if  ( pngi->interlace_type )
-+    if  ( png_get_interlace_type( png, pngi ) )
- 	{ numberOfPasses= png_set_interlace_handling( png ); }
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  pngi->bit_depth == 16				)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  png_get_bit_depth( png, pngi ) == 16			)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
- 	}
- 
-     png_start_read_image( png );
--    /*
--    png_read_update_info( png, pngi );
--    */
- 
-     buffer= (unsigned char *)malloc( bd->bdBufferLength );
-     if  ( ! buffer )
-@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
- 
-     png_read_info( pngp, pngip );
- 
--    if  ( bpPngiToBitmap( pngip, bd ) )
-+    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
- 	{
--	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
-+	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
- 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
- 	return -1;
- 	}
-@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
- 
- static int bpPngiFromBitmap(	png_structp			png,
- 				png_info *			pngi,
-+				png_colorp *			pPalette,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
--    pngi->width= bd->bdPixelsWide;
--    pngi->height= bd->bdPixelsHigh;
-+    int			bit_depth;
-+    int			color_type;
-+    png_color_8		sig_bit;
- 
-     switch( bd->bdUnit )
- 	{
- 	case BMunM:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= bd->bdXResolution;
--	    pngi->y_pixels_per_unit= bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    bd->bdXResolution,
-+			    bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunINCH:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
--	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    (int)( 39.37* bd->bdXResolution ),
-+			    (int)( 39.37* bd->bdYResolution ),
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPOINT:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
--	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    POINTS_PER_M* bd->bdXResolution,
-+			    POINTS_PER_M* bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPIXEL:
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
--	    pngi->x_pixels_per_unit= 1;
--	    pngi->y_pixels_per_unit= 1;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 
- 	default:
- 	    LDEB(bd->bdUnit);
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 	}
- 
-@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
- 
- 	case BMcoBLACKWHITE:
- 	case BMcoWHITEBLACK:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
-+	    bit_depth= bd->bdBitsPerPixel;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
--	    pngi->sig_bit.gray= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
-+	    sig_bit.gray= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB:
--	    pngi->bit_depth= bd->bdBitsPerSample;
-+	    bit_depth= bd->bdBitsPerSample;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB8PALETTE:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
--	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
-+	    bit_depth= bd->bdBitsPerPixel;
-+	    color_type= PNG_COLOR_TYPE_PALETTE;
- 
--	    pngi->valid |= PNG_INFO_PLTE;
--	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
--	    if  ( ! pngi->palette )
--		{ XDEB(pngi->palette); return -1;	}
--	    pngi->num_palette= bd->bdColorCount;
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
--	    for ( i= 0; i < pngi->num_palette; i++ )
-+	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
- 		{
--		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
--		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
--		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
-+		return -1;
- 		}
-+
-+	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
-+						    sizeof( png_color ) );
-+	    if  ( ! *pPalette )
-+		{ XDEB(*pPalette); return -1;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
-+	    for ( i= 0; i < bd->bdColorCount; i++ )
-+		{
-+		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
-+		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
-+		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		}
-+
-+	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
- 	    break;
- 
- 	default:
-@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
- 	    return -1;
- 	}
- 
--    pngi->interlace_type= 0;
-+    png_set_sBIT( png, pngi, &sig_bit );
-+    png_set_IHDR( png, pngi,
-+			bd->bdPixelsWide, bd->bdPixelsHigh,
-+			bit_depth, color_type,
-+			PNG_INTERLACE_NONE,
-+			PNG_COMPRESSION_TYPE_BASE,
-+			PNG_FILTER_TYPE_BASE );
- 
-     return 0;
-     }
-@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
- 	    }
- 	}
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  bd->bdBitsPerSample == 16			)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  bd->bdBitsPerSample == 16				)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
- 	    from= scratch;
- 	    }
- 
--	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	      bd->bdBitsPerSample == 16			&&
--	      scratch					)
-+	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	      bd->bdBitsPerSample == 16					&&
-+	      scratch							)
- 	    {
- 	    int			col;
- 	    const BmUint16 *	fr= (const BmUint16 *)from;
-@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
- 
-     png_write_end( png, pngi );
- 
--    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	  pngi->palette					)
--	{ free( pngi->palette );	}
--
-     if  ( scratch )
- 	{ free( scratch );	}
- 
-@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
- 				const unsigned char *		buffer,
- 				SimpleOutputStream *		sos )
-     {
-+    int			rval= 0;
-     png_structp		pngp= (png_structp)0;
-     png_infop		pngip= (png_infop)0;
-+    png_colorp		palette= (png_colorp)0;
- 
-     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
- 				    (png_error_ptr)0, (png_error_ptr)0 );
-     if  ( ! pngp )
--	{ LDEB(1); return -1;	}
-+	{ XDEB(pngp); rval= -1; goto ready;	}
- 
-     pngip = png_create_info_struct( pngp );
-     if  ( ! pngip )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, (png_infop *)0 );
--	return -1;
--	}
-+	{ XDEB(pngip); rval= -1; goto ready;	}
-+
-+    /*
-+    As the info struct is built by libpng this is not needed:
-+    (The call will disappear from libpng in version 1.4)
-+    png_info_init( pngi ); 
-+    */
- 
-     if  ( setjmp( png_jmpbuf( pngp ) ) )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, &pngip );
--	/*  Crashes:
--	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	      pngip->palette				)
--	    { free( pngip->palette );	}
--	*/
--	return -1;
--	}
-+	{ LDEB(1); rval= -1; goto ready;	}
- 
-     png_init_io( pngp, (FILE *)0 );
-     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
- 
--    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
--	{
--	LDEB(bd->bdColorEncoding);
--	png_destroy_write_struct( &pngp, &pngip );
--	return -1;
--	}
--
--    /*
--    png_write_info( pngp, pngip );
--    */
-+    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
-+	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
- 
-     bmPngWriteContents( pngp, pngip, buffer, bd );
- 
-+  ready:
-+
-+    if  ( palette )
-+	{ free( palette );	}
-+
-     png_destroy_write_struct( &pngp, &pngip );
--    return 0;
-+
-+    return rval;
-     }
diff --git a/app-editors/ted/ted-2.21.ebuild b/app-editors/ted/ted-2.21.ebuild
deleted file mode 100644
index 724be20f1c6e..000000000000
--- a/app-editors/ted/ted-2.21.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.11 2012/05/03 18:33:03 jdhore Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="X-based rich text editor"
-HOMEPAGE="http://www.nllgg.nl/Ted"
-SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff
-	virtual/jpeg
-	media-libs/libpng
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/Ted-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-make.patch
-
-	sed -i -e 's|/Ted/|/share/Ted/|' \
-		"${S}"/appFrame/appFrameConfig.h.in \
-		"${S}"/Ted/tedConfig.h.in || die
-
-	mkdir lib || die
-}
-
-src_configure() {
-	tc-export CC
-
-	local dir
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
-		cd "${S}"/${dir}
-		econf --cache-file=../config.cache || die "configure in ${dir} failed"
-	done
-}
-
-src_compile() {
-	emake package.shared
-}
-
-src_install() {
-	cd tedPackage
-	RPM_BUILD_ROOT=${D} ./installTed.sh COMMON || die
-
-	dodir /usr/share
-	mv "${ED}"usr/Ted "${ED}"usr/share/Ted
-	dosym /usr/share/Ted/rtf2pdf.sh /usr/bin/rtf2pdf.sh
-}
diff --git a/app-editors/ted/ted-2.22.ebuild b/app-editors/ted/ted-2.22.ebuild
index 84b8e7bae678..7c4a7b4940c5 100644
--- a/app-editors/ted/ted-2.22.ebuild
+++ b/app-editors/ted/ted-2.22.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/ted/ted-2.22.ebuild,v 1.4 2013/03/12 18:23:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.22.ebuild,v 1.6 2013/03/15 10:38:47 pinkbyte Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.nluug.nl/pub/editors/ted/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
@@ -31,11 +31,14 @@ src_prepare() {
 		"${S}"/appFrame/appFrameConfig.h.in \
 		"${S}"/Ted/tedConfig.h.in || die
 
+	# bug #461256
+	find . -name makefile.in -exec sed -i -e '/ar r/s/ar/$(AR)/' {} \; || die
+
 	mkdir lib || die
 }
 
 src_configure() {
-	tc-export CC
+	tc-export AR CC RANLIB
 
 	local dir
 	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
diff --git a/app-misc/actkbd/actkbd-0.2.8-r1.ebuild b/app-misc/actkbd/actkbd-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..b115631288bf
--- /dev/null
+++ b/app-misc/actkbd/actkbd-0.2.8-r1.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/app-misc/actkbd/actkbd-0.2.8-r1.ebuild,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
+
+EAPI=5
+
+inherit linux-info eutils toolchain-funcs
+
+DESCRIPTION="A keyboard shortcut daemon"
+HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"
+SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+CONFIG_CHECK="~INPUT_EVDEV"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin actkbd
+	dodoc AUTHORS ChangeLog FAQ README TODO
+	docinto samples
+	dodoc samples/actkbd.conf
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
+
+pkg_postinst() {
+	elog
+	elog "System-wide configuration file is /etc/actkbd.conf."
+	elog "Use actkbd.conf from usr/share/doc/${PF}/samples as a template."
+	elog "You need to create the config and set right input device from"
+	elog "/dev/input/event* in /etc/conf.d/actkbd"
+	elog
+	elog "To obtain keycodes for pressed combinations/keys just run:"
+	elog "  # actkbd -s -d /dev/input/event<MYDEVICENUMBER>"
+}
diff --git a/app-misc/actkbd/files/actkbd.confd b/app-misc/actkbd/files/actkbd.confd
new file mode 100644
index 000000000000..9c6c850c8280
--- /dev/null
+++ b/app-misc/actkbd/files/actkbd.confd
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/actkbd/files/actkbd.confd,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
+
+# Configuration file
+CONFIG="/etc/actkbd.conf"
+
+# Event provider providing the keypress events
+EVENT_DEVICE="/dev/input/<DEVICE>"
+
+# PID
+PIDFILE="/var/run/actkbd.pid"
+
diff --git a/app-misc/actkbd/files/actkbd.initd b/app-misc/actkbd/files/actkbd.initd
new file mode 100644
index 000000000000..67dc29a3f8f8
--- /dev/null
+++ b/app-misc/actkbd/files/actkbd.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/actkbd/files/actkbd.initd,v 1.1 2013/03/14 19:50:09 scarabeus Exp $
+
+checkconfig() {
+	if [ ! -f ${CONFIG} ] ; then
+		eerror "Config file \"${CONFIG}\" does not exist. Create it prior launching the daemon."
+		return 1
+	fi
+	if [ ! -c ${EVENT_DEVICE} ] ; then
+		eerror "Device \"${EVENT_DEVICE}\" is not valid pointer to input provider."
+		return 1
+	fi
+}
+
+depend() {
+	before acpid
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting actkbd"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd -- -c "${CONFIG}" -D -q -x -l -p "${PIDFILE}" -d "${EVENT_DEVICE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping actkbd"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --exec /usr/bin/actkbd
+	eend $?
+}
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 8d2be881ab89..dfcad6687761 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,2 +1,3 @@
 DIST byobu_5.29.orig.tar.gz 328310 SHA256 12e418f9dd979bb3be045170ee851ab780fd7f3bd15625c9deeb9e157f8322df SHA512 2b45fa5a8c680137b3aa210924bbc3c2b29b4c54003f154e3a72332146a69a41c21d5121843e090bfab0ebf73677e662fd678ee801ff3d89af447244f24477a1 WHIRLPOOL d23cb861c8fb26536c95bf24886689af91011f4baae88f510e248a00133d8f9fedaa37dc4995e1580b5e391337e6d646675fddc589d58153da0fb9d20e5dbffe
 DIST byobu_5.33.orig.tar.gz 600437 SHA256 14beba36f99b96a804be2e2d8a065290266d943a0a075282ef88a1c36d64b9e5 SHA512 c508ed2edc3a8158fbd7989bade907f24a0a6e30efa92acd9d5789681bf090f4b975f9644a4cedaab6e2234847d1f94a237963cfb00ca571b1ee8d1726c55809 WHIRLPOOL c8068d893b7bc22247f30b31e7294c0264d03b2f65e41a3cff406040da4dc93159594a6838da98c498d40494f1f2123b231524df1f4e503c6ca258983027e558
+DIST byobu_5.34.orig.tar.gz 600838 SHA256 016cee28814c7d15168db6196c2d04dfacad70c390403918fa1873b7787cede9 SHA512 2bf7a16f93e0987ef75b482ac3a816503bebfbc5d19e472b696873c6186daa3ba47b59b91cfca6de9b3924937ffd897dead51ee68ed9b4edc19e00b6b9c1cd1a WHIRLPOOL 12def39bdd9116e9b7e20efb98817f70f8d8a2af77d920e00c6b70e7da33e9fd004dcb1928859ad1a0c49a0fae3a87953173c89923fd1fbf4c0e8bec5a77cbed
diff --git a/app-misc/byobu/byobu-5.34.ebuild b/app-misc/byobu/byobu-5.34.ebuild
new file mode 100644
index 000000000000..36a6bcbf56d2
--- /dev/null
+++ b/app-misc/byobu/byobu-5.34.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/app-misc/byobu/byobu-5.34.ebuild,v 1.1 2013/03/15 08:12:58 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+
+RDEPEND="
+	dev-libs/newt
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+}
diff --git a/app-misc/magneto-loader/Manifest b/app-misc/magneto-loader/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/app-misc/magneto-loader/Manifest
+++ b/app-misc/magneto-loader/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/app-misc/magneto-loader/magneto-loader-183.ebuild b/app-misc/magneto-loader/magneto-loader-183.ebuild
new file mode 100644
index 000000000000..9647de1dc9f6
--- /dev/null
+++ b/app-misc/magneto-loader/magneto-loader-183.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/app-misc/magneto-loader/magneto-loader-183.ebuild,v 1.1 2013/03/14 18:26:18 lxnay Exp $
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~sys-apps/magneto-core-${PV}
+	~app-admin/rigo-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-loader-install || die "make install failed"
+}
diff --git a/app-shells/zsh/zsh-5.0.2.ebuild b/app-shells/zsh/zsh-5.0.2.ebuild
index a61f20d318f8..03a7f8330685 100644
--- a/app-shells/zsh/zsh-5.0.2.ebuild
+++ b/app-shells/zsh/zsh-5.0.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/app-shells/zsh/zsh-5.0.2.ebuild,v 1.9 2013/03/14 07:51:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2.ebuild,v 1.11 2013/03/14 16:22:00 ago Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild
index 8467536bff97..8e1f4726b94c 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.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/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.9 2013/03/14 07:50:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.11 2013/03/14 16:21:09 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/dos2unix/dos2unix-6.0.3.ebuild b/app-text/dos2unix/dos2unix-6.0.3.ebuild
index ac9be64b5c4e..6808dbe4f980 100644
--- a/app-text/dos2unix/dos2unix-6.0.3.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.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/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.9 2013/03/14 07:50:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.11 2013/03/14 16:21:33 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"
 
 RDEPEND="
diff --git a/dev-db/gigabase/gigabase-3.83-r1.ebuild b/dev-db/gigabase/gigabase-3.83-r1.ebuild
index c7f177b1b2e4..965002ee1d6c 100644
--- a/dev-db/gigabase/gigabase-3.83-r1.ebuild
+++ b/dev-db/gigabase/gigabase-3.83-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/dev-db/gigabase/gigabase-3.83-r1.ebuild,v 1.3 2012/03/08 09:21:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.83-r1.ebuild,v 1.5 2013/03/15 12:17:31 pinkbyte Exp $
 
 EAPI="4"
 inherit eutils multilib
@@ -12,12 +12,12 @@ SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
-S=${WORKDIR}/gigabase
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-dereferencing.patch"
@@ -26,7 +26,7 @@ src_prepare() {
 src_configure() {
 	mf="${S}/Makefile"
 
-	econf
+	econf $(use_enable static-libs static)
 	sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} || die
 }
 
@@ -37,7 +37,7 @@ src_compile() {
 
 src_test() {
 	pwd
-	cd ${S}
+	cd "${S}"
 	local TESTS
 	local -i failcnt=0
 	TESTS="testddl testidx testidx2 testiref testleak testperf testperf2 testspat testtl testsync testtimeseries"
@@ -50,6 +50,7 @@ src_test() {
 
 src_install() {
 	einstall
+	prune_libtool_files
 
 	dodoc CHANGES
 	use doc && dohtml GigaBASE.htm
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 5f373cc9eec1..e8759f68f296 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,15 +1,14 @@
+DIST 1fbe99283d97.tar.gz 3865243 SHA256 ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572 SHA512 bc54794d8d0424a1902d523b2e90914c06d0c83921b8a0c4eacba76eb8225a53b40a98682ac392f4c232d6e4256917b74ce7b5e5a2e7899561fa3d421b40bf79 WHIRLPOOL 032da1c1d2b6e69ba42f0572e629cb725bbcacbb44b1be01a5938c2a6a4e4aadbf2fefa619d9c1d4f8df997eba87434a61cc339f54f48becb81a55aeb3c7d3a1
+DIST 3c7be82314bf.tar.gz 2755386 SHA256 4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad SHA512 dfb93956d6525d8baf48e4494f086ba748ee3d90167d047cc739527f5d06a4cff98de0311017004028101b713c95a452a26527fdc63ff260dbbd6ed3527d4342 WHIRLPOOL 8746ff40e9aeae8497e30c5c795fb36e012550cc2b8ccbfc7580c9be8dc189750c69267fc0fdedd7c821ca98715d7d5803a6745295e03848b76d30c227e6e074
+DIST 41426c72b802.tar.gz 2312391 SHA256 cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c SHA512 99f5269712da36798390f7c74a3d6565872d45758edbc70821d876596a0536df76c17207518d21850c8fbf7a37801b945cc66ece2db26a27a1b5e7cfeb499226 WHIRLPOOL 29ba042bfb026914998f0044032749616b8d417f7e0ff6146b8debbc222dad684fa56dc783723cf314cc812f10e6cd821757bad2aff81f98eb397175332d1043
+DIST 516aae5f27cf.tar.gz 1435560 SHA256 181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6 SHA512 db1fdb6bd0ff701aa5f747adca27d53876fea86533a01737f047b2ffe2aa42935b903157efca4c236dd91e47f13703c3aeb2d8aab781116016a3a723f170197d WHIRLPOOL 1f59a2c2dd6c04584d2ae9b0eb4151ca75471634e1b41701768bade830b1967d5791d46c23f4069f83ee9f4ad7af2f69ad20d7d3619bea9f76330f340ad24c54
 DIST 68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
-DIST 6bb01322bb5a.tar.gz 44982865 SHA256 a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 SHA512 2d52d37393921c297c8856b0b3e234f132f670e72da8d627cce19d87ddcec68f7bb402af3537f90e0ce044240948d4b9442ab7524c87f99652aeeaa5a757d43c WHIRLPOOL 8fbf8aca4b0612b691655ad63198f3d2af78fe19b9c3e5eaf2b61e472ac4d7d14add5643ffd710377d7a1c5c82aee9d1a6aa94a7fafc6381415d9ead79be5e7d
-DIST 97a8b625f6e9.tar.gz 1435633 SHA256 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d SHA512 1bc57dcd36e9ebdff4be685936bb3c20d277358f112b7258ced6bcb57826b81df7bda5e7c6383831d26f496801daf6ef58bcb948e5debea76713ae1e43a599b3 WHIRLPOOL afd01b7cf293106dcead6768d1c67731927af2e37cf466925f0f7ac65ccded36b7c03c73949fd6ecdf10119f5052c1f3d34819ccd4570f2b80cc094d545d2e62
+DIST a152dced63a1.tar.gz 9393091 SHA256 eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae SHA512 22381dee16582c2d056418dfbe12a57ecc5ca37148a50f4c057a00ceec21a65d94987a75788a225d716f60fd90fdeed8de1dcce5bcd88ae315fd304446d7d6fc WHIRLPOOL 4c623c676220c6f7f0ac66678de63c10a81a44521d4d95c3ef129d8a5b3e807105408a0336f41456400555bc9eec20d96c6cb4fdc47705c4f035348dae10433c
 DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
-DIST b900024eb4ba.tar.gz 2755366 SHA256 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 SHA512 b13b14420780e475f483ef0811b7903d73b8667c3d7ca881e89a386d485094172d269ce755df47caccf2527cc2928695b69884c674d1a9460070703d917b05fe WHIRLPOOL 6a17403196720a402eab9cd18aca5f5714710095a107e1617961efffecbb2b5345c104fa0fd3306cf702266e4eca4555c0a8773b725559c92c645e92ad7fb20a
-DIST bc0de5a0ece2.tar.gz 9393915 SHA256 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 SHA512 52a105b11916150f4c38158e53e5649a0185fa0e63ce055f1dc1dc961fec2921460216085971eefadc2a5f3aa468e78be7590a59f3c3ccdd9c91d23803f1d0ca WHIRLPOOL 8cc98d7b5ae839e75eb9ce0c88c99a71f867c1786a6d8698d4d14a5a0230b16cb26d17898e75355c91d240749c062223b3277a43f7ad2563da5c4faf4a79f9fe
-DIST d7feafb8427b.tar.gz 3864991 SHA256 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 SHA512 69a29126487707c9a84ffc8989915fc9d620d265683e264a490d89ebac5d27c2c2c3d044b821a476b8f76f2035fb41855022435cc90b66286451c65ad696bc03 WHIRLPOOL e8895f91e0845bdbb256c99f82eff8f830bb3774cecd8ad7540695740964e3ae32b6286891b2986a982c87fcc7d686cff5482734541020c866bfc8e73a8382be
-DIST dd8d1a8f222f.tar.gz 131459 SHA256 a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 SHA512 ab827f6afc708b8a51ed523b2ea9ab42d57c926c9ffdfd22d4011c8209a89234855f861c72db04fdf3cbce71a6c175441fbba46e533e956bbc2e26521983d81d WHIRLPOOL 701ad8b553961f77ae4ed1725958572a0f8a2a94b92eade18dfad58848535a0f89ef2d0cf5b8b4bcc2f259fab02905750fc6789f1ef61d8c6a17a5c5ee9e6658
-DIST e0739a8783d1.tar.gz 2312385 SHA256 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb SHA512 4d177b493b87cc5b2c92c85a4f035d7227743af2249c549f2dee2137b93a2f599d62e616e3a0a4f24f84abf26895e33fdbf6d3994118194f4a5f3cb1a002e157 WHIRLPOOL 72c61404b7d85142078020b42d20d4c5b0e0a77eb2fd8dcb49056f002706aba78e0da698db500eb88fa7a5ad5c57a223b2ea8422f5a04bd289e1a250503d2354
-DIST icedtea-2.3.6.tar.gz 5048411 SHA256 f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9 SHA512 5484a79c80c3901f783a3a129e7a098d21ffed5a73bf8d3e300a7002d6a5c67e1d1b9ae1adc52de052dbde0757d7edbf9ebf101ac6f9dfcdb37378ceb5b23522 WHIRLPOOL 9c18db778810960fc5ed107e42f7d1236391e518a2ecfc6390693220c54950a04cf64f3faa41dfc28ab708cb87921cee7e873c71ffa2835b6c1476b34c2efd4a
-DIST icedtea6-1.12.2.tar.gz 6632211 SHA256 897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794 SHA512 9e219e3b9a87c9073a4759edcd1f416246085f755c7c9a3faf17cfcfed8a55b39e25511a2cd7d4526791bdd4d88063343b15391a6ee85a2b715c0cf0415e6ef8 WHIRLPOOL b97ee2c5a1168cc76299be468a3d11bba0ae31f69e0ea55745e60c0abcd195893e99ffa3408ea89385959d5d4f939a1fa77b1b73e8a1046effa607d512460c0f
-DIST icedtea6-1.12.3.tar.gz 6652921 SHA256 db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c SHA512 ff6079e7ba925e93a1ba53e8474bd0a7f07f9aee1a1ff87dfcce5493a66c40afe6bf0d5c91bf7cba5a6c606496acdc2cc958d3b86929640b61da5d04ae33c92b WHIRLPOOL 853c18465b527da53abbdb6a1d38e767efa16fef5b19ba4573d2f5584a3dca050f01406dd94222423201af21cc9062d6c80831f96934bfe91d0872991de701c5
+DIST deac45dc94f0.tar.gz 44996399 SHA256 00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215 SHA512 f9a4a0d910285667e84f48562f44f9c27c006d41c0e97d376b1d39258cedf38108eba07c99260f18be7ec6f07cfc8f40ada4b9f8f1452ccd92b67e49f06c2e3d WHIRLPOOL 63a9548e3eba0b1733f6b5cb6a91d9b259d94034ffc1a4700035d976e601bb43640056980fecb01cf5e138b736ec8507281747b8c5cd68c82f5b4e3a1079c58d
+DIST ed02a059ea15.tar.gz 131499 SHA256 865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b SHA512 4a9fa5c9318a67255ad39377fb3ce861b6f6eaa6427edf06c7a4f19d11e46dc30b2f1e847d3ea1def41304c59dddd2eeaf97d33659d276d7c33b5b9ac390e6d3 WHIRLPOOL 35b55ed80c567d5d347417564a7d340ee62711f411146644da979f69ce7ace1b8b7a68950d932e8f59856d7816fcba8b38d5e893c4cd1915099bdf50f4116e3e
+DIST icedtea-2.3.8.tar.gz 5053426 SHA256 750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153 SHA512 2ecc4b71b167a71789dfc099225df848c6a8763ae15d1b9396ce4c6068b7d7d6e9a428b09d1e2c99e013650a7136a9d1457979b8d1a38d74ca22817e31716b7e WHIRLPOOL d79e964e83537ddcaa2161614f6b78564f36fc28db751dc599b031ef35d85b9f4a3b801c8e288248a8759645745f3a408652abcf19668a33f9a4a92ac9058b59
+DIST icedtea6-1.12.4.tar.gz 6689142 SHA256 eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda SHA512 f7d2834edd051b2080acd596d230f16604eb616eb1a6a0813dd274a92c7ad9711a25b65dacea06a12591c6121beedac44f9bdeb2e6cb60fb612bdeea63957a55 WHIRLPOOL 6109ed8cc94ee4e14882f0b787ac1a8a4859c542b7f92b896e46a33bbef5ef1cac532bb54616dcee66deff4d6fc50296f533f0979d7efe31f98ddd42a3d8c60c
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
 DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
diff --git a/dev-java/icedtea/icedtea-6.1.12.3.ebuild b/dev-java/icedtea/icedtea-6.1.12.3.ebuild
deleted file mode 100644
index 70fae0af64b4..000000000000
--- a/dev-java/icedtea/icedtea-6.1.12.3.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.3.ebuild,v 1.1 2013/02/20 09:07:52 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="27"
-OPENJDK_DATE="26_oct_2012"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_04.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		enable_cacao=yes
-	elif use cacao; then
-		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-		ewarn 'If so, please rebuild with USE="-cacao"'
-		enable_cacao=yes
-	fi
-
-	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-6.1.12.2.ebuild b/dev-java/icedtea/icedtea-6.1.12.4.ebuild
similarity index 99%
rename from dev-java/icedtea/icedtea-6.1.12.2.ebuild
rename to dev-java/icedtea/icedtea-6.1.12.4.ebuild
index c0bd58b34384..c605364bcdc1 100644
--- a/dev-java/icedtea/icedtea-6.1.12.2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.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-java/icedtea/icedtea-6.1.12.2.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.4.ebuild,v 1.1 2013/03/14 11:05:20 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
diff --git a/dev-java/icedtea/icedtea-7.2.3.6.ebuild b/dev-java/icedtea/icedtea-7.2.3.8.ebuild
similarity index 97%
rename from dev-java/icedtea/icedtea-7.2.3.6.ebuild
rename to dev-java/icedtea/icedtea-7.2.3.8.ebuild
index 30fd206c5c24..d515efb95dd0 100644
--- a/dev-java/icedtea/icedtea-7.2.3.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.8.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-java/icedtea/icedtea-7.2.3.6.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.8.ebuild,v 1.1 2013/03/14 11:05:20 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -14,13 +14,13 @@ inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="97a8b625f6e9.tar.gz"
-JAXP_TARBALL="d7feafb8427b.tar.gz"
-JAXWS_TARBALL="b900024eb4ba.tar.gz"
-JDK_TARBALL="6bb01322bb5a.tar.gz"
-LANGTOOLS_TARBALL="e0739a8783d1.tar.gz"
-OPENJDK_TARBALL="dd8d1a8f222f.tar.gz"
-HOTSPOT_TARBALL="bc0de5a0ece2.tar.gz"
+CORBA_TARBALL="516aae5f27cf.tar.gz"
+JAXP_TARBALL="1fbe99283d97.tar.gz"
+JAXWS_TARBALL="3c7be82314bf.tar.gz"
+JDK_TARBALL="deac45dc94f0.tar.gz"
+LANGTOOLS_TARBALL="41426c72b802.tar.gz"
+OPENJDK_TARBALL="ed02a059ea15.tar.gz"
+HOTSPOT_TARBALL="a152dced63a1.tar.gz"
 CACAO_TARBALL="a567bcb7f589.tar.gz"
 JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
 
diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index db3ed73f90b4..3fc7f40a2c16 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,3 +1,4 @@
 DIST clojure-1.2.0.zip 3586231 SHA256 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207 SHA512 8c10533eef046d3dba1eb335d0febcdd22664cd428b24c35f860784efd7a699eba1b37808b99c0b8a584266e6c282f7c490cd49bcb7d7363c958f2499cfc41e2 WHIRLPOOL 6a325eceadd752d42b37a6e6adca7cceb4c49058c3af1e9a78e609b111e8e1cc34b53c356f04bf506b388415108209ec78934057b1de98c1d156a41f2021c09f
 DIST clojure-1.3.0.tar.gz 489200 SHA256 da719ca8600f75001362fefa6427ef14d0a64c3ddc220c79695c44abecdc4a18 SHA512 1078a94afe096bf5862ddda6bd1fccb14d2383151f575b32829e60f2252d94dda972f9e9ca76bf91bc215f51e6529bd895c3653df5d9fa65dbe69e4be519ecdd WHIRLPOOL f3182a533c8081acbafceb5cd41c8f55c053dae673cab8f52274ab357fdf2b8059a512205501f7221d540d60913e115193eeb4c5dd1b46e05ceb56223b465770
 DIST clojure-1.4.0.tar.gz 501302 SHA256 72e9b69367e5f825fe501629a7bf25d70632a6007751d2a9520be133879f42cd SHA512 618c0de641f2e718e8a0b1ce62a695e61d60a2fc52804018b4fc20caf6e7a99d88ed5af43f2e1f735fc8c19629382f0e53d010b1fca41ca1d4856cd59fadf329 WHIRLPOOL f77b0365e2f1180e0c43412dd0684e33699d7ec517b18af4694e3778cac74593a18de3843f214db5656d39c947a24839942472b5439b90c0c4391c275dd8e927
+DIST clojure-1.5.1.tar.gz 540021 SHA256 ee6cc9360e3545a35cdd6a9ae48b5f4034ef2eb2aaa19721df976078952a805b SHA512 8bc4b7098ec11a3cd4d077f32607c5d23118d5f84b88af69b2051c4dd5b17f28f092b77206fba87e23f1163d2d0f7a2c37b1b1ffa1bcfef3ad4c8f74695d71cd WHIRLPOOL e77d13a771903100a3fe6b0ade84375217c5b150498e727a7cef2d856a4004e640e0c95717fb67be6cae1fbab7611189a1f3999726f7bbec43968eef646dcb32
diff --git a/dev-lang/clojure/clojure-1.5.1.ebuild b/dev-lang/clojure/clojure-1.5.1.ebuild
new file mode 100644
index 000000000000..9195b980975f
--- /dev/null
+++ b/dev-lang/clojure/clojure-1.5.1.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-lang/clojure/clojure-1.5.1.ebuild,v 1.1 2013/03/14 16:42:57 mr_bones_ Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Clojure is a dynamic programming language that targets the Java Virtual Machine"
+HOMEPAGE="http://clojure.org/"
+SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="1.5"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE=""
+RESTRICT="test" # patches welcome to fix the test
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S=${WORKDIR}/clojure-clojure-22c7e75
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar ${P/_/-}.jar
+	java-pkg_dolauncher  ${PN}-${SLOT} --main clojure.main
+	dodoc changes.md readme.txt || die
+}
diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest
index 4075f7c7c162..f5d5339288d1 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -1,2 +1 @@
-DIST ferite-1.0.2.tar.gz 2039452 SHA256 c67fc25451070214334ba2b1ca3a9ea78f5ed79f322e62ebf8fc9462bfe0fb8e SHA512 34654ad9e54929e74167c87a79351ce7fee00d7d9f4f6084730c121570f5508b0bd0c1a0e7d5d8c58d558ad9ce8680ea6c1e90c676202eeb3e44d7cdb9fc6da3 WHIRLPOOL c45e8e68824024a38504bdd1b84fba0c5e3c922481be7090020c608bd9d736a1a34667a4de030816fcedf75c24599cff4edd3baae810c236b19d049596856c56
 DIST ferite-1.1.17.tar.gz 2174774 SHA256 d407f3db45482e17f41820fb029cf8b06e6104699b8d7340f3946f57d3f4e690 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f WHIRLPOOL d563849e7b1ebe19657f319ecf970ad4987d10c28c29729da2868b10b7466159f5210e8bb7c065b8fccb7314ebc764dc8dbe97484c138c70ec066ecd12ebb005
diff --git a/dev-lang/ferite/ferite-1.0.2.ebuild b/dev-lang/ferite/ferite-1.0.2.ebuild
deleted file mode 100644
index 9a76c8086c53..000000000000
--- a/dev-lang/ferite/ferite-1.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.0.2.ebuild,v 1.15 2012/11/26 22:11:54 ulm Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-DESCRIPTION="A clean, lightweight, object oriented scripting language"
-HOMEPAGE="http://www.ferite.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/libpcre-5
-	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# use docsdir variable, install to DESTDIR
-	sed \
-		-e '/docsdir =/!s:$(prefix)/share/doc/ferite:$(DESTDIR)$(docsdir):' \
-		-i docs/Makefile.am || die
-
-	# Install docs to /usr/share/doc/${PF}, not .../${PN}
-	sed \
-		-e "s:doc/ferite:doc/${PF}:" \
-		-i Makefile.am \
-		docs/Makefile.am \
-		scripts/test/Makefile.am \
-		scripts/test/rmi/Makefile.am || die
-
-	# Don't override the user's LDFLAGS
-	sed \
-		-e 's:_LDFLAGS = :&$(AM_LDFLAGS) :' \
-		-e '/^LDFLAGS/s:^:AM_:' \
-		-i modules/*/Makefile.am \
-		libs/{aphex,triton}/src/Makefile.am \
-		src/Makefile.am || die
-
-	# Only build/install shared libs for modules (can't use static anyway)
-	sed -i -e '/_LDFLAGS/s:-module:& -shared:' modules/*/Makefile.am || die
-
-	# use LIBADD to ensure proper deps (fix parallel build)
-	sed \
-		-e '/^stream_la_LDFLAGS/s:-L\. -lferitestream::' \
-		-e '/^stream_la_LIBADD/s:$:libferitestream.la:' \
-		-i modules/stream/Makefile.am || die
-
-	# Make sure we install in $(get_libdir), not lib
-	sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure.ac || die
-
-	# We copy feritedoc to ${T} in src_install, then patch it in-situ
-	# note that this doesn't actually work right, currently - it still tries
-	# to pull from / instead of ${D}, and I can't figure out how to fix that
-	sed -i -e 's:$(prefix)/bin/:${T}/:' docs/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	cp tools/doc/feritedoc "${T}" || die
-	sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die
-	sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc || die
-	sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib"
-	emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
-	prune_libtool_files
-}
diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild
index 2cb407ea7645..4b3392cd4246 100644
--- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild
+++ b/dev-lang/ferite/ferite-1.1.17-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/ferite/ferite-1.1.17-r1.ebuild,v 1.4 2013/03/12 18:25:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.1.17-r1.ebuild,v 1.5 2013/03/14 13:37:26 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-lang/perl/files/eblits/src_install-v50160001.eblit b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
index bee3ae5e9bf5..d31e90ee8b70 100644
--- a/dev-lang/perl/files/eblits/src_install-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
@@ -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/perl/files/eblits/src_install-v50160001.eblit,v 1.2 2013/01/20 20:22:11 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_install-v50160001.eblit,v 1.3 2013/03/14 12:46:31 tove Exp $
 
 eblit-perl-src_install() {
 	local i
@@ -55,7 +55,7 @@ eblit-perl-src_install() {
 			--htmldir="${ED}/usr/share/doc/${PF}/html"
 	fi
 
-	[[ -d ${D}/usr/local ]] && rm -r "${D}"/usr/local
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
 
 	dual_scripts
 }
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 09a3678f24dc..fb5a8e94425c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,12 +2,15 @@ DIST php-5.3.18.tar.bz2 11335289 SHA256 f065deecb78abb8ef101e1098866024af4ca10cb
 DIST php-5.3.20.tar.bz2 11358034 SHA256 578c26e6932dd7a37ff14e4e2237bc3235386fe897ba2e456e937e647727cd07 SHA512 1f3282cef5d553f28324b8f011acef59319441a8a258355b908fb6f69eaad8f1d736dc03259ddc168c20332510b7c73b5afb21934d3d14cb4f893f5cee59bd9b WHIRLPOOL 7e41bea91aec20a371b1e5a0de7e76f3e34d2b51c0378e76155c101297ac3811c9f0ced43abe911e64f812ca8130dd9cfc27090f29beb5cfaec1957de0f3d38e
 DIST php-5.3.21.tar.bz2 11362683 SHA256 9bd914cb01fc78c06ec5fe7e31100f000cc03325e042fd5a829d8ce80e4478c3 SHA512 e6896a1646d9c6cd40446ec4c374c948120ed38e9bfc067354f342888b29cfe794e689ef56aaa714ea469061915bf78507c3adb6d69057132b9baaf44443a09f WHIRLPOOL c9e7bdf3744d22498e8deb014bd51ea76c897d7acf3735fc8fc7f8c0ef64994f66459461650562b2b15c7fc8534f70c6805b5e5226a9c3da359b0b7418623350
 DIST php-5.3.22.tar.bz2 11366482 SHA256 2da5fefdd24dafd8a94b6e41ba2c308ee216f97b3d605abde513d0cdc680d588 SHA512 ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7 WHIRLPOOL 2d0300c47e920db5227f225ffd266fbf4ca8303feb60b397ab95e0c8ed5e70c2c7d5868cf3fb9cbb201e894552b868a6d82147d0f11817403329d64f0d1c757a
+DIST php-5.3.23.tar.bz2 11410987 SHA256 69473eae7c752987a8fc7619bae9f7121cfe7c6603a2ebf13c8e036dff6a4944 SHA512 6d6579c0c67d75cd3cbc182609fb231cbda486722f47e01b78d50d93072720f37ee74eba8d8cc42308c297009fb3af31f9d2092869a4e78bbd957504cbb4858b WHIRLPOOL f3de62fb73af532811fbe2491442182297d8213ca621a9c0e3e6fdb3d8878982e81d18554457d5fb1726fe477c16077d1d4fb720a8195a02186cc9bf9e5e019b
 DIST php-5.4.10.tar.bz2 11145757 SHA256 c5bffda2154aedd9851c1e9b7da66f6c44c199716bd202054dd5d4a4f5f997e4 SHA512 2d8074dba24776113be208fa354c839168ce138b407ca45ed2334f91a54aff041f34280a87fb9e64ce29638047a48d481c384ffbf19cc0b5eb88aa39aba5beb4 WHIRLPOOL 2f39f62f618d4752031ddba98b95c7d00e7ac71318dd87ed0a1bc162a9b0d8383d376a8038598a0c2c291bb4f8421c84aa74c2eca6e8c173e60a8a51950b7c8c
 DIST php-5.4.11.tar.bz2 11147685 SHA256 d4d095a965f015896d25321842da586076aca5fed4c52939866548ebad5b0fdb SHA512 fa50acb9498c9d33993d5f0722f2f2b32aa4e04a40e8adab47b4aa31943fc6df9c1edbcccffcd897b4c7635dcdf37d417f9b6c05fc3b2962e495b6f0f5776867 WHIRLPOOL fe4bf5f602e38581bb5201a9f50cc7686e5a0154809ececebe7317474ecadd879a8d7f7641ec80649b9970955208539a2f9b98d4bf66446ae333c499ec2df850
 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-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
diff --git a/dev-lang/php/php-5.3.23.ebuild b/dev-lang/php/php-5.3.23.ebuild
new file mode 100644
index 000000000000..23f3c800a289
--- /dev/null
+++ b/dev-lang/php/php-5.3.23.ebuild
@@ -0,0 +1,903 @@
+# 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.3.23.ebuild,v 1.1 2013/03/15 08:55:15 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"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${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/_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"
+
+# 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 +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite2 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="!dev-lang/php:5
+	>=app-admin/eselect-php-0.6.2
+	>=dev-libs/libpcre-8.12[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	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 )
+	sqlite2? ( =dev-db/sqlite-2* )
+	sqlite? ( >=dev-db/sqlite-3.7.7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg media-libs/libpng sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg
+		media-libs/libpng sys-libs/zlib
+	)
+	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+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 )
+	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
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+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
+
+	# Change PHP branding
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-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
+
+	# rebuild the whole autotools stuff as we are heavily patching it
+	# (suhosin, fastbuild, ...)
+
+	# eaclocal doesn't accept --force, so we try to force re-generation
+	# this way
+	rm aclocal.m4
+
+	# work around divert() issues with newer autoconf, bug #281697
+	if has_version '>=sys-devel/autoconf-2.64' ; then
+		sed -i -r \
+			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+			$(grep -l divert $(find . -name '*.m4') configure.in) || die
+	fi
+	eautoreconf --force -W no-cross
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="/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 )
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl )
+	$(use_with curlwrappers curlwrappers )
+	$(use_enable xml dom )
+	$(use_with enchant enchant /usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext )
+	$(use_with gmp gmp )
+	$(use_enable hash hash )
+	$(use_with mhash mhash )
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos /usr)
+	$(use_enable xml libxml )
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt )
+	$(use_with mssql mssql )
+	$(use_with unicode onig /usr)
+	$(use_with ssl openssl )
+	$(use_with ssl openssl-dir /usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql )
+	$(use_enable posix posix )
+	$(use_with spell pspell )
+	$(use_with recode recode )
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp )
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )"
+	if version_is_at_least 5.3.16-r2; then
+		my_conf+=" $(use_with sqlite2 sqlite /usr) "
+		use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	else
+		my_conf+=" $(use_with sqlite sqlite /usr) "
+		use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	fi
+    my_conf+="
+	$(use_with sqlite sqlite3 /usr)
+	$(use_with sybase-ct sybase-ct /usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy )
+	$(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 )
+	$(use_enable zip zip )
+	$(use_with zlib zlib )
+	$(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 )
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm )
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm )"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir /usr)
+	$(use_with truetype t1lib /usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir /usr)
+	$(use_with gd png-dir /usr)
+	$(use_with xpm xpm-dir /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 )
+		$(use_with ssl imap-ssl )"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+	    my_conf+="
+		$(use_with firebird interbase /usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+	    my_conf+="
+		$(use_with ldap ldap )
+		$(use_with ldap-sasl ldap-sasl )"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+	        my_conf+="
+			$(use_with mysqlnd mysql mysqlnd)"
+		else
+	        my_conf+="
+			$(use_with mysql mysql /usr)"
+		fi
+	    my_conf+="
+		$(use_with mysql mysql-sock /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 /usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+	    my_conf+="
+		$(use_with odbc unixODBC /usr)"
+	fi
+
+	if use iodbc ; then
+	    my_conf+="
+		$(use_with iodbc iodbc /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 /usr)"
+		fi
+	    my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite /usr)
+		$(use_with odbc pdo-odbc unixODBC,/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 )
+	$(use_with libedit libedit )"
+
+	# Session support
+	if use session ; then
+	    my_conf+="
+		$(use_with sharedmem mm )"
+	else
+	    my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# 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=/usr --with-pcre-dir=/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=/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/mibs/.index
+
+	SAPI_DIR="${WORKDIR}/sapis"
+
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" || continue
+
+		php_sapi_build "${sapi}"
+		php_sapi_copy "${sapi}"
+	done
+}
+
+php_sapi_build() {
+	mkdir -p "${SAPI_DIR}/$1"
+
+	cd "${WORKDIR}/sapis-build/$1"
+	emake || die "emake failed"
+}
+
+php_sapi_copy() {
+	local sapi="$1"
+	local source=""
+
+	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}.so"
+			;;
+
+		apache2)
+			# apache2 is a special case; the necessary files
+			# (yes, multiple) are copied by make install, not
+			# by the ebuild; that's the reason, why apache2 has
+			# to be the last sapi
+			emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
+			;;
+
+		*)
+			die "unhandled sapi in php_sapi_copy"
+			;;
+	esac
+
+	if [[ "${source}" ]] ; then
+		cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
+	fi
+}
+
+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
+}
+
+#Do not use eblit for this because it will not get sourced when installing from
+#binary package (bug #380845)
+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 /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 /etc/make.conf"
+	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+	# check for not yet migrated old style config dirs
+	ls "${ROOT}"/etc/php/*-php5 &>/dev/null
+	if [[ $? -eq 0 ]]; then
+		ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
+		ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
+	fi
+	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 "The suhosin USE flag now only installs the suhosin patch!"
+		ewarn "If you want the suhosin extension, make sure you install"
+		ewarn " dev-php5/suhosin"
+		ewarn
+	fi
+}
diff --git a/dev-lang/php/php-5.4.13.ebuild b/dev-lang/php/php-5.4.13.ebuild
new file mode 100644
index 000000000000..db53cb148015
--- /dev/null
+++ b/dev-lang/php/php-5.4.13.ebuild
@@ -0,0 +1,854 @@
+# 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.4.13.ebuild,v 1.1 2013/03/15 08:55:15 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/stas/${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/_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="2"
+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"
+
+# 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 +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 )
+	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 )
+	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
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+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
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	local ver=$(get_version_component_range 4)
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-${ver}-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 mysqlnd 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
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# 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_alpha6.ebuild
new file mode 100644
index 000000000000..e73fe70f1589
--- /dev/null
+++ b/dev-lang/php/php-5.5.0_alpha6.ebuild
@@ -0,0 +1,866 @@
+# 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 $
+
+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"
+
+# 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 +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]
+	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
+"
+
+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 )
+	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
+
+	# 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
+
+	#Build shared modules such as libphp5.so with pic support
+	my_conf="${my_conf} --with-pic"
+
+	# 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-libs/389-adminutil/389-adminutil-1.1.10.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.10.ebuild
deleted file mode 100644
index 3589870a176b..000000000000
--- a/dev-libs/389-adminutil/389-adminutil-1.1.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/389-adminutil/389-adminutil-1.1.10.ebuild,v 1.2 2012/05/04 18:35:54 jdhore Exp $
-
-EAPI="2"
-
-inherit libtool eutils
-
-MY_PV=${PV/_rc/.rc}
-MY_PV=${MY_PV/_a/.a}
-MY_P=${P/_rc/.rc}
-MY_P=${MY_P/_a/.a}
-
-DESCRIPTION="389 adminutil"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://port389.org/sources/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/nss-3.11.4
-	>=dev-libs/nspr-4.6.4
-	>=dev-libs/svrcore-4.0.3
-	>=dev-libs/mozldap-6.0.2
-	>=dev-libs/cyrus-sasl-2.1.19
-	>=dev-libs/icu-3.4"
-DEPEND="virtual/pkgconfig ${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		--with-fhs \
-		--disable-rpath \
-		--disable-tests ||die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc README  NEWS
-}
diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.13.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
similarity index 83%
rename from dev-libs/389-adminutil/389-adminutil-1.1.13.ebuild
rename to dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
index ad157808f3f4..143ddf7b1167 100644
--- a/dev-libs/389-adminutil/389-adminutil-1.1.13.ebuild
+++ b/dev-libs/389-adminutil/389-adminutil-1.1.15.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/dev-libs/389-adminutil/389-adminutil-1.1.13.ebuild,v 1.2 2012/05/04 18:35:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild,v 1.1 2013/03/14 17:44:12 lxnay Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit libtool eutils
 
@@ -23,9 +23,9 @@ IUSE="debug"
 COMMON_DEPEND=">=dev-libs/nss-3.11.4
 	>=dev-libs/nspr-4.6.4
 	>=dev-libs/svrcore-4.0.3
-	>=dev-libs/mozldap-6.0.2
 	>=dev-libs/cyrus-sasl-2.1.19
-	>=dev-libs/icu-3.4"
+	>=dev-libs/icu-3.4
+	net-nds/openldap"
 DEPEND="virtual/pkgconfig ${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
@@ -36,6 +36,7 @@ src_prepare() {
 src_configure() {
 	econf $(use_enable debug) \
 		--with-fhs \
+		--with-openldap \
 		--disable-rpath \
 		--disable-tests ||die "econf failed"
 }
diff --git a/dev-libs/389-adminutil/Manifest b/dev-libs/389-adminutil/Manifest
index 0e37eb187327..e773093b8752 100644
--- a/dev-libs/389-adminutil/Manifest
+++ b/dev-libs/389-adminutil/Manifest
@@ -1,3 +1,2 @@
-DIST 389-adminutil-1.1.10.tar.bz2 307582 SHA256 d1cccc6439439716a48ec13b676122457de10c29556640eac0ed096302229428 SHA512 3e2b38451ac32c8fd141d5e21094863bbfa5fa0c5f3897448b03d1bf5503c3b5e5fd7c270c1b578a591783eeb13f274abdafd5caa68595475acc7014bbf0f628 WHIRLPOOL f2c5e7fe753a96078896d4c305db0970cc2857f6993c6608d6c9a251b94eef8b51ca2555ef8e2bc6d058a0bce076ad57e1f7939d51b67d63a91de565824d4a9f
-DIST 389-adminutil-1.1.13.tar.bz2 309981 SHA256 942f3c01a225dbb5c5b5039df58e224e5eead5df8f9be1cf0807d319d196bbae SHA512 37c374562891f4158b1eeb1c10c7eb0873e666d5b7a54500ce25522c055b570f8bdc4f29a2f6268ca304c99af0555f31745f8bdcff5be964a6828c32a23e138b WHIRLPOOL 9ff76178e3764924858e7bb842003cfc21cba371a789938a251a733128641b17d86095c7944d3f15f128fda4000b62d83087eedaa9c47e4ccfd3bfb39897c5fb
 DIST 389-adminutil-1.1.14.tar.bz2 284042 SHA256 d900e28b409cf3f8e5514a86cfad953f7bb53bf474300f006b4bbb021973d890 SHA512 09190bc6a15ace8252ebff117f4ebb0c2f447d021059770479965cce121afce7113e25a29c538107cb45b39de76dffdf37b009c5c79890cbe11c070d95dcb29c WHIRLPOOL b0427b24e5a862883946c22c95e998a9fde646e6f8a30ecca3376a6b376f278af16eb980c773e9bdb766f0692d67034c73cbafd5756743f8511e8d64586b0f46
+DIST 389-adminutil-1.1.15.tar.bz2 283825 SHA256 8ca29db779c87f3c8c41ba793864454b094f41b5cdbf74b9b45967a81eb17958 SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf WHIRLPOOL e68fd5975a2d871e0e2c79580ecc24f48091fc1418ec04816e39799ac17b2495fd3b25c26e7e55626da46210909a8e9ffc1c8d6ad140e3fce0f3665dff0de903
diff --git a/dev-libs/geoip/geoip-1.4.8-r3.ebuild b/dev-libs/geoip/geoip-1.4.8-r3.ebuild
index 2a4efbebb236..ed134b991da0 100644
--- a/dev-libs/geoip/geoip-1.4.8-r3.ebuild
+++ b/dev-libs/geoip/geoip-1.4.8-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-libs/geoip/geoip-1.4.8-r3.ebuild,v 1.11 2013/03/14 07:47:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r3.ebuild,v 1.13 2013/03/14 16:18:09 ago Exp $
 
 EAPI=4
 inherit autotools
@@ -23,7 +23,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="city ipv6 perl-geoipupdate static-libs"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch
new file mode 100644
index 000000000000..8afa2b6b5af6
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch
@@ -0,0 +1,11 @@
+--- scripts/Kbuild.install.orig	2013-03-14 09:33:32.429919267 -0400
++++ scripts/Kbuild.install	2013-03-14 09:33:55.443820061 -0400
+@@ -95,7 +95,7 @@ header:
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
diff --git a/dev-libs/klibc/klibc-1.5.20.ebuild b/dev-libs/klibc/klibc-1.5.20.ebuild
index 78aa6178bda6..489c2f599cb0 100644
--- a/dev-libs/klibc/klibc-1.5.20.ebuild
+++ b/dev-libs/klibc/klibc-1.5.20.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/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.7 2011/06/23 20:19:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.20.ebuild,v 1.8 2013/03/14 14:31:04 mpagano Exp $
 
 # Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
 # This still needs major work.
@@ -91,6 +91,9 @@ src_unpack() {
 	# Fix usage of -s, bug #201006
 	epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch
 
+	# Fix parallel make install
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
 	# Fix infinite loop during build with make 3.82
 	# http://www.zytor.com/pipermail/klibc/2010-November/002786.html
 	epatch "${FILESDIR}"/${PN}-1.5.20-kbuild.patch
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
index f5c97153b3a9..d7e3d2faab67 100644
--- a/dev-libs/mozldap/Manifest
+++ b/dev-libs/mozldap/Manifest
@@ -1 +1,2 @@
 DIST mozldap-6.0.6.tar.gz 708821 SHA256 3a7b94c6698e2acb91a577decee5eb6103f183d6b9833abb169124818ba80d06 SHA512 a3f63b248201c521d962fb48a5374732de23c04920009bf108aabbc71efb83995da04401f095dff58196b5749f8e4cafb2e2b915f1927f7695cb9446e45033df WHIRLPOOL 57991fe8c406a0f5c4d6dc1856ef8f485f8831f5ac3a81c2366a8e03fb9e62a7697f4aed95e62e7fcf308707f2363400dfcc961cff640ef530dbb53f8edd982c
+DIST mozldap-6.0.7.tar.gz 674789 SHA256 ec9884b56b31961d287190323764af7f3b00ad2658d5f3005fa8dc71c637e54c SHA512 bad8005941acaf98f53a60c6c8b697a680e8efe736817b063853ff1f07f052d3257ba7c28f502e37e0c2544fe00d24d31787ccbf892deb43c5481d49ed434b71 WHIRLPOOL 30dc35de03fb99d5f2ae65b10922ee3ec05246ee77f35a37cb80811ae29552d7a347fa13c5ce0a8cb3613fd30584f3fdd6a2cadcfc7cc974a56986bf633767be
diff --git a/dev-libs/mozldap/files/configure.in.patch b/dev-libs/mozldap/files/configure.in.patch
index 232b1ecb64af..6254ef04eb45 100644
--- a/dev-libs/mozldap/files/configure.in.patch
+++ b/dev-libs/mozldap/files/configure.in.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-10-06 11:46:10.378924265 +0300
-+++ configure.in	2009-10-06 11:47:36.154924127 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -42,7 +42,7 @@
  AC_PREREQ(2.12)
  AC_INIT(ldap/include/ldap.h)
diff --git a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
index 2a916cedc842..51bc34048b87 100644
--- a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
+++ b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
@@ -1,6 +1,5 @@
-diff -uNr mozldap.pc.in mozldap.pc.in
---- mozldap.pc.in	2006-10-06 01:01:43.000000000 +0200
-+++ mozldap.pc.in	2007-08-06 21:27:09.000000000 +0200
+--- a/mozldap.pc.in
++++ b/mozldap.pc.in
 @@ -11,6 +11,6 @@
  Name: mozldap
  Description: Mozilla LDAP C SDK
diff --git a/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
new file mode 100644
index 000000000000..525d7259af54
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
@@ -0,0 +1,137 @@
+diff -Nurp c-sdk.orig/configure.in c-sdk/configure.in
+--- c-sdk.orig/configure.in	2011-01-06 12:05:39.000000000 +0000
++++ c-sdk/configure.in	2013-03-14 18:01:19.647224070 +0000
+@@ -42,7 +42,7 @@ dnl ***** END LICENSE BLOCK *****
+ AC_PREREQ(2.12)
+ AC_INIT(ldap/include/ldap.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
++AC_CONFIG_AUX_DIR(./config/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+@@ -86,24 +86,6 @@ DLLFLAGS="${DLLFLAGS=}"
+ HOST_CFLAGS="${HOST_CFLAGS=}"
+ HOST_LDFLAGS="${HOST_LDFLAGS=}"
+ 
+-case "$target" in
+-*-cygwin*|*-mingw*|*-msvc*|*-mks*)
+-    # Check to see if we are really running in a msvc environemnt
+-    _WIN32_MSVC=
+-    AC_CHECK_PROGS(CC, cl)
+-    if test "$CC" = "cl"; then
+-        echo 'main() { return 0; }' > dummy.c
+-        ${CC} -o dummy dummy.c >/dev/null 2>&1
+-        if test $? = 0; then
+-            _WIN32_MSVC=1
+-            CXX=$CC
+-        else
+-            AC_MSG_WARN([$(CC) test failed.  Using normal feature tests])
+-        fi
+-        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+-    fi
+-    ;;
+-esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+@@ -152,18 +134,6 @@ AC_ARG_WITH(mozilla,
+ 	        AC_DEFINE(MOZILLA_CLIENT)
+ 	    fi])
+ 
+-AC_ARG_ENABLE(optimize,
+-    [  --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
+-    [ if test "$enableval" != "no"; then
+-        MOZ_OPTIMIZE=1
+-        if test -n "$enableval" && test "$enableval" != "yes"; then
+-    	    _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+-            _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
+-        fi
+-      else
+-        MOZ_OPTIMIZE=
+-    fi ])
+-
+ AC_ARG_ENABLE(debug,
+     [  --enable-debug(=val)    Enable debugging (debug flags val)],
+     [ if test "$enableval" != "no"; then
+@@ -176,26 +146,6 @@ AC_ARG_ENABLE(debug,
+             MOZ_DEBUG=
+     fi])
+ 
+-AC_ARG_ENABLE(win32-target,
+-    [  --enable-win32-target=\$t
+-                          Specify win32 flavor. (WIN95 or WINNT)],
+-    OS_TARGET=`echo $enableval | tr a-z A-Z`,
+-    OS_TARGET=)
+-
+-AC_ARG_ENABLE(debug-rtl,
+-    [  --enable-debug-rtl      Use the MSVC debug runtime library],
+-    [ if test "$enableval" = "yes"; then
+-	    USE_DEBUG_RTL=1
+-      fi ])
+-
+-AC_ARG_ENABLE(n32,
+-    [  --enable-n32            Enable n32 ABI support (IRIX only)],
+-    [ if test "$enableval" = "yes"; then
+-	USE_N32=1
+-      else if test "$enableval" = "no"; then
+-	USE_N32=
+-      fi
+-    fi ])
+ 
+ AC_ARG_ENABLE(64bit,
+     [  --enable-64bit          Enable 64-bit support (on certain platforms)],
+@@ -261,10 +211,6 @@ dnl svrcore implies both nspr and nss
+        if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
+            if test -n "$_SYSTEM_SVRCORE"; then
+                AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+-           else
+-       	       dnl see if we are being built in the same build tree as svrcore
+-               AM_PATH_INTREE_SVRCORE(../../dist)
+-               dnl failing that, see if we can find svrcore-config or pkg-config svrcore
+                if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
+                    AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+                fi
+@@ -294,9 +240,6 @@ dnl nss requires nspr
+             _SYSTEM_NSS=no
+ 	    fi], _SYSTEM_NSS= )
+ 
+-if test "$_WIN32_MSVC"; then
+-    _SYSTEM_NSS=
+-fi
+ 
+ dnl first, see if user has specified explicit NSPR include and lib paths,
+ dnl of if the user has explicitly disabled the use of nss
+@@ -308,10 +251,6 @@ dnl next, see if user explicitly said to
+ if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
+ dnl nss requires nspr
+    no_nspr=no
+-   if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
+-dnl see if we are being built in the same build tree as nss
+-      AM_PATH_INTREE_NSS(../../dist)
+-   fi
+ dnl failing that, see if we can find nss-config or pkg-config nss
+    if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
+       AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+@@ -348,10 +287,6 @@ fi
+ 
+ dnl next, look for in-tree nspr if user did not specify explicit system nspr
+ if test "$no_nspr" = "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
+-   if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
+-dnl see if we are being built in the same build tree as nspr
+-      AM_PATH_INTREE_NSPR(../../dist)
+-   fi
+ dnl failing that, see if we can find nspr-config or pkg-config nspr
+    if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
+       AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+@@ -1520,9 +1455,7 @@ tools are selected during the Xcode/Deve
+     ;;
+ 
+ *-linux*)
+-    if test -z "$USE_NSPR_THREADS"; then
+-        USE_PTHREADS=1
+-    fi
++    USE_PTHREADS=1
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(_POSIX_SOURCE)
+     AC_DEFINE(_BSD_SOURCE)
diff --git a/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild b/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild
index dc6c9803f6c6..bb3bbba816d3 100644
--- a/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild
+++ b/dev-libs/mozldap/mozldap-6.0.6-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/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.3 2012/07/11 18:16:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.4 2013/03/14 17:08:10 lxnay Exp $
 
 EAPI="2"
 
@@ -51,7 +51,6 @@ src_configure() {
 
 src_install () {
 	# Their build system is royally fucked, as usual
-	cd "${S}"
 	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
 	    -e "s,%prefix%,/usr,g" \
 	    -e "s,%major%,$(get_major_version ${PV}),g" \
diff --git a/dev-libs/mozldap/mozldap-6.0.7.ebuild b/dev-libs/mozldap/mozldap-6.0.7.ebuild
new file mode 100644
index 000000000000..56e9372c5649
--- /dev/null
+++ b/dev-libs/mozldap/mozldap-6.0.7.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.7.ebuild,v 1.1 2013/03/14 17:08:10 lxnay Exp $
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+
+inherit eutils multilib versionator autotools
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 debug +sasl"
+
+COMMON_DEPEND=">=dev-libs/nss-3.11.4
+	>=dev-libs/nspr-4.0.1
+	>=dev-libs/svrcore-4.0.0
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/c-sdk"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.4-pkgconfig.patch
+	epatch "${FILESDIR}"/${P}-configure.in.patch
+	epatch "${FILESDIR}"/nss-m4.patch
+	epatch "${FILESDIR}"/nspr-m4.patch
+	epatch "${FILESDIR}"/${PN}-6.0.6-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--libdir=/usr/$(get_libdir)/mozldap"
+	econf $(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable amd64 64bit) \
+		$(use_with sasl) \
+		--with-svrcore-inc=/usr/include/svrcore \
+		--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
+		--enable-clu \
+		--enable-optimize \
+		${myconf} || die "econf failed"
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%prefix%,/usr,g" \
+	    -e "s,%major%,$(get_major_version ${PV}),g" \
+	    -e "s,%minor%,$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%submin%,$(get_version_component_range 3 ${PV}),g" \
+	    -e "s,%libsuffix%,$(get_major_version ${PV})$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%bindir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%exec_prefix%,\$\{prefix\},g" \
+	    -e "s,%includedir%,\$\{exec_prefix\}/include/${PN},g" \
+	    -e "s,%NSPR_VERSION%,$(pkg-config --modversion nspr),g" \
+	    -e "s,%NSS_VERSION%,$(pkg-config --modversion nss),g" \
+	    -e "s,%SVRCORE_VERSION%,$(pkg-config --modversion svrcore),g" \
+	    -e "s,%MOZLDAP_VERSION%,${PV},g" \
+	   "${S}"/"${PN}".pc.in > "${S}"/"${PN}".pc || die "sed in install failed"
+
+	emake  install || die "make failed"
+	local MY_S="${WORKDIR}"/"${P}"/mozilla/dist/
+
+	rm -rf "${MY_S}/bin/"lib*.so
+	rm -rf "${MY_S}/public/ldap-private"
+
+	exeinto /usr/$(get_libdir)/mozldap
+	doexe "${MY_S}"/lib/*so*
+	doexe "${MY_S}"/lib/*.a
+	doexe "${MY_S}"/bin/*
+
+	#create compatibility PATH link
+
+	 for i in ldapcmp ldapcompare ldapdelete ldapmodify \
+		 	ldappasswd ldapsearch;do
+	 	dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/moz"${i}" || die
+	 # compat for 389-project
+		dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/389-"${i}" || die
+	done
+
+	# move the headers around
+	insinto /usr/include/mozldap
+	doins "${MY_S}/public/ldap/"*.h
+
+	# add sample config
+	insinto /usr/share/mozldap
+	doins "${MY_S}"/etc/*.conf
+
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd "${D}"/usr/$(get_libdir)/mozldap
+
+	#create compatibility Link
+	ln -sf libldap$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so \
+		liblber$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so || die
+	#so lets move
+	for file in *.so; do
+		mv ${file} ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) || die
+		ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file} || die
+		ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) \
+			${file}.$(get_major_version ${PV}) || die
+	done
+
+	# cope with libraries being in /usr/lib/mozldap
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/mozldap" > "${D}"/etc/env.d/08mozldap
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/mozldap.pc
+}
diff --git a/dev-libs/nettle/nettle-2.6.ebuild b/dev-libs/nettle/nettle-2.6.ebuild
index b50c0bc91156..79672e9caebd 100644
--- a/dev-libs/nettle/nettle-2.6.ebuild
+++ b/dev-libs/nettle/nettle-2.6.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/nettle/nettle-2.6.ebuild,v 1.11 2013/03/14 07:49:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.13 2013/03/14 16:19:49 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/4" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp static-libs test"
 
 DEPEND="gmp? ( dev-libs/gmp )"
diff --git a/dev-libs/nss/nss-3.14.3.ebuild b/dev-libs/nss/nss-3.14.3.ebuild
index 84471e4d0a87..36f77500248d 100644
--- a/dev-libs/nss/nss-3.14.3.ebuild
+++ b/dev-libs/nss/nss-3.14.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/dev-libs/nss/nss-3.14.3.ebuild,v 1.10 2013/02/26 10:17:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.11 2013/03/14 19:48:16 vapier Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -88,8 +88,9 @@ nssarch() {
 }
 
 nssbits() {
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
 	echo > "${T}"/test.c || die
-	${!1} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+	${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
 	case $(file "${T}"/test.o) in
 	*32-bit*x86-64*) echo USE_x32=1;;
 	*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
@@ -107,7 +108,7 @@ src_compile() {
 		AR="${AR} rc \$@"
 		RANLIB="${RANLIB}"
 		OPTIMIZER=
-		$(nssbits CC)
+		$(nssbits)
 	)
 
 	# Take care of nspr settings #436216
@@ -140,7 +141,7 @@ src_compile() {
 	XCFLAGS="${BUILD_CFLAGS}" \
 	emake -j1 -C mozilla/security/coreconf \
 		CC="${BUILD_CC}" \
-		$(nssbits BUILD_CC) \
+		$(nssbits BUILD_) \
 		|| die
 	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
 
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild
index a5860e0cc48a..994c81f5f933 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.10.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/pkcs11-helper/pkcs11-helper-1.10.ebuild,v 1.8 2013/03/14 07:49:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pkcs11-helper/pkcs11-helper-1.10.ebuild,v 1.10 2013/03/14 16:20:14 ago Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc gnutls nss static-libs"
 
 RDEPEND=">=dev-libs/openssl-0.9.7
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild
index 5f34b11866e8..27f63d4e324a 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.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/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.13 2013/03/08 17:48:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.14 2013/03/14 16:14:16 jer Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads"
 
 REQUIRED_USE="test? ( static-libs abyss curl cxx )"
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index e6602165e995..3fd077e24cf3 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,7 +1,6 @@
 DIST gcl-2.6.7.tar.gz 8193901 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 SHA512 6af54cebae121c482fd465214d3959041df447139eea6a6a3547a6fdddb28ff4c426fbf185f118085a179235e75a790f769bb4da167620c9db87f9b7a8670247 WHIRLPOOL 5470dc588a2cf5638db4c0a25e6a3b237feb7b29937468dc9da2f1e2eb3f7fab44e9708bf303f194b59f603d74806181beced3abbd67c29dd062ab1acbb6c082
-DIST gcl-2.6.8_pre20090419.tar.bz2 15688731 SHA256 63cf13ca6a9f1d2b1167385f50665d550e0f63dce5a99bb7a88191ae480e8b5b SHA512 bbe2f4ab1d5eb39003f5fd6d85cfdd35585b6c53cd90c212ff7c27d5b90ccfe72f1606aadb532195b6395f467b2b6cd92e96748c6dc407ce3af79453210f7780 WHIRLPOOL 86850eb1561cb44f4024e53faa35cfa59372addf415b1fbca1952d1a08730e50bf574fd0ecdfaac963c8fa0d8430e5929352370378ce527d5ec651c6e2ff64d0
-DIST gcl-2.6.8_pre20111221.tar.bz2 4344690 SHA256 abd7099bc41f1a71106b56855315524ef68914909384370c71f65c929b4df5ed SHA512 4c22cbb1cd472cefe000e16768536c9a11df9e6f5debff3596446aef095a94a920f62c8370454f3bc657c2594d3b7759f3fe035b9103af96b390ef551948d340 WHIRLPOOL 74721587ab374594eea34c375ecaa6254a59a3f41fecaf205d0b06f3818e597205412b5b31e640732092e0675a5873900b61f9db22f83b4d58a8142b49a4871b
 DIST gcl-2.6.8_pre20120805.tar.bz2 4350186 SHA256 61115c9e0bcda847b1ca58b9bcef629c6c1c55513c14b90b35b06b7ef7ef1a2f SHA512 5dc6c0083f9995f5387800fdeccfeb144b6887512bcc4b68e688d651182d811a2223f835b05b03dd1314886652d1d1adf76c87cdbdc5172b92cf8a4fc587044e WHIRLPOOL 01de8aad62d60de1ffd7b4ddb2d9c000d4d10cb4a58ea1659fa52f5b907e2a851b135005fc6b48fdf2f1a83a179d1e0f18158a1532dd48a0417bbc11968d3d63
+DIST gcl-2.6.8_pre20130314.tar.bz2 4428151 SHA256 1aa08fe2d1aad5313daa8895f0986e5e19ddef58a865470b1d9fb6449caa6adf SHA512 909a9b0b73230c67ac06953162daa72b4cae8903e5adcc3c6863ff2306f89ad35d74ac645fdc0515eace53b9b6a635bbfc6b37cb4b8eac656fed5465247b3641 WHIRLPOOL 5d16c165f598c8aadc8659e9324c1d6bd60ba5eef56f7d9ff35c137a0d07ac6b0d813d664622b765ecae506ff52f9267237f6602c9ba83ead78ef7ec5e5f8df7
 DIST gcl.info.tgz 678468 SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57 SHA512 ebeb293f12db145e9a3a0802946314cd3e3bdeaefb53ca66ee69423417f7a93e3a84571d9f6c65f019ce09c93559d229da642feb722d193952f462402973bab8 WHIRLPOOL dd1ed04c312a995a6818d934220e025c80a12c05c01b8f2124d809157f0bd9d52db145021602736e4cdd3dde623098ef28b7eda5b9912819514397d5dd71a649
 DIST gcl_2.6.7-32.diff.gz 14463119 SHA256 5041b40bd96a0c73b70022831e6a697e00b64f572bca66d5a6c24978a879678e SHA512 aad44b6ee51a2598e86538905f3c00d253fbbf7c8f51452f2ece4ba060712f622a76814a2434e39d1585b5ea4b032a32c0601572dc737cd9b5852658897c2b6d WHIRLPOOL 6548733a982f2df96233e1542364902e4bdd739dba73d970bf70e9c9c78b3839cc9d83ede6653d5e686d421d80acf96e2e597a6790b95d2f2ae2b4818cf3bc1e
 DIST gcl_2.6.7-34.diff.gz 14493530 SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65 SHA512 5e96c9498c532cd095ae320db06f5accb1173dd4bade552e1a1b9eecf2f4848bf7064a3b7a77019eefc5cb58ea42082a5c8da2fad0eb8b150567b233fc4d2305 WHIRLPOOL 694860592a6504e4ed40e0f32a67d5d9cb0128a391ff3440b1196ff21a685faff5b55298168ac42089abf4f83f0fa4d950d98e984aa57a9795b171fac59061fa
diff --git a/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild
deleted file mode 100644
index c439c04a6045..000000000000
--- a/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20090419.ebuild,v 1.3 2012/06/07 18:59:25 zmedico Exp $
-
-EAPI=1
-
-#removing flag-o-matic results in make install failing due to a segfault
-inherit elisp-common eutils flag-o-matic
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="+ansi debug doc emacs +readline tk X"
-
-# See bug #205803
-RESTRICT="strip"
-
-RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	virtual/latex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
-	# option parsing, it may break.
-	epatch "${FILESDIR}"/${P}-configure.patch
-}
-
-src_compile() {
-	local myconfig=""
-	if use tk; then
-		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
-	fi
-	myconfig="${myconfig} \
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
-		--enable-dynsysgmp \
-		--disable-xdr
-		$(use_enable readline) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable ansi)"
-
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig}
-	make || die "make failed"
-	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
-}
-
-src_test() {
-	local make_ansi_tests_clean="rm -f test.out *.fasl *.o \
-	*.so *~ *.fn *.x86f *.fasl *.ufsl"
-	if use ansi; then
-		cd ansi-tests
-
-		( make clean && make test-unixport ) \
-		|| die "make ansi-tests failed!"
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| ../unixport/saved_ansi_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
-		| ./bootstrapped_ansi_gcl
-
-		( ${make_ansi_tests_clean} && \
-		echo "(load \"gclload.lsp\")" \
-		| ./bootstrapped_r_ansi_gcl ) \
-		|| die "Phase 2, bootstraped compiler failed in tests"
-
-	else
-
-		ewarn "Upstream provides tests only for ansi-gcl."
-		ewarn "Please emerge with ansi USE flag enabled"
-		ewarn "if you wnat to run the ansi tests."
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_gcl/g \
-		| unixport/saved_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_r_gcl/g \
-		| ./bootstrapped_gcl
-
-		for x in "./bootstrapped_r_gcl" "unixport/saved_gcl" ; do
-			echo "(compiler::emit-fn t)" \
-				| ${x} \
-				|| die "Phase 2, bootstraped compiler failed in tests"
-		done
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
-
-	dosed /usr/bin/gcl
-	fperms 0755 /usr/bin/gcl
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-	doman gcl.1
-	doinfo info/*.info*
-
-	if use emacs; then
-		mv "${D}"usr/share/emacs/site-lisp/${PN}/add-default.el "${T}"/50${PN}-gentoo.el
-		elisp-site-file-install "${T}"/50${PN}-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"usr/share/emacs
-	fi
-
-	if use doc; then
-		mv "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc* "${D}"usr/share/doc/${PF}/
-	else
-		rm -rf "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.8_pre20111221.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild
similarity index 94%
rename from dev-lisp/gcl/gcl-2.6.8_pre20111221.ebuild
rename to dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild
index 6dc9e7a46f0e..54c66b8dd6a9 100644
--- a/dev-lisp/gcl/gcl-2.6.8_pre20111221.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.8_pre20130314.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/dev-lisp/gcl/gcl-2.6.8_pre20111221.ebuild,v 1.2 2012/06/07 18:59:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild,v 1.1 2013/03/14 12:06:29 grozin Exp $
 
-EAPI=3
+EAPI=5
 
 #removing flag-o-matic results in make install failing due to a segfault
 inherit elisp-common eutils flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+ansi debug doc emacs +readline tk X"
 
 # See bug #205803
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-1.64
 	>=sys-devel/autoconf-2.52"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-default-el.patch
-}
-
 src_configure() {
 	local myconfig=""
 	if use tk; then
@@ -105,7 +101,6 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
 
-	dosed /usr/bin/gcl
 	fperms 0755 /usr/bin/gcl
 
 	dodoc readme* RELEASE* ChangeLog* doc/*
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild
index 26f644a719ec..a9bcead56d45 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.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-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild,v 1.1 2013/02/19 16:30:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.840.0.ebuild,v 1.6 2013/03/14 16:19:22 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 DEPEND="
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild
index 6e3c63e24ae4..e04f523283e5 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.520.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-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild,v 1.2 2013/02/19 04:59:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.520.0.ebuild,v 1.7 2013/03/14 16:19:01 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Net::SSLeay module for perl"
 
 LICENSE="SSLeay"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/openssl"
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild
index 35d842e89da1..c212eee4bc19 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.13.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-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild,v 1.4 2013/03/12 18:28:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.13.0.ebuild,v 1.5 2013/03/14 15:13:52 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library."
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/xapian-1.2.9
diff --git a/dev-php/adodb/adodb-5.17-r1.ebuild b/dev-php/adodb/adodb-5.17-r1.ebuild
index dc2b96dc844a..f6fe98e97569 100644
--- a/dev-php/adodb/adodb-5.17-r1.ebuild
+++ b/dev-php/adodb/adodb-5.17-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-php/adodb/adodb-5.17-r1.ebuild,v 1.5 2013/03/14 07:46:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.17-r1.ebuild,v 1.8 2013/03/14 13:22:45 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
new file mode 100644
index 000000000000..20f7ed3170d9
--- /dev/null
+++ b/dev-php/pecl-amqp/Manifest
@@ -0,0 +1 @@
+DIST amqp-1.0.9.tgz 40693 SHA256 82d3dd875261ae0a983c8a24092cc14aebb291b584a7f0ad233df920e2cb4f0f SHA512 52db33f4e938d056b1e3c19973a05276d5dbf4c50decbf248783277b1478a99c855698810b9de5ae0b69aafc05899f3e212613ef817ad2ae046d0f156ba3e4c2 WHIRLPOOL f1dcf9ed0006a2a88edec8a82d4823051fc6de041d9951363b4d5a7133d5470de846827e241aa1974b9a33986359c58244a4a6f076f14bcf63aed9be31c572e6
diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml
new file mode 100644
index 000000000000..928b80f50abc
--- /dev/null
+++ b/dev-php/pecl-amqp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.0.9.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.0.9.ebuild
new file mode 100644
index 000000000000..3e0e11adb1fe
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.0.9.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/dev-php/pecl-amqp/pecl-amqp-1.0.9.ebuild,v 1.1 2013/03/14 18:52:16 olemarkus Exp $
+
+EAPI=4
+
+USE_PHP="php5-3 php5-4"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="net-libs/rabbitmq-c"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
index 75ad4884dffa..66cf3ff40e89 100644
--- a/dev-python/astng/Manifest
+++ b/dev-python/astng/Manifest
@@ -5,3 +5,4 @@ DIST logilab-astng-0.22.0.tar.gz 101227 SHA256 af36daf5e7f3acdbc1aff58d5400c3402
 DIST logilab-astng-0.23.1.tar.gz 103664 SHA256 99788c4495056c3ea54d24892afc69e4d1ccba1f4018e89a3f9b806cb6bb0028 SHA512 4acbeab92c514470345b00ac8edd8dc4ae149fd06632f9fae287fc63acdd72688c3c4b781c0f51a330a9b9e20c47717e5ab7f2b5139b5f4636c8d9dd911ca221 WHIRLPOOL 982124f212afd1e5f405157750664b4fe99a0e1b171b087105440b93534574eb112185fc0234bc538dfb7a955080b2491cd65b2f28142407eeb3fcf8ddb4079d
 DIST logilab-astng-0.24.0.tar.gz 104818 SHA256 7efb907c8917f9291cdc3848a031bdd1969043f9bbe7e10665c03fa5041b3a03 SHA512 caa840b346308cdc2f8a7fce3bfbbb7007ffd92b3321d540229d35bf2b7219063647f0eb6368446360350463d24ee429cc5a554163513c024fe86524a6704aba WHIRLPOOL 0d95faca4551e86618ab14fc548fd0dbdb744c639260871b3ccb8262eee06f716d824dbacb34bed6c54e9d5fd3bbb7e9b038a5fc845f25c60b795a8b2aa94150
 DIST logilab-astng-0.24.1.tar.gz 106826 SHA256 1ca0249f4d5459e61951370376e0a3892f4346713b10090d29df9a7be71e5721 SHA512 c05317f3febb943bc4a0865b520a1e70ddf584fd838931e43a7910a25d7c2c68a952ed3a9a6d58ad4a5334bb02c9e9259877842d2cc332abe69f62c88a61f300 WHIRLPOOL e434774ebd4905d170993bef2909a8e1a7244f8a23eea4314c5283294a0659e85c7799a027e5b82e9e63fea166333a1e2845f4d15e1021bdfd1023df0d50d436
+DIST logilab-astng-0.24.2.tar.gz 104617 SHA256 0fe39057ce6e98426f62d22e013ad50305f2dea3fd1282ae4245f898f052d981 SHA512 a13d9686d2a481b6e4f666cd115635c232524da6a56f1c8629384caaf2f41cc5b0224c6f40f6aaaf3d492f3dddd891a4007c16b81abd6f13f34867f8f04734a1 WHIRLPOOL 582b35b5e6d5aaa95acd347a28d410af0a76610f760b2fe9d0775b5e717c1b24402b649db51cf259f102bebe5962ac967bdeee41457b1c9844b5efa722691d64
diff --git a/dev-python/astng/astng-0.24.2.ebuild b/dev-python/astng/astng-0.24.2.ebuild
new file mode 100644
index 000000000000..458c38d4eb8d
--- /dev/null
+++ b/dev-python/astng/astng-0.24.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.24.2.ebuild,v 1.1 2013/03/14 16:34:13 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="http://www.logilab.org/project/logilab-astng http://pypi.python.org/pypi/logilab-astng"
+SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND=">=dev-python/logilab-common-0.53.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep python2*)] )"
+
+S="${WORKDIR}/logilab-${P}"
+
+python_test() {
+	# Make sure that the tests use correct modules & paths, for now at least
+	# python3 currently doesn't pass all tests on std testing
+
+	cd "${BUILD_DIR}"/lib || die
+	[[ "${EPYTHON:6:1}" == '3' ]] && return
+	pushd logilab/astng > /dev/null || return 1
+	pytest $(find . -name test) || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || return 1
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
+}
diff --git a/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild b/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild
index b61c302b7738..8f2e18e2063d 100644
--- a/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.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/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild,v 1.3 2013/02/20 09:05:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.1.1-r1.ebuild,v 1.5 2013/03/15 11:56:14 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 # API docs generated with epydoc, which is python2-only
 REQUIRED_USE="doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) )"
diff --git a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild b/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
index cc01f4868855..9d756c9aea4c 100644
--- a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.6.7-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/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.3 2013/01/16 02:42:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.4 2013/03/15 09:33:33 patrick Exp $
 
 EAPI=5
 
@@ -22,7 +22,8 @@ IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/django"
+	dev-python/django
+	test? ( dev-python/nose )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
index 0111e1f9a721..079838ffae68 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-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/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.2 2012/12/17 19:55:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.7 2013/03/14 16:17:29 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex tk"
 
 DEPEND=""
diff --git a/dev-python/paste/paste-1.7.5.1-r1.ebuild b/dev-python/paste/paste-1.7.5.1-r1.ebuild
index 2339ccabfdc8..f86529ae1693 100644
--- a/dev-python/paste/paste-1.7.5.1-r1.ebuild
+++ b/dev-python/paste/paste-1.7.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-python/paste/paste-1.7.5.1-r1.ebuild,v 1.1 2013/02/12 23:37:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.2 2013/03/15 04:12:07 patrick Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-	"${PYTHON}" setup.py build_sphinx || die
+	"${PYTHON}" setup.py build || die
 }
 
 python_test() {
diff --git a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
index aa428a8fad89..95074058e2ac 100644
--- a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.2.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/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.1 2012/12/16 20:57:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.3 2013/03/15 11:56:44 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="test? ( cairo )"
diff --git a/dev-python/urwid/urwid-1.1.1-r1.ebuild b/dev-python/urwid/urwid-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..96e0fc40e897
--- /dev/null
+++ b/dev-python/urwid/urwid-1.1.1-r1.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/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.1 2013/03/14 19:25:55 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Urwid is a curses-based user interface library for Python"
+HOMEPAGE="http://excess.org/urwid/ http://pypi.python.org/pypi/urwid"
+SRC_URI="http://excess.org/urwid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc examples test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/twisted )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
+
+python_compile_all() {
+	if use doc ; then
+		if [[ ${EPYTHON} == python3* ]] ; then
+			2to3 -nw --no-diffs docs/conf.py || die
+		fi
+		cd docs
+		sphinx-build . _build/html || die
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]] ; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && dohtml -r docs/_build/html/*
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..1a3d9cbe4455
--- /dev/null
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.3-r1.ebuild,v 1.1 2013/03/14 17:04:09 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
+HOMEPAGE="http://pypi.python.org/pypi/yolk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools
+	dev-python/yolk-portage"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	if use examples; then
+		docinto examples/plugins
+		dodoc -r examples/plugins/*
+	fi
+}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 4701d4ec68fa..e950838f438a 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,2 +1,3 @@
 DIST mail-2.3.3-git.tar.gz 668618 SHA256 1adb276d2de312bd95fbe5552b9df2c3b802eedbdaaf25dbbbcd4cf45b5951e0 SHA512 b6478f9b63fe6855ff857443aab718ff9a66b6b603aa203f6cf6cc2a32ccd3c3b52d0ce8697c84285a209fd2cf30c31e12addffe1b7eb5326c806553817f0523 WHIRLPOOL 7a8f020c89d38343ce6305a6f926f709298093198a285dd5d7ae1d9f7bd728e19c3119abc293ede81aee63dde254cfa387972cffdc5df48c887fe7102a0585e1
 DIST mail-2.4.4.tar.gz 677102 SHA256 2195c789c5178388f3ed5094ddad93683bac601fe3d9ecb13a3a9f9e7d97ba87 SHA512 aeb0075950d5938e1a972c9195ec836160c6c9f600aaa2c0e78c715aabf4000074bde311cc0c87a1f3edf237e5a6835299c23f3b903541a043134139472eae82 WHIRLPOOL e75e9e62602ca13658e16d096cc48921307c9035e1b42700eaee77d38c4f10891731d34e0984c8eb98d2d30320ac87fb64b5cf03bc1c88eeb11be5d172a594d8
+DIST mail-2.5.3-git.tar.gz 828104 SHA256 6608c1c5dd9fc58f8a167c834d14d272dfb721eac7356983cb9f64ce934048ab SHA512 210e8eb7c10b8636747980fbaef09a444a80fdba38fced326e6f9fcab6dc41e99a685c3a1472f887f22d875f4a5691364246e4975efe2a608cec657e3ad67bcf WHIRLPOOL 38ebe1ed453c2e01d22e170bf24f527aab65ef6a65c74448e6d9888d0b49a10bde406a1f9824806b42569c118b9efcc1f1a2ab598c4517f665ca21fb40de725f
diff --git a/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch b/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch
new file mode 100644
index 000000000000..61280fb0c9d4
--- /dev/null
+++ b/dev-ruby/mail/files/mail-2.5.3-utf8-ruby18.patch
@@ -0,0 +1,21 @@
+commit 819c4767cea5c8523938b27a29e48a7ab82b503d
+Author: kennyj <kennyj@gmail.com>
+Date:   Fri Nov 30 00:22:08 2012 +0900
+
+    Fix build on Ruby18. We should specify endian for UTF16/32.
+
+diff --git a/lib/mail/version_specific/ruby_1_8.rb b/lib/mail/version_specific/ruby_1_8.rb
+index cb2bae6..f7c65bb 100644
+--- a/lib/mail/version_specific/ruby_1_8.rb
++++ b/lib/mail/version_specific/ruby_1_8.rb
+@@ -107,6 +107,10 @@ module Mail
+       case encoding.upcase
+       when 'UTF8'
+         'UTF-8'
++      when 'UTF16', 'UTF-16'
++        'UTF-16BE'
++      when 'UTF32', 'UTF-32'
++        'UTF-32BE'
+       else
+         encoding
+       end
diff --git a/dev-ruby/mail/mail-2.5.3.ebuild b/dev-ruby/mail/mail-2.5.3.ebuild
new file mode 100644
index 000000000000..f42733504fbf
--- /dev/null
+++ b/dev-ruby/mail/mail-2.5.3.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-ruby/mail/mail-2.5.3.ebuild,v 1.1 2013/03/15 07:01:02 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem versionator
+
+GITHUB_USER="mikel"
+COMMIT="e8ec8d53c4f5c889691630d0422b9dc044762f1b"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${P}-utf8-ruby18.patch" )
+
+ruby_add_rdepend "
+	>=dev-ruby/i18n-0.4.0
+	>=dev-ruby/mime-types-1.16
+	>=dev-ruby/treetop-1.4.8"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+
+	# Fix up dependencies to match our own.
+	sed -i -e 's/~>/>=/' mail.gemspec || die "Unable to fix up dependencies."
+}
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index 7c8b744ddcb0..2a78b9b50618 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,3 +1,2 @@
-DIST hevea-2.00.tar.gz 411092 SHA256 bb32c6207a33685eca37330794649c654837f8d795010e7b1385619320833cbf SHA512 d24e35deafbb04b3a6f7248950a02d1dbb2d92fc7e8b7b69f4395e0265af0a09832163043108fc28c5ea166eacae42544128ef9395c300b5d3273861a386800f WHIRLPOOL b1e31d41e56ba4049a79c7e639c058a52d8ac1a2261d8547668adff3ba04aa86545b81323d7a88f96c9b7778ff4338daff3f3ab3e068675030dfdacfb8d62ed4
 DIST hevea-2.02.tar.gz 410332 SHA256 406683222913713ed3b81c153d1a84c0347f6e49181bb178636877c4f410fd6c SHA512 2e68a6f6aa046839e63fb64cfd8adbb14f4f6642c16af72f104a2f8048310951bf9e66295b3ad6cedd4eafd20db7183ebecb27859ab0de8d8863e60aa5e26d78 WHIRLPOOL 9bdd2c03fab710ddb73b4083ff0dd6b279d7348b433b5475d4e9f0fdf5419dd864b127bcc93d11a2c59e75a669fdb5863fae080eff537808fc827c05247880ab
 DIST hevea-2.03.tar.gz 385865 SHA256 d927f538b47935f8b6cf34a817071195dfeb5da05debfd55ab47253c7868dab5 SHA512 dcb30992ff74935d92e6fdc4710bf8ee3b555e094673557e697531c3bff7155d6577349e2d80de21180abe5ea8d0ac1b4eaffcf217736477a33d8895ebd1aacc WHIRLPOOL 9d5c7a8cfb3f2fcffb90c09c0bfb43d50c0a7cd4cad8073de2b9640365e16613b202c76e8b35993f1a5dcecd7a215091597587a854fc8a8ff742ad0e04656e8e
diff --git a/dev-tex/hevea/hevea-2.00.ebuild b/dev-tex/hevea/hevea-2.00.ebuild
deleted file mode 100644
index 7795e40d15c2..000000000000
--- a/dev-tex/hevea/hevea-2.00.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.00.ebuild,v 1.5 2012/12/29 14:35:15 ago Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
-	if use ocamlopt; then
-		emake PREFIX=/usr || die "Failed to build native code binaries"
-	else
-		emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.02.ebuild b/dev-tex/hevea/hevea-2.02.ebuild
index 5ce759373e81..e9006fbf1ff5 100644
--- a/dev-tex/hevea/hevea-2.02.ebuild
+++ b/dev-tex/hevea/hevea-2.02.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/hevea/hevea-2.02.ebuild,v 1.5 2013/03/12 18:31:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/hevea/hevea-2.02.ebuild,v 1.6 2013/03/14 12:45:29 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 802031711df2..58dcd7fecfed 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,3 +1,4 @@
 DIST cloc-1.55.pl 309536 SHA256 8dd6893c450f3be6a461ef2068cd853181eb21015b3cfa92c360dc2b4b897479 SHA512 05c84c730c1222fd544debeef985f0b7bf370a3d0c62766c3b606c27f8320bb6429700e5e51a92770249876b263447213e1eb956957255a0ab4863ef57ec5c6d WHIRLPOOL f022749f511ea71f4432b0b03b7889e06b48ac1259fd7a309afbca5ab6f27079c3f78bc0e079b800f09c4b60de6d6b69876dc6d23e3162e62ea39fcbddb37d6c
 DIST cloc-1.56.pl 320786 SHA256 f525906def12195df1ed61a6aa0584c401b10509c7770900b31026c91868acd2 SHA512 6bbd74c79bc6c905bc20be1d5d4b75efdb01d5b395e5f163e0ea1358b5da2b41ae7c7f27fc0487a37c3144fd3ac81d7242e31245994e257bd09e313837f50979 WHIRLPOOL 57ae1f883446668da9d0c42ba590c42482cdc04067c4a2e6fdb4c9815121e7e0c78b41b8bdf4a00e5b51127e7818f0ff80767fbc52b3713ec60e3d087f20ab68
+DIST cloc-1.58.pl 336446 SHA256 4a484496ee05be4e5b3a6bef8f3337d7f6733c731bbc58dc7d00f5c3eb714f68 SHA512 5f189545e97d132888948a8a7f60dc551e4a0700af4a37c949f5311da326d9ada6780f2faee7fbb4b02545f9fa3afe2caf01c7bf3a8eedbde0155ab797b29f55 WHIRLPOOL b74cfc99159101cd465a9721893719e81f7caa2156848b52ad3e0b2f6879ff1b8711a9f904a64690d29ffe813cfb45b059f9ecfa3628a62da310d7239af4d321
 DIST cloc.1.pod 12468 SHA256 0e6890acd5836ec43aabed1476e2a1417ea4d454968297c68c1b782e818f979b SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659 WHIRLPOOL 25d9b78a7a0fb88f2ff1192afd8cd5963ab61b06883874b8339a1d4fefbeac4b080d413107f06b34975cd2e7ea92e4313767f2c2aebf39e21ef7cd408bf152ae
diff --git a/dev-util/cloc/cloc-1.58.ebuild b/dev-util/cloc/cloc-1.58.ebuild
new file mode 100644
index 000000000000..cada8eba8660
--- /dev/null
+++ b/dev-util/cloc/cloc-1.58.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cloc/cloc-1.58.ebuild,v 1.1 2013/03/15 03:44:04 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="http://cloc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/regexp-common
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_prepare() {
+	pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+}
+
+src_install() {
+	doman ${PN}.1
+	newbin "${DISTDIR}"/${P}.pl ${PN}
+}
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 2b135d8b2092..0317f97d847c 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,2 +1,2 @@
 DIST mdds_0.6.1.tar.bz2 128115 SHA256 4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 SHA512 9b53ddfe5330f276a3e3d9febf6e6749957915f2997cd81059f060221f2dcb6ba53576f9b3b01d10289143e98a0f80bcee29654bebc3c96ddf9b0a32c411dfd2 WHIRLPOOL 51b60a028b1f75f9167903aa0395876e7a8c7c96d21d619aca280ac485197b387dca55f55c61c98f7203b16ad1989c6d2c4eab8f8eb113cbec8af929ddafbb63
-DIST mdds_0.7.0.tar.bz2 137114 SHA256 092b8ab9cdd4738f46f3a34fb6ecf44a81049910e545eabe031bd0e1b7261c88 SHA512 de971443715cb70b4951473f713e78ad9f8d2518e24f0e38c67361a4802230ea3d7281597d8aa1e104da2dd2ad064686254b469847141761025c54a2fe89bc2a WHIRLPOOL 304e07067d4fd3da1ec4ec11f7de80a845e6814c68669376b9d3e09a886b16d84745438c20bc016318d51944d6a4003b22809c7c4d44aab900a09bae2b06efbb
+DIST mdds_0.7.1.tar.bz2 134376 SHA256 fe7bc2805bb1b74cac821723fd1d50bcc2a0ecaa5445262262765e02eae9197e SHA512 0a501af19280b34f038e31e5a6a0625631a95328cba7a2e2e4c308eb0ea2ead6c0aa4db90bc65897ae1319df89ede124931b4ab7902368ed2ca9d1fff4c883ef WHIRLPOOL a24ed89d6b30812885f2359d240b09074949021e060a7ca8cbf55286b9fd4b387f4b0078282b0430f53998c43ffade261b26472c22af12b806a5edb1bfcd4c85
diff --git a/dev-util/mdds/mdds-0.7.0.ebuild b/dev-util/mdds/mdds-0.7.1.ebuild
similarity index 86%
rename from dev-util/mdds/mdds-0.7.0.ebuild
rename to dev-util/mdds/mdds-0.7.1.ebuild
index 973440c91afe..dec2e263395e 100644
--- a/dev-util/mdds/mdds-0.7.0.ebuild
+++ b/dev-util/mdds/mdds-0.7.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/dev-util/mdds/mdds-0.7.0.ebuild,v 1.3 2013/03/07 08:18:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.7.1.ebuild,v 1.1 2013/03/14 20:02:11 scarabeus Exp $
 
 EAPI=5
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
new file mode 100644
index 000000000000..37541f4c586d
--- /dev/null
+++ b/dev-util/umockdev/Manifest
@@ -0,0 +1 @@
+DIST umockdev-0.2.1.tar.xz 363652 SHA256 38972c7b8f2bf8acc28f13a6ed99d56557204600400288acdda69b05b25573a4 SHA512 a65e5dc6cc8d7fe0948f07e34379050a0b3640523f7f60393d81a2e1615bb4029a3c107f29b26425df59c5e34e9f69a5f3bf2683608e787b5e9b1ae70807dbb5 WHIRLPOOL 23a195bbf54dd3a4978718b817be6938c371793d779bace18c01b855bf7d63a78a19682cdf82156d0a973d589e3d52fd5a828ac92ee396f02d24f63385af5df5
diff --git a/dev-util/umockdev/files/umockdev-0.2.1-make.patch b/dev-util/umockdev/files/umockdev-0.2.1-make.patch
new file mode 100644
index 000000000000..fcaa42729df3
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.2.1-make.patch
@@ -0,0 +1,38 @@
+--- umockdev-0.2.1/Makefile.am
++++ umockdev-0.2.1/Makefile.am
+@@ -41,21 +41,7 @@
+ # use this for running Python tests
+ PYTEST = $(TESTS_ENVIRONMENT) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning
+ 
+-AM_CFLAGS = 	\
+-	-Werror=missing-prototypes	\
+-	-Werror=strict-prototypes	\
+-	-Werror=nested-externs		\
+-	-Werror=pointer-arith		\
+-	-Werror=implicit-function-declaration \
+-	-Werror=pointer-arith		\
+-	-Werror=init-self		\
+-	-Werror=format-security		\
+-	-Werror=format=2		\
+-	-Werror=missing-include-dirs	\
+-	-Werror=unused-variable		\
+-	-Werror=return-type		\
+-	-Werror=uninitialized		\
+-	-Wall
++AM_CFLAGS = -Wall
+ 
+ # this allows us to use regexp literals without warnings
+ AM_VALAFLAGS = --enable-experimental
+@@ -82,9 +68,9 @@
+ 
+ # this is an LD_PRELOAD library, so remove static library and libtool wrappers
+ libumockdev-preload-install-hook:
+-	rm $(DESTDIR)$(libdir)/libumockdev-preload.a
+-	rm $(DESTDIR)$(libdir)/libumockdev-preload.so
+-	rm $(DESTDIR)$(libdir)/libumockdev-preload.la
++	rm -f $(DESTDIR)$(libdir)/libumockdev-preload.a
++	rm -f $(DESTDIR)$(libdir)/libumockdev-preload.so
++	rm -f $(DESTDIR)$(libdir)/libumockdev-preload.la
+ 
+ libumockdev-preload-uninstall-hook:
+ 	rm $(DESTDIR)$(libdir)/libumockdev-preload.so.*
diff --git a/dev-util/umockdev/metadata.xml b/dev-util/umockdev/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/dev-util/umockdev/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>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/umockdev/umockdev-0.2.1.ebuild b/dev-util/umockdev/umockdev-0.2.1.ebuild
new file mode 100644
index 000000000000..fa715f637ece
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.2.1.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-util/umockdev/umockdev-0.2.1.ebuild,v 1.1 2013/03/15 01:09:15 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/udev[gudev]
+	>=dev-libs/glib-2.24:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-make.patch )
+AUTOTOOLS_AUTORECONF=1
diff --git a/kde-misc/magneto-kde/Manifest b/kde-misc/magneto-kde/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/kde-misc/magneto-kde/Manifest
+++ b/kde-misc/magneto-kde/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/kde-misc/magneto-kde/magneto-kde-183.ebuild b/kde-misc/magneto-kde/magneto-kde-183.ebuild
new file mode 100644
index 000000000000..edf8d8fb74bf
--- /dev/null
+++ b/kde-misc/magneto-kde/magneto-kde-183.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/kde-misc/magneto-kde/magneto-kde-183.ebuild,v 1.1 2013/03/14 18:26:58 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+DESCRIPTION="Entropy Package Manager notification applet KDE frontend"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+RDEPEND="~app-misc/magneto-loader-${PV}
+	kde-base/pykde4
+	dev-python/PyQt4[dbus]"
+DEPEND=""
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-kde-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/entropy/magneto/magneto/kde"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/magneto/magneto/kde"
+}
diff --git a/mail-client/thunderbird/thunderbird-17.0.4.ebuild b/mail-client/thunderbird/thunderbird-17.0.4.ebuild
index bd6d6d65dd72..6f6c6191d577 100644
--- a/mail-client/thunderbird/thunderbird-17.0.4.ebuild
+++ b/mail-client/thunderbird/thunderbird-17.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/mail-client/thunderbird/thunderbird-17.0.4.ebuild,v 1.4 2013/03/14 07:16:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-17.0.4.ebuild,v 1.6 2013/03/14 15:12:04 ago Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -31,7 +31,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gconf +crypt +jit +ipc ldap +lightning +minimal mozdom selinux"
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 392ef39167aa..53936f082f48 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1 +1,2 @@
 DIST nomacs-0.4.0-source.zip 1112306 SHA256 3432d55d4de23c365912f0c796deb2e25184efdbd8a81304f15914e3fe4da2c7 SHA512 4ca8b2fb982dcdde7e164e2541804c931cecb24e93cbfbc1c2ff2ab2a49d19b24bf82d4f0d5acebc050ef9533b98a268cfc1ccb8bf40a428bd245d38ea53b561 WHIRLPOOL 00ed7bcf75c8533bc0cd26dda782a392115efd25979a7c0eb174f326191e7a5e74c2092a80befac41927d75a0f3be60205728abd5ccf8ce13b0254adc7b2ea0e
+DIST nomacs-1.0.0.tar.bz2 803404 SHA256 bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2 SHA512 b32d199a0b11a3c5fb5acdf263ecbf88d0a1c95cff698b1afc65769bf167578bcb103f01aa2d899c84718da110d8a2f5085e2c780b2645e11d535ea17b179c63 WHIRLPOOL 500a08b26a7d1eecf26707d5811ae777bb05587638001572389df221780e4d084e8b2d0ea758dbdaf8a7fae74b0ba15d3737a7988f71a17d1ee1ee2aa2cae032
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index dc439f7e84f5..b34dd48f5726 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">nomacs</remote-id>
+		<bugs-to>http://www.nomacs.org/redmine/projects/nomacs</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-1.0.0.ebuild b/media-gfx/nomacs/nomacs-1.0.0.ebuild
new file mode 100644
index 000000000000..dc29031a6d98
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-1.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/nomacs-1.0.0.ebuild,v 1.1 2013/03/14 17:16:28 kensington Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="raw"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.20[zlib]
+	>=dev-qt/qtcore-4.7.0:4
+	>=dev-qt/qtgui-4.7.0:4
+	raw? (
+		>=media-libs/libraw-0.14
+		>=media-libs/opencv-2.4.0[qt4]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable raw)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 277abd49a647..b1c1e8350df0 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,2 +1,2 @@
-DIST rawtherapee-4.0.8.tar.xz 40766264 SHA256 b0cbeac634d927b6afc0527434b24304b9d1ab2a681915933a872cf1a27f39cd
+DIST rawtherapee-4.0.10.tar.xz 11823324 SHA256 4f80a00b0fe0a69c8cc09fda155aa81cf47dccb516c6c6b249875f3c456d7ac5 SHA512 8e8e94cc50130297137d4d4f8ea057b9d954192fd698c327c88591b5ff1e0c66de5e2a1e1ba0c2b223a3633efa26f06b2ba2004dded3b72d025d8a18fef43481 WHIRLPOOL 6cc3b75fdaf9fcc1af7e2f3a96d56a9a467abb4fb531e32665e22ecbb7526b20905314e5c574b8944a76d02d6f83eea2960298b3f0f7bb7420b34efb66fbb47a
 DIST rawtherapee-4.0.9.tar.xz 40201920 SHA256 4ad49b5d3aae9a178b1cfa5efca653982f0a52763ddd37f89500e8fedfb187d2 SHA512 885414f0becfaa174b6e0d5689259e88cccf779d25bb92e1015fdb562c57eb70621e952681309aa66f05295b249ba39cca9c73459e6c0ad3266c57389e3c9ab9 WHIRLPOOL cb74a9079c513ac7feb5f9cdd09b9f3474462228023b5a529cf779014476401ad2a2ea24489699c6caa5051ea332ded028407a9f50e4744b504ec41e1e137cfe
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch b/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch
deleted file mode 100644
index 95e2d3c94046..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- rawtherapee-4.0.8/CMakeLists.txt
-+++ rawtherapee-4.0.8/CMakeLists.txt
-@@ -255,36 +255,8 @@
-     find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
-     find_file(HG_CMD hg)
- 
--  else (WIN32)
-- 
--    add_custom_target (AboutFile ALL
--      COMMAND ${CMAKE_COMMAND}
--              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
--              -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
--              -DSYSTEM:STRING=Linux
--              -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
--              -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
--              -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
--              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
--              -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
--              -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
--              -DOPTION_OMP:STRING=${OPTION_OMP}
--              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
--              -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake
--      COMMENT "Creating the about file"
--    )
--    find_file(HG_CMD hg)
--
-   endif (WIN32)
-  
--  add_dependencies(AboutFile Debug Release MinSizeRel RelWithDebInfo)
--
--  if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
--    message(FATAL_ERROR "hg command not found!")
--  else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
--    message(STATUS "hg command found: ${HG_CMD}")
--  endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
--
- endif (AUTOMATED_BUILD_SYSTEM)
- 
- 
-@@ -344,8 +316,7 @@
- endif(USE_CLANG)
- 
- install (FILES AUTHORS.txt DESTINATION ${CREDITSDIR})
- install (FILES LICENSE.txt DESTINATION ${LICENCEDIR})
--install (FILES AboutThisBuild.txt DESTINATION ${CREDITSDIR})
- install (FILES RELEASE_NOTES.txt DESTINATION ${CREDITSDIR} OPTIONAL)
- 
- add_subdirectory (rtexif)
---- rawtherapee-4.0.8/rtgui/version.h
-+++ rawtherapee-4.0.8/rtgui/version.h
-@@ -0,0 +1,11 @@
-+// This file is automatically generated by the Makefile - DO NOT EDIT!
-+// You can (should) also tell mercurial to ignore it.
-+
-+#ifndef _VERSION_
-+#define _VERSION_
-+
-+#define VERSION "4.0.8"
-+#define TAGDISTANCE 0
-+#define CACHEFOLDERNAME "RawTherapee"
-+
-+#endif
diff --git a/media-gfx/rawtherapee/rawtherapee-4.0.9.ebuild b/media-gfx/rawtherapee/rawtherapee-4.0.10.ebuild
similarity index 83%
rename from media-gfx/rawtherapee/rawtherapee-4.0.9.ebuild
rename to media-gfx/rawtherapee/rawtherapee-4.0.10.ebuild
index 7dc6f6fd84f4..fc52d6ed8352 100644
--- a/media-gfx/rawtherapee/rawtherapee-4.0.9.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-4.0.10.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/media-gfx/rawtherapee/rawtherapee-4.0.9.ebuild,v 1.1 2012/06/04 10:33:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawtherapee/rawtherapee-4.0.10.ebuild,v 1.1 2013/03/15 08:07:51 radhermit Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit cmake-utils toolchain-funcs
 
@@ -20,18 +20,18 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	>=dev-cpp/glibmm-2.16:2
 	dev-libs/expat
 	dev-libs/libsigc++:2
+	media-libs/libcanberra
 	media-libs/tiff
 	media-libs/libpng
 	media-libs/libiptcdata
 	media-libs/lcms:2
+	sci-libs/fftw:3.0
 	sys-libs/zlib
 	virtual/jpeg"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-no-hg.patch )
-
 pkg_setup() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@@ -46,11 +46,10 @@ src_configure() {
 		-DCREDITSDIR=/usr/share/${PN}
 		-DLICENCEDIR=/usr/share/${PN}
 	)
-
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	use doc && dodoc doc/built/pdf/en/RawTherapeeManual_${PV}.pdf
+	use doc && dodoc doc/RawTherapeeManual_en.pdf
 }
diff --git a/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild b/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild
deleted file mode 100644
index 73fe747f1963..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild,v 1.2 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI="4"
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-SRC_URI="http://rawtherapee.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc openmp"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	>=dev-cpp/gtkmm-2.12:2.4
-	>=dev-cpp/glibmm-2.16:2
-	dev-libs/libsigc++:2
-	media-libs/tiff
-	media-libs/libpng
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	sys-libs/zlib
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-nohg.patch )
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use openmp OPTION_OMP)
-		$(cmake-utils_use_with bzip2 BZIP)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/built/pdf/en/RawTherapeeManual_${PV}.pdf
-}
diff --git a/media-gfx/sane-backends/files/kodakaio-fixes.patch b/media-gfx/sane-backends/files/kodakaio-fixes.patch
new file mode 100644
index 000000000000..b4c7b85997cf
--- /dev/null
+++ b/media-gfx/sane-backends/files/kodakaio-fixes.patch
@@ -0,0 +1,30 @@
+--- backend/kodakaio.c	2013-03-15 08:24:26.000000000 +0100
++++ backend/kodakaio.c.new	2013-03-15 08:30:06.000000000 +0100
+@@ -2129,6 +2129,9 @@
+ }
+ 
+ #if HAVE_CUPS
++
++const char * 	_httpResolveURI (const char *uri, char *resolved_uri, size_t resolved_size, int options, int(*cb)(void *context), void *context);
++
+ /* ProcessDevice is called by cupsGetDevices to process each discovered device in turn */
+ void 
+ ProcessDevice(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, void *user_data)
+@@ -2172,7 +2175,7 @@
+ options |= _HTTP_RESOLVE_FQDN ?  not sure if or when required
+ options = 0 seems to work */
+ 	DBG(5, "using _httpResolveURI\n");
+-	resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, NULL, NULL);
++	resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, 0, NULL);
+ 
+ 	/* extract the IP address */
+ 	if(extract_from_id(resolved, "socket://", ':', ip_addr, sizeof(ip_addr)) != 0) {
+@@ -2197,7 +2200,7 @@
+ 
+ 	reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, 
+ 		"dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+-	if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++	if(reply != IPP_OK) DBG(1,"Failed cupsGetDevices\n");
+ 
+ 	return 0;
+ }
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch
new file mode 100644
index 000000000000..c682961f7c3f
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch
@@ -0,0 +1,11 @@
+--- sane-backends-1.0.23/frontend/saned.c
++++ sane-backends-1.0.23/frontend/saned.c
+@@ -221,7 +221,7 @@
+ int numchildren;
+ 
+ #define SANED_CONFIG_FILE "saned.conf"
+-#define SANED_PID_FILE    "/var/run/saned.pid"
++#define SANED_PID_FILE    "/var/run/saned/saned.pid"
+ 
+ #define SANED_SERVICE_NAME   "sane-port"
+ #define SANED_SERVICE_PORT   6566
diff --git a/media-gfx/sane-backends/files/saned.confd b/media-gfx/sane-backends/files/saned.confd
new file mode 100644
index 000000000000..adb1eab2c86b
--- /dev/null
+++ b/media-gfx/sane-backends/files/saned.confd
@@ -0,0 +1,2 @@
+# The user saned should drop its privileges to after startup
+#SANED_USER=""
diff --git a/media-gfx/sane-backends/files/saned.initd b/media-gfx/sane-backends/files/saned.initd
new file mode 100644
index 000000000000..26498dd71c8c
--- /dev/null
+++ b/media-gfx/sane-backends/files/saned.initd
@@ -0,0 +1,12 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/saned.initd,v 1.1 2013/03/15 08:15:52 phosphan Exp $
+
+pidfile="/var/run/saned/saned.pid"
+command="/usr/sbin/saned"
+command_args="-a ${SANED_USER:-root}"
+
+start_pre() {
+	checkpath -d -o ${SANED_USER:-root} ${pidfile%/*}
+}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
new file mode 100644
index 000000000000..a99aa7e8e4d5
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild,v 1.1 2013/03/15 08:15:52 phosphan Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib udev user
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS="
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp"
+
+IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp"
+
+for backend in ${IUSE_SANE_BACKENDS}; do
+	if [ ${backend} = pnm ]; then
+		IUSE="${IUSE} -sane_backends_pnm"
+	elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then
+		IUSE="${IUSE} sane_backends_${backend}"
+	else
+		IUSE="${IUSE} +sane_backends_${backend}"
+	fi
+done
+
+REQUIRED_USE="
+	sane_backends_mustek_usb2? ( threads )
+	sane_backends_kvs40xx? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+
+RDEPEND="
+	sane_backends_dc210? ( virtual/jpeg )
+	sane_backends_dc240? ( virtual/jpeg )
+	sane_backends_dell1600n_net? ( virtual/jpeg
+									media-libs/tiff )
+	avahi? ( >=net-dns/avahi-0.6.24 )
+	sane_backends_canon_pp? ( sys-libs/libieee1284 )
+	sane_backends_hpsj5s? ( sys-libs/libieee1284 )
+	sane_backends_mustek_pp? ( sys-libs/libieee1284 )
+	usb? ( virtual/libusb:0 )
+	gphoto2? (
+		media-libs/libgphoto2:=
+		virtual/jpeg
+	)
+	v4l? ( media-libs/libv4l )
+	xinetd? ( sys-apps/xinetd )
+	snmp? ( net-analyzer/net-snmp )
+"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+	)
+	>=sys-apps/sed-4
+
+	virtual/pkgconfig"
+
+# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1
+	https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2
+	https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3"
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+pkg_setup() {
+	enewgroup scanner
+	enewuser saned -1 -1 -1 scanner
+}
+
+src_unpack() {
+	rm -f "${P}.tar.gz"
+	for file in ${A}; do
+		cat "${DISTDIR}/${file}" >> "${P}.tar.gz"
+	done
+	tar xzf "${P}.tar.gz"
+}
+
+src_prepare() {
+	cat >> backend/dll.conf.in <<-EOF
+	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
+	hpaio
+	# Add support for the Epson-specific backend.  Needs media-gfx/iscan installed.
+	epkowa
+	EOF
+	epatch "${FILESDIR}"/niash_array_index.patch \
+		"${FILESDIR}"/${PN}-1.0.23-saned_pidfile_location.patch \
+		"${FILESDIR}"/kodakaio-fixes.patch
+
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# the blank is intended - an empty string would result in building ALL backends.
+	local BACKENDS=" "
+
+	use gphoto2 && BACKENDS="gphoto2"
+	use v4l && BACKENDS="${BACKENDS} v4l"
+	for backend in ${IUSE_SANE_BACKENDS}; do
+		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
+			BACKENDS="${BACKENDS} ${backend}"
+		fi
+	done
+
+	local myconf="$(use_enable usb libusb) $(use_with snmp)"
+	# you can only enable this backend, not disable it...
+	if use sane_backends_pnm; then
+		myconf="${myconf} --enable-pnm-backend"
+	fi
+	if ! use doc; then
+		myconf="${myconf} --disable-latex"
+	fi
+	if use sane_backends_mustek_pp; then
+		myconf="${myconf} --enable-parport-directio"
+	fi
+	if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
+		myconf="${myconf} sane_cv_use_libieee1284=no"
+	fi
+	# if LINGUAS is set, just use the listed and supported localizations.
+	if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then
+		echo > po/LINGUAS
+		for lang in ${LINGUAS}; do
+			if [ -a po/${lang}.po ]; then
+				echo ${lang} >> po/LINGUAS
+			fi
+		done
+	fi
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${BACKENDS}" econf \
+		$(use_with gphoto2) \
+		$(use_enable avahi) \
+		$(use_enable ipv6) \
+		$(use_enable threads pthread) \
+		${myconf}
+}
+
+src_compile() {
+	emake VARTEXFONTS="${T}/fonts" || die
+
+	if use usb; then
+		cd tools/hotplug
+		grep -v '^$' libsane.usermap > libsane.usermap.new
+		mv libsane.usermap.new libsane.usermap
+	fi
+}
+
+src_install () {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} || die
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use usb; then
+		insinto /etc/hotplug/usb
+		exeinto /etc/hotplug/usb
+		doins tools/hotplug/libsane.usermap
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+	udev_newrules tools/udev/libsane.rules 41-libsane.rules
+	insinto "/usr/share/pkgconfig"
+	doins tools/sane-backends.pc
+
+	dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
+	find "${ED}" -name "*.la" | while read file; do rm "${file}"; done
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	elog "If you are using an USB scanner, add all users who want"
+	elog "to access your scanner to the \"scanner\" group."
+}
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index f28193abe346..fab3ed38ff1e 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,2 +1,2 @@
-DIST OpenGTL-0.9.16.tar.bz2 533833 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107 SHA512 8d1ca8cdf352f04a90cf6fb3eaeb1684e333cbd3b8e46a19dc8d28d7891a5eb79072d4d2fc3d76a1628f22f0e07cca8139e84f01006f0f6de1402b371efaa2b5 WHIRLPOOL 82b8a962696b35b89ba14bc311d00c08717f7ed0f98260c59d439445208919cb1bccb1408e4dd47c61b08e15e29a7bf466dc6a868a0ba04d13d68eeaa33e3a78
 DIST OpenGTL-0.9.17.tar.bz2 534132 SHA256 89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e SHA512 62b98071e3bb728b7114697b7fcb4f7783408eb64454aa249dd866226e4596e43b37f397f3a965e03e463f12c99531736aead24016240e2c32cc0eb6a044d0ae WHIRLPOOL 42b322682b669887fcde0addbf7e3df1e39e6763b8e79459df5eb2b9f399ae58b7effc1f345fa1227bb95741bab68279d961b993e799147de42bd6482d04b05d
+DIST OpenGTL-0.9.18.tar.bz2 536113 SHA256 f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8 SHA512 101c200641d93eb2a31c75bdc80ccc7d7e7f79ea7cf2d4280205e86d2a6ca6357444055dab8a8e4b882067f1aad8b6746a4821d0209a0e53393ce3965b42fb50 WHIRLPOOL 735ea8f1af4b4ca83a441f50362e7a0840487629ec29576374d8e4b757a7ef616b5cbe746b3cfaa34e0532e653026c5d56f2ebb675e9c05acd47e8c3d3ddde42
diff --git a/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch b/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch
new file mode 100644
index 000000000000..6e6d1bda0af9
--- /dev/null
+++ b/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch
@@ -0,0 +1,30 @@
+changeset:   1792:99a2017746c0
+tag:         tip
+user:        Michael Palimaka <kensington@gentoo.org>
+date:        Wed Jan 30 05:28:12 2013 +1100
+summary:     Fix underlinking.
+
+diff -r e150672a54ad -r 99a2017746c0 OpenGTL/GTLCore/CMakeLists.txt
+--- a/OpenGTL/GTLCore/CMakeLists.txt	Sat Dec 29 12:27:12 2012 +0100
++++ b/OpenGTL/GTLCore/CMakeLists.txt	Wed Jan 30 05:28:12 2013 +1100
+@@ -10,6 +10,10 @@
+ 
+ ## GTLCore library ##
+ 
++if(PTHREAD_FOUND)
++  set(GTLCore_Thread_LIBS pthread)
++endif(PTHREAD_FOUND)
++
+ set(GTLCore_SRCS
+   AbstractColorConverter.cpp
+   AbstractImage.cpp
+@@ -110,7 +114,7 @@
+ set(EXTRA_GTLCORE_LINK_OPTIONS -Wl,-u,__ZTVN4llvm3JITE )
+ endif()
+ 
+-target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS})
++target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${GTLCore_Thread_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS})
+ 
+ # Set the ABI version of the library
+ set_target_properties(GTLCore PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} )
+
diff --git a/media-libs/opengtl/opengtl-0.9.17.ebuild b/media-libs/opengtl/opengtl-0.9.17.ebuild
index dfa88340cbb9..78a814c215b9 100644
--- a/media-libs/opengtl/opengtl-0.9.17.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.17.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/opengtl/opengtl-0.9.17.ebuild,v 1.4 2013/02/19 18:05:42 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.5 2013/03/14 15:24:40 kensington Exp $
 
 EAPI=4
 
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/lcov )
 "
 
+RESTRICT="test"
+
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
diff --git a/media-libs/opengtl/opengtl-0.9.16.ebuild b/media-libs/opengtl/opengtl-0.9.18.ebuild
similarity index 71%
rename from media-libs/opengtl/opengtl-0.9.16.ebuild
rename to media-libs/opengtl/opengtl-0.9.18.ebuild
index 728a4164878c..da9c1d631679 100644
--- a/media-libs/opengtl/opengtl-0.9.16.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.18.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/media-libs/opengtl/opengtl-0.9.16.ebuild,v 1.4 2012/09/24 11:41:31 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.18.ebuild,v 1.1 2013/03/14 15:24:40 kensington Exp $
 
-EAPI=4
+EAPI=5
 
 MY_P="OpenGTL-${PV}"
 
@@ -14,22 +14,29 @@ SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test"
 
 RDEPEND="
-	media-libs/libpng
-	=sys-devel/llvm-3.0*
-	sys-libs/zlib
+	media-libs/libpng:0
+	>=sys-devel/llvm-3.1
+	<sys-devel/llvm-3.3
 "
 DEPEND="${RDEPEND}
 	test? ( dev-util/lcov )
 "
 
+RESTRICT="test"
+
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.18-underlinking.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
 		$(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
 		$(cmake-utils_use test OPENGTL_BUILD_TESTS)
 		$(cmake-utils_use test OPENGTL_CODE_COVERAGE)
diff --git a/media-sound/flac123/flac123-0.0.12.ebuild b/media-sound/flac123/flac123-0.0.12.ebuild
index 924fcc75eaa0..b061efa1748d 100644
--- a/media-sound/flac123/flac123-0.0.12.ebuild
+++ b/media-sound/flac123/flac123-0.0.12.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/media-sound/flac123/flac123-0.0.12.ebuild,v 1.1 2012/11/02 16:17:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.12.ebuild,v 1.6 2013/03/14 15:13:32 ago Exp $
 
 EAPI=4
 inherit autotools
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/flac-tools/${P}-release.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/popt
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index bb5fe880d348..934acef30ffc 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,4 @@
 DIST lilypond-2.14.2.tar.gz 15224418 SHA256 243a6b3845722a37083d73ed681e69ffde0b3b9c6158af20db3c0926dd982696 SHA512 e2d551eb8cfc08387519c7282c3813072da644c7e503461669fa79621af2805ac63b9924c7bb2894b2413f05e202b426d9ee0f6889e99287cc1941442342232a WHIRLPOOL 3b85ad14214726f13fe6ffda7a2ba42b10c079139c0c44ec380a8ec5c485966f88ba52184ad126957515948a6de77f884fe4e6be7696a39eec8b1aafd682ec05
 DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb SHA512 3ead74ddb7e51be274aa5aa607b776261ae5d0e9863ebe745451875e62a60fac2376f7e80546df66010cdec2752c271e7006275608f30ce9a2d1b88f22dc1d8d WHIRLPOOL a25539dac5e508220e1ddeeaed261b730e76fd26c5dbc0f97683b65bcbc5907ef6bfbe8c16a7f6a15d12950d4a7d547ee1716e25cdfb5b750e235c913a8ef38e
 DIST lilypond-2.17.13.tar.gz 16239927 SHA256 17e2aa96ed638c4c53e6f5dc8e00df3d542ab16ab73a868adef3b896e3f9cda5 SHA512 312bdae6a2369bcf8cbef06bf87c0a76d9c5d36ad50a53d2c45821d232fd0b57d0bf68e85c625a049b55654245244da99ff521a885f4e92241454254545792ac WHIRLPOOL 65a23e20655cfd3e435073116b481f90f3d4a5be9b36e605106a599a9707287376e76ef14e81f39c513977c2b9be62d9e1455074ddad1385d03b0c8b20a4086a
+DIST lilypond-2.17.14.tar.gz 16244181 SHA256 4234aa9fd3f03f93f3891e05f3a493d872ad39327aa92e3ae6f354e85f0347f7 SHA512 f6bdfd93a648ef5960eba0a8f456bd35a6d2d226120f76f696416a0464691fa19ef8ced92d5840475f3e3500b6bd97067bf383f3042e75a158fe0d7017d46150 WHIRLPOOL a24c5dfefeb730816bb46df49ef2b80c668112e3cb456cf90137065cd8c90675853bdcd2c2a99f59c539898a9963eca101a3a1c27ecc24f13b146b350298cf68
diff --git a/media-sound/lilypond/lilypond-2.17.14.ebuild b/media-sound/lilypond/lilypond-2.17.14.ebuild
new file mode 100644
index 000000000000..2a517a3f1190
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.17.14.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.14.ebuild,v 1.1 2013/03/15 08:13:55 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+SLOT="0"
+LICENSE="GPL-3 FDL-1.3"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-texlive/texlive-metapost
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	if ! use vim-syntax ; then
+		sed -i -e "s/vim//" GNUmakefile.in || die
+	fi
+
+	sed -i -e "s/OPTIMIZE -g/OPTIMIZE/" aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/nted/files/nted-1.10.18-automake-1.12.patch b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
new file mode 100644
index 000000000000..0363e06ea6cd
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- configure.in.dist	2011-01-27 13:10:04.000000000 +0000
++++ configure.in	2013-03-07 23:17:13.529353811 +0000
+@@ -12,7 +12,7 @@
+ AC_INIT([nted], [1.10.18], [nted-user@tu-chemnitz.de], [nted])
+ AC_CONFIG_SRCDIR([beaming.h])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([-Wall -Werror 1.10 foreign])
++AM_INIT_AUTOMAKE([-Wall 1.10 foreign])
+ 
+ AC_PROG_CXX
+ 
diff --git a/media-sound/nted/metadata.xml b/media-sound/nted/metadata.xml
index af15c1cf940b..a40624fba8f0 100644
--- a/media-sound/nted/metadata.xml
+++ b/media-sound/nted/metadata.xml
@@ -1,13 +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>chris@basementcode.com</email>
-<name>Christopher Harvey</name>
-<description>Proxy maintainer</description>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
-
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
index cbdd6cd8bdea..ad1cd26bcde5 100644
--- a/media-sound/nted/nted-1.10.18-r3.ebuild
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r3.ebuild,v 1.1 2013/02/18 13:41:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nted/nted-1.10.18-r3.ebuild,v 1.2 2013/03/15 10:10:16 pinkbyte Exp $
 
 EAPI=5
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
 AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils eutils toolchain-funcs
 
@@ -34,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-gcc47.patch" # bug #424291
 	"${FILESDIR}/${P}-lilypond.patch" # bug #437540
 	"${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540
+	"${FILESDIR}/${P}-automake-1.12.patch" # bug #459466
 )
 
 src_prepare() {
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 967205332f45..c440ea7517f0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,4 @@
-DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
 DIST ffmpeg-0.10.6.tar.bz2 5778721 SHA256 8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626 SHA512 f563bd8aa0daa982a7f63560b7c1ed5d630976aac2efb9b37031923d078bb7111fa96f7a05f241743eb0eafb071d439e90a87c9377cd6db70ad0df7599a0a0c8 WHIRLPOOL fef0f748276250e47e6ac30aad31f2a50ebb222aa989b48f82408eb9ab3cba77a07fecd9a67f05ae32dbe8fe95b65a6156cade2cd477e14c0d827087887cbc91
 DIST ffmpeg-1.0.5.tar.bz2 6449133 SHA256 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce SHA512 0d380fc547e83f49df54313f23d31aea4d617d5cced067c392e997d7bc5d89e230522174977f68a826d17eab07d5f4be3886aa6df6d634c24dae8000dd5b3172 WHIRLPOOL a60a72cf55c603803629c83c247474fa98ffe2f7632e3df18dbf5875b3d69b61f228d4bb9499218f18e010c8b77d6ee768e7877ca05c145fe46f51e6a39c3553
 DIST ffmpeg-1.1.3.tar.bz2 5812644 SHA256 a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 SHA512 56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 WHIRLPOOL 066b1d1e1eee7d96b32b4005760eff34c4d6878821ad5037e4d7b2068dcbf9bd94c83d123a033dcf0f1840c63a4e3e94d011bbde0ce47f2e020644edfe731f6a
+DIST ffmpeg-1.2.tar.bz2 5969590 SHA256 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf SHA512 e46cd47cd6cba2820165ac2464fda6d9442675339eea8cdc6b023bfa174f1b2b3e2e6fae85cff03671ed385c49b508c3bae966160418ddb0b1afdd3fee7780ae WHIRLPOOL 0001248edaf74cac27079620dd3dbf05a494039be7f6e6e411959d7a69f27be9ddcecdf030e5835f225409031ffe174470474f7fb6b52aa046481356ae055e24
diff --git a/media-video/ffmpeg/ffmpeg-0.10.6.ebuild b/media-video/ffmpeg/ffmpeg-0.10.6.ebuild
index 6f39f161bfc6..f406fa22bcd1 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.6.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/ffmpeg/ffmpeg-0.10.6.ebuild,v 1.11 2013/03/14 07:48:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.6.ebuild,v 1.13 2013/03/14 15:07:22 ago Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
diff --git a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild b/media-video/ffmpeg/ffmpeg-1.2.ebuild
similarity index 60%
rename from media-video/ffmpeg/ffmpeg-0.10.3.ebuild
rename to media-video/ffmpeg/ffmpeg-1.2.ebuild
index 3181d3b439b1..53ff3766ad5e 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.ebuild
@@ -1,13 +1,13 @@
-# 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/media-video/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.12 2012/09/25 03:50:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.ebuild,v 1.1 2013/03/15 10:46:06 aballier Exp $
 
 EAPI="4"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-2"
-	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -26,25 +26,26 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
-	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
-	jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio
-	rtmp schroedinger sdl speex static-libs test theora threads
-	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+	aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
+	libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
+	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
+	truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
 # String for CPU features in the useflag[:configure_option] form
 # if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
 
 for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
-FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
+FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
 
 for i in ${FFTOOLS}; do
 	IUSE="${IUSE} +fftools_$i"
@@ -53,31 +54,39 @@ done
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
+	bluray? ( media-libs/libbluray )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	celt? ( >=media-libs/celt-0.11.1 )
-	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
+		fdk? ( media-libs/fdk-aac )
 		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		twolame? ( media-sound/twolame )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
+	flite? ( app-accessibility/flite )
+	fontconfig? ( media-libs/fontconfig )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gnutls? ( >=net-libs/gnutls-2.12.16 )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	iconv? ( virtual/libiconv )
+	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
 	libass? ( media-libs/libass )
+	libcaca? ( media-libs/libcaca )
+	libsoxr? ( media-libs/soxr )
 	libv4l? ( media-libs/libv4l )
 	modplug? ( media-libs/libmodplug )
 	openal? ( >=media-libs/openal-1.1 )
+	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
@@ -86,6 +95,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	vaapi? ( >=x11-libs/libva-0.32 )
 	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
 	zlib? ( sys-libs/zlib )
@@ -95,8 +105,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
+	fontconfig? ( virtual/pkgconfig )
 	gnutls? ( virtual/pkgconfig )
 	ieee1394? ( virtual/pkgconfig )
 	libv4l? ( virtual/pkgconfig )
@@ -111,82 +121,84 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
-	test? ( encode zlib )"
+	test? ( encode )"
 
 S=${WORKDIR}/${P/_/-}
+BUILD_DIR=${S}_build
 
 src_prepare() {
 	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
-	epatch "${FILESDIR}/freiordl.patch"
+	epatch_user
 }
 
 src_configure() {
+	mkdir -p "${BUILD_DIR}"
+	cd "${BUILD_DIR}"
+
 	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
 
-	# enabled by default
-	for i in debug doc network vaapi vdpau zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
-	for i in gnutls ; do
-		use $i && myconf="${myconf} --enable-$i"
-	done
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse="avresample bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
+	use openssl && myconf="${myconf} --enable-nonfree"
 
 	# Encoders
 	if use encode
 	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
+		ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
+		for i in aacplus faac theora twolame x264 xvid; do
+			ffuse="${ffuse} ${i}:lib${i}"
 		done
-		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
-		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+
+		# Licensing.
+		if use aac || use amr ; then
+			myconf="${myconf} --enable-version3"
+		fi
+		if use aacplus || use faac || use fdk ; then
+			myconf="${myconf} --enable-nonfree"
+		fi
 	else
 		myconf="${myconf} --disable-encoders"
 	fi
 
 	# libavdevice options
-	use cdio && myconf="${myconf} --enable-libcdio"
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	use openal && myconf="${myconf} --enable-openal"
+	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
+
 	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf="${myconf} --disable-indev=v4l"
 	use v4l || myconf="${myconf} --disable-indev=v4l2"
 	for i in alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
-	use X && myconf="${myconf} --enable-x11grab"
-	use pulseaudio && myconf="${myconf} --enable-libpulse"
-	use libv4l && myconf="${myconf} --enable-libv4l2"
+	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
+
 	# Outdevs
 	for i in alsa oss sdl ; do
 		use ${i} || myconf="${myconf} --disable-outdev=${i}"
 	done
+
 	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-	use truetype && myconf="${myconf} --enable-libfreetype"
-	use libass && myconf="${myconf} --enable-libass"
+	ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
+
+	# libswresample options
+	ffuse="${ffuse} libsoxr"
 
 	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
+	ffuse="${ffuse} threads:pthreads"
 
 	# Decoders
-	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
+	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
+	use amr && myconf="${myconf} --enable-version3"
+	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
+		ffuse="${ffuse} ${i}:lib${i}"
+	done
+
+	for i in ${ffuse} ; do
+		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
 	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
 
 	# CPU features
 	for i in ${CPU_FEATURES}; do
@@ -214,7 +226,6 @@ src_configure() {
 	# Mandatory configuration
 	myconf="
 		--enable-gpl
-		${version3}
 		--enable-postproc
 		--enable-avfilter
 		--disable-stripping
@@ -236,11 +247,7 @@ src_configure() {
 		esac
 	fi
 
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	cd "${S}"
-	./configure \
+	"${S}/configure" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -257,29 +264,37 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	cd "${BUILD_DIR}"
+	emake V=1
 
 	for i in ${FFTOOLS} ; do
 		if use fftools_$i ; then
-			emake tools/$i
+			emake V=1 tools/$i
 		fi
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc -r doc/*
+	cd "${BUILD_DIR}"
+	emake V=1 DESTDIR="${D}" install install-man
 
 	for i in ${FFTOOLS} ; do
 		if use fftools_$i ; then
 			dobin tools/$i
 		fi
 	done
+
+	cd "${S}"
+	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake fate
+	cd "${BUILD_DIR}"
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
 }
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 29d8a0ad5f2b..0714aea273a9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Mar 2013 10:36:54 +0000
+Fri, 15 Mar 2013 13:06:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 29d8a0ad5f2b..0714aea273a9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Mar 2013 10:36:54 +0000
+Fri, 15 Mar 2013 13:06:52 +0000
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1 b/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1
deleted file mode 100644
index 93f38890f182..000000000000
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=sys-apps/sed >=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=Java based remote management console used for Managing 389-admin 389-ds
-EAPI=2
-HOMEPAGE=http://port389.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.3.tar.bz2
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	java-ant-2	daa6d2d0a12ebb700a69d9f1d2f02c5c	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6754bb28ef12e7e00939737ad83f7113
diff --git a/metadata/md5-cache/app-admin/equo-183 b/metadata/md5-cache/app-admin/equo-183
new file mode 100644
index 000000000000..4d0271c386e7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/equo-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=~sys-apps/entropy-183 =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager text-based client
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/entropy-183 sys-apps/file[python] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=dbd60c6e6bbe856c976a47319f3ab9fc
diff --git a/metadata/md5-cache/app-admin/eselect-1.3.4 b/metadata/md5-cache/app-admin/eselect-1.3.4
index c51c49f04118..61bbf2f97f18 100644
--- a/metadata/md5-cache/app-admin/eselect-1.3.4
+++ b/metadata/md5-cache/app-admin/eselect-1.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
 IUSE=doc
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-1.3.4.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ef085064a71ccbf27e87016dc38bbe78
+_md5_=5bd462dcd9e23fe238a7bb4905c4f05d
diff --git a/metadata/md5-cache/app-admin/glance-2012.2.3 b/metadata/md5-cache/app-admin/glance-2012.2.3-r1
similarity index 98%
rename from metadata/md5-cache/app-admin/glance-2012.2.3
rename to metadata/md5-cache/app-admin/glance-2012.2.3-r1
index 475531e60d2e..cb7ef0fcb944 100644
--- a/metadata/md5-cache/app-admin/glance-2012.2.3
+++ b/metadata/md5-cache/app-admin/glance-2012.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ldap mysql postgres sqlite )
 SLOT=0
 SRC_URI=http://launchpad.net/glance/folsom/2012.2.3/+download/glance-2012.2.3.tar.gz
 _eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8a76a37a792b71c921c5ce25d48060bc
+_md5_=1eb17933a1e92132212f08f84f735fc6
diff --git a/metadata/md5-cache/app-admin/matter-183 b/metadata/md5-cache/app-admin/matter-183
new file mode 100644
index 000000000000..c2d619f65532
--- /dev/null
+++ b/metadata/md5-cache/app-admin/matter-183
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Automated Packages Builder for Portage and Entropy
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+IUSE=+entropy
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=entropy? ( ~sys-apps/entropy-183 ) sys-apps/file[python] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9b10c4ce6cac8c9be2c8d57590bea27a
diff --git a/metadata/md5-cache/app-admin/puppet-2.7.21 b/metadata/md5-cache/app-admin/puppet-2.7.21
index d679c76ac3ba..635d9902bac0 100644
--- a/metadata/md5-cache/app-admin/puppet-2.7.21
+++ b/metadata/md5-cache/app-admin/puppet-2.7.21
@@ -4,11 +4,11 @@ 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 test test
-KEYWORDS=~amd64 hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 hppa ppc ~sparc x86
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.6[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/facter-1.5.6[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 ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-2.7.21.gem
 _eclasses_=elisp-common	21605c8f0b2a5ffa3233faeb3f9df309	eutils	50d18ebffcbd8bd63614b89c2d664d0d	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
-_md5_=2fe057f1d3b7f28fb16e079d189a421c
+_md5_=2fa0e5a3961dfa8d4aa83cc6be31801b
diff --git a/metadata/md5-cache/app-admin/rigo-183 b/metadata/md5-cache/app-admin/rigo-183
new file mode 100644
index 000000000000..33d0388ddd45
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rigo-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=sys-apps/sed-4 =dev-lang/python-2*
+DESCRIPTION=Rigo, the Sabayon Application Browser
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] ) ~sys-apps/entropy-183 ~sys-apps/rigo-daemon-183 sys-devel/gettext x11-libs/gtk+:3 x11-libs/vte:2.90 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fd2c9f0b931ca3a795718afafd154c42
diff --git a/metadata/md5-cache/app-arch/unrar-4.2.4 b/metadata/md5-cache/app-arch/unrar-4.2.4
index 71504a0b276f..355c50edcf9f 100644
--- a/metadata/md5-cache/app-arch/unrar-4.2.4
+++ b/metadata/md5-cache/app-arch/unrar-4.2.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=4
 HOMEPAGE=http://www.rarlab.com/rar_add.htm
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5fbc16234e9889514a949cdf8079d317
+_md5_=c582c699aabf6cc8aa5a861ad0ac59fa
diff --git a/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2 b/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
index c4f8ac5672b9..d85bfd29afbb 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
+++ b/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=The GNU Emacs Lisp Reference Manual
 HOMEPAGE=http://www.gnu.org/software/emacs/manual/
 KEYWORDS=amd64 ppc x86
-LICENSE=FDL-1.1
+LICENSE=FDL-1.1+
 SLOT=21
 SRC_URI=mirror://gnu/emacs/elisp-manual-21-2.8.tar.gz mirror://gentoo/elisp-manual-21.2.8-patches.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f559448eee22e03c955d7f7a23a586e
+_md5_=db54bf3aaa2a395d0c5120d7e6f41d42
diff --git a/metadata/md5-cache/app-doc/elisp-manual-22.2.9 b/metadata/md5-cache/app-doc/elisp-manual-22.2.9
index 35040aa74781..b49be36cb693 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-22.2.9
+++ b/metadata/md5-cache/app-doc/elisp-manual-22.2.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=The GNU Emacs Lisp Reference Manual
 HOMEPAGE=http://www.gnu.org/software/emacs/manual/
 KEYWORDS=amd64 ppc x86
-LICENSE=FDL-1.2
+LICENSE=FDL-1.2+
 SLOT=22
 SRC_URI=mirror://gentoo/elisp-manual-22-2.9.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c297d95d676eb261750227e5ccbf6e7c
+_md5_=7324f1849499b5dcbf3f80338b2b9d30
diff --git a/metadata/md5-cache/app-doc/elisp-manual-23.4 b/metadata/md5-cache/app-doc/elisp-manual-23.4
index 4bd04e6841a1..caa44a00a1df 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-23.4
+++ b/metadata/md5-cache/app-doc/elisp-manual-23.4
@@ -4,8 +4,8 @@ DESCRIPTION=The GNU Emacs Lisp Reference Manual
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/emacs/manual/
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=FDL-1.3
+LICENSE=FDL-1.3+
 SLOT=23
 SRC_URI=mirror://gentoo/elisp-manual-23.4.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7faaa18bc21e4b3f9047fd38698a1223
+_md5_=b8631e426efad44d991ead483e8c63c9
diff --git a/metadata/md5-cache/app-doc/elisp-manual-24.2 b/metadata/md5-cache/app-doc/elisp-manual-24.2
index 6fe4ef4345ae..bddff5ab8ad2 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-24.2
+++ b/metadata/md5-cache/app-doc/elisp-manual-24.2
@@ -4,8 +4,8 @@ DESCRIPTION=The GNU Emacs Lisp Reference Manual
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/emacs/manual/
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=FDL-1.3
+LICENSE=FDL-1.3+
 SLOT=24
 SRC_URI=mirror://gentoo/elisp-manual-24.2.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5dae96bd71e51e4e22353debdcc5df6
+_md5_=f1d1c8a881d5523ca11b68d0e593e1d7
diff --git a/metadata/md5-cache/app-doc/elisp-manual-24.3 b/metadata/md5-cache/app-doc/elisp-manual-24.3
new file mode 100644
index 000000000000..36b3b07feb3a
--- /dev/null
+++ b/metadata/md5-cache/app-doc/elisp-manual-24.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/xz-utils
+DESCRIPTION=The GNU Emacs Lisp Reference Manual
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/emacs/manual/
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=FDL-1.3+
+SLOT=24
+SRC_URI=mirror://gentoo/elisp-manual-24.3.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=183f05eadde8875fc376e87ca411153b
diff --git a/metadata/md5-cache/app-editors/mp-5.2.1 b/metadata/md5-cache/app-editors/mp-5.2.1
deleted file mode 100644
index 54ed3d8432dd..000000000000
--- a/metadata/md5-cache/app-editors/mp-5.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 ) !gtk? ( sys-libs/ncurses ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) iconv? ( virtual/libiconv ) app-text/grutatxt app-text/grutatxt virtual/pkgconfig dev-lang/perl
-DESCRIPTION=Minimum Profit: A text editor for programmers
-EAPI=4
-HOMEPAGE=http://www.triptico.com/software/mp.html
-IUSE=gtk iconv kde ncurses nls pcre qt4
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 ) !gtk? ( sys-libs/ncurses ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) iconv? ( virtual/libiconv ) app-text/grutatxt
-SLOT=0
-SRC_URI=http://www.triptico.com/download/mp-5.2.1.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b246e75bb68c87d6248c269ec2237158
diff --git a/metadata/md5-cache/app-editors/mp-5.2.2 b/metadata/md5-cache/app-editors/mp-5.2.2
index 6a1ae2e52a9c..5024bf9740ca 100644
--- a/metadata/md5-cache/app-editors/mp-5.2.2
+++ b/metadata/md5-cache/app-editors/mp-5.2.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=ncurses? ( sys-libs/ncurses ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) >=x11-libs/pango-1.8.0 dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype x11-libs/cairo ) !gtk? ( sys-libs/ncurses ) app-text/grutatxt iconv? ( virtual/libiconv ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) app-text/grutatxt virtual/pkgconfig dev-lang/perl
 DESCRIPTION=Minimum Profit: A text editor for programmers
 EAPI=4
@@ -10,4 +10,4 @@ RDEPEND=ncurses? ( sys-libs/ncurses ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:
 SLOT=0
 SRC_URI=http://www.triptico.com/download/mp-5.2.2.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=32c5c7e089ec755eb2a2436bb1ae0d37
+_md5_=f2006f41e8ba5a0dca67ab0fa5895a67
diff --git a/metadata/md5-cache/app-editors/ted-2.21 b/metadata/md5-cache/app-editors/ted-2.21
deleted file mode 100644
index d35bd1c8144f..000000000000
--- a/metadata/md5-cache/app-editors/ted-2.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/gtk+:2 media-libs/tiff virtual/jpeg media-libs/libpng x11-libs/libXpm virtual/pkgconfig
-DESCRIPTION=X-based rich text editor
-EAPI=4
-HOMEPAGE=http://www.nllgg.nl/Ted
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/tiff virtual/jpeg media-libs/libpng x11-libs/libXpm
-SLOT=0
-SRC_URI=ftp://ftp.nluug.nl/pub/editors/ted/ted-2.21.src.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cb6984fbc3bf4daf17adfd6a56cdbf31
diff --git a/metadata/md5-cache/app-editors/ted-2.22 b/metadata/md5-cache/app-editors/ted-2.22
index 2007fb025e01..4a775251b711 100644
--- a/metadata/md5-cache/app-editors/ted-2.22
+++ b/metadata/md5-cache/app-editors/ted-2.22
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 media-libs/tiff virtual/jpeg media-libs/libpng x11-libs/l
 DESCRIPTION=X-based rich text editor
 EAPI=4
 HOMEPAGE=http://www.nllgg.nl/Ted
-KEYWORDS=amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/tiff virtual/jpeg media-libs/libpng x11-libs/libXpm
 SLOT=0
 SRC_URI=ftp://ftp.nluug.nl/pub/editors/ted/ted-2.22.src.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=459081e202eeab378886a77791774632
+_md5_=06866f1c1e7c9deda1f3cc7724be5380
diff --git a/metadata/md5-cache/app-misc/actkbd-0.2.8-r1 b/metadata/md5-cache/app-misc/actkbd-0.2.8-r1
new file mode 100644
index 000000000000..67df5b505c68
--- /dev/null
+++ b/metadata/md5-cache/app-misc/actkbd-0.2.8-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=A keyboard shortcut daemon
+EAPI=5
+HOMEPAGE=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6f02e6ab2fba7f9802dd04d2d8b8a4e2
diff --git a/metadata/md5-cache/app-misc/byobu-5.34 b/metadata/md5-cache/app-misc/byobu-5.34
new file mode 100644
index 000000000000..45d9a72283dc
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.34
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=5
+HOMEPAGE=http://byobu.co
+IUSE=screen 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
+LICENSE=GPL-3
+RDEPEND=dev-libs/newt screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+SLOT=0
+SRC_URI=http://launchpad.net/byobu/trunk/5.34/+download/byobu_5.34.orig.tar.gz
+_eclasses_=multilib	ded93e450747134a079e647d888aa80b	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=a02844ed0dc506bceb96320834cb6a3d
diff --git a/metadata/md5-cache/app-misc/magneto-loader-183 b/metadata/md5-cache/app-misc/magneto-loader-183
new file mode 100644
index 000000000000..bfa3e4f8ddd3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/magneto-loader-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=~sys-apps/magneto-core-183 ~app-admin/rigo-183
+DESCRIPTION=Official Sabayon Linux Entropy Notification Applet Loader
+EAPI=2
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/magneto-core-183 ~app-admin/rigo-183
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3bf03c499d38a8be18edde6014be3609
diff --git a/metadata/md5-cache/app-shells/zsh-5.0.2 b/metadata/md5-cache/app-shells/zsh-5.0.2
index 295838e4490c..64c62b1047fa 100644
--- a/metadata/md5-cache/app-shells/zsh-5.0.2
+++ b/metadata/md5-cache/app-shells/zsh-5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=5
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsh/zsh-5.0.2.tar.bz2 ftp://ftp.zsh.org/pub/zsh-5.0.2.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-5.0.2-doc.tar.bz2 )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8bfcb307ca465c9f6481ef259fc466ba
+_md5_=16931c4a3dfabe16bf41ee49988ab9bb
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0
index ca628ca64031..79e675d3dc5e 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0
@@ -3,10 +3,10 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=5
 HOMEPAGE=http://wiki.docbook.org/topic/DocBookXslStylesheets
 IUSE=ruby
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( dev-lang/ruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.78.0.tar.bz2
-_md5_=aa0caa9db7fa0d9f4214b4c5f49240fc
+_md5_=640e5146b31f4c6afb7f8411d115f32e
diff --git a/metadata/md5-cache/app-text/dos2unix-6.0.3 b/metadata/md5-cache/app-text/dos2unix-6.0.3
index e2c69cbc599f..d1fb278e05f2 100644
--- a/metadata/md5-cache/app-text/dos2unix-6.0.3
+++ b/metadata/md5-cache/app-text/dos2unix-6.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=4
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/
 IUSE=debug nls
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u !app-text/unix2dos virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-6.0.3.tar.gz mirror://sourceforge/dos2unix/dos2unix-6.0.3.tar.gz
 _eclasses_=multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=dc59e145c7a67ab619d6d2e6ba7d360b
+_md5_=76f7f52dbab773072faf99f6148d2e76
diff --git a/metadata/md5-cache/dev-db/gigabase-3.83-r1 b/metadata/md5-cache/dev-db/gigabase-3.83-r1
index d84a5920adc9..c6d7e5879c1e 100644
--- a/metadata/md5-cache/dev-db/gigabase-3.83-r1
+++ b/metadata/md5-cache/dev-db/gigabase-3.83-r1
@@ -3,10 +3,10 @@ DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=OO-DBMS with interfaces for C/C++/Java/PHP/Perl
 EAPI=4
 HOMEPAGE=http://www.garret.ru/~knizhnik/gigabase.html
-IUSE=doc
+IUSE=doc static-libs
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/gigabase/gigabase-3.83.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f0fee0f7eb12949168f21b1e1ac1df2b
+_md5_=08d74ee19b5a9012684659208c07cc76
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.12.3 b/metadata/md5-cache/dev-java/icedtea-6.1.12.3
deleted file mode 100644
index 352e56a95a5f..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-6.1.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl virtual/pkgconfig sys-apps/lsb-release >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/paxctl ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=4
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin +nss pax_kernel pulseaudio +source systemtap test +webstart elibc_FreeBSD test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[nsplugin] )
-RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
-SLOT=6
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.12.3.tar.gz http://download.java.net/openjdk/jdk6/promoted/b27/openjdk-6-src-b27-26_oct_2012.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_04.zip http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	dcda71e114d638cdf01db57b8445337d	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5af5b592748cc0754ddf6d55c7e6e7cc
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.12.2 b/metadata/md5-cache/dev-java/icedtea-6.1.12.4
similarity index 97%
rename from metadata/md5-cache/dev-java/icedtea-6.1.12.2
rename to metadata/md5-cache/dev-java/icedtea-6.1.12.4
index 42171495c9c0..f18628403978 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.12.2
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.12.4
@@ -9,6 +9,6 @@ LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MP
 PDEPEND=webstart? ( dev-java/icedtea-web:6 ) nsplugin? ( dev-java/icedtea-web:6[nsplugin] )
 RDEPEND=>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=6
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.12.2.tar.gz http://download.java.net/openjdk/jdk6/promoted/b27/openjdk-6-src-b27-26_oct_2012.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_04.zip http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.12.4.tar.gz http://download.java.net/openjdk/jdk6/promoted/b27/openjdk-6-src-b27-26_oct_2012.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_04.zip http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	dcda71e114d638cdf01db57b8445337d	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=454ac43da26841c7805572dbbebe4a0d
+_md5_=84f169db18a5207fb4c4b367c070f64b
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.3.6 b/metadata/md5-cache/dev-java/icedtea-7.2.3.8
similarity index 87%
rename from metadata/md5-cache/dev-java/icedtea-7.2.3.6
rename to metadata/md5-cache/dev-java/icedtea-7.2.3.8
index 59333882a3a8..8847fce0c713 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.3.6
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.3.8
@@ -9,6 +9,6 @@ LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MP
 PDEPEND=webstart? ( dev-java/icedtea-web:7 ) nsplugin? ( dev-java/icedtea-web:7[nsplugin] )
 RDEPEND=>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea:0 X? ( >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 SLOT=7
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.3.6.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/dd8d1a8f222f.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/97a8b625f6e9.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d7feafb8427b.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b900024eb4ba.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/6bb01322bb5a.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/bc0de5a0ece2.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/e0739a8783d1.tar.gz http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.3.8.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/ed02a059ea15.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/516aae5f27cf.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/1fbe99283d97.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/3c7be82314bf.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/deac45dc94f0.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/a152dced63a1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/41426c72b802.tar.gz http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	dcda71e114d638cdf01db57b8445337d	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	ded93e450747134a079e647d888aa80b	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=69ede653aa2802f1af4605fe4ee9ab1e
+_md5_=956495a718ef3dcfea220afbd14faf67
diff --git a/metadata/md5-cache/dev-lang/clojure-1.5.1 b/metadata/md5-cache/dev-lang/clojure-1.5.1
new file mode 100644
index 000000000000..cb1fd6d578ba
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/clojure-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Clojure is a dynamic programming language that targets the Java Virtual Machine
+EAPI=2
+HOMEPAGE=http://clojure.org/
+IUSE=elibc_FreeBSD source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.5
+SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.5.1 -> clojure-1.5.1.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	java-ant-2	daa6d2d0a12ebb700a69d9f1d2f02c5c	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1afca008a9cf3f242f0706cf57287f16
diff --git a/metadata/md5-cache/dev-lang/ferite-1.0.2 b/metadata/md5-cache/dev-lang/ferite-1.0.2
deleted file mode 100644
index d3d6f170c4ed..000000000000
--- a/metadata/md5-cache/dev-lang/ferite-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=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 clean, lightweight, object oriented scripting language
-EAPI=4
-HOMEPAGE=http://www.ferite.org/
-KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2
-SLOT=1
-SRC_URI=mirror://sourceforge/ferite/ferite-1.0.2.tar.gz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e28a546530ddfdaee43c0ae0cc9f2e01
diff --git a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1 b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
index 5173fad1384d..ac87ed284082 100644
--- a/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
+++ b/metadata/md5-cache/dev-lang/ferite-1.1.17-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=sys-devel/automake-1.11.1:1.
 DESCRIPTION=A clean, lightweight, object oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ferite.org/
-KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libpcre-5 dev-libs/libxml2
 SLOT=1
 SRC_URI=mirror://sourceforge/ferite/ferite-1.1.17.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6a3c4731dfd7395a170b14a0a0bf78b6
+_md5_=4a7937d1c04d5305e85cc38a82f59e17
diff --git a/metadata/md5-cache/dev-lang/php-5.3.23 b/metadata/md5-cache/dev-lang/php-5.3.23
new file mode 100644
index 000000000000..e5ad7189a9cd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.3.23
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) 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 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta 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=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 sqlite2 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
+LICENSE=PHP-3
+PDEPEND=doc? ( app-doc/php-docs )
+RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) 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 ) sqlite2? ( =dev-db/sqlite-2* ) sqlite? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta 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.3
+SRC_URI=http://www.php.net/distributions/php-5.3.23.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3-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_=7fb6b7c52963ad14bedaf7ed003cfa0f
diff --git a/metadata/md5-cache/dev-lang/php-5.4.13 b/metadata/md5-cache/dev-lang/php-5.4.13
new file mode 100644
index 000000000000..4fbcde5b48aa
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.4.13
@@ -0,0 +1,15 @@
+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 ) 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=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
+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 ) 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.4
+SRC_URI=http://www.php.net/distributions/php-5.4.13.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.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_=37f304d555ba17d175cb57b38ec18c30
diff --git a/metadata/md5-cache/dev-lang/php-5.5.0_alpha6 b/metadata/md5-cache/dev-lang/php-5.5.0_alpha6
new file mode 100644
index 000000000000..066a48ab8a43
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.5.0_alpha6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=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 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=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
+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
+_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
diff --git a/metadata/md5-cache/dev-libs/389-adminutil-1.1.13 b/metadata/md5-cache/dev-libs/389-adminutil-1.1.13
deleted file mode 100644
index 75e1f4ced052..000000000000
--- a/metadata/md5-cache/dev-libs/389-adminutil-1.1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig >=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/mozldap-6.0.2 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4
-DESCRIPTION=389 adminutil
-EAPI=2
-HOMEPAGE=http://port389.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/mozldap-6.0.2 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4
-SLOT=0
-SRC_URI=http://port389.org/sources/389-adminutil-1.1.13.tar.bz2
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b9ca639dc24b25f15713fc22cc966f1
diff --git a/metadata/md5-cache/dev-libs/389-adminutil-1.1.10 b/metadata/md5-cache/dev-libs/389-adminutil-1.1.15
similarity index 62%
rename from metadata/md5-cache/dev-libs/389-adminutil-1.1.10
rename to metadata/md5-cache/dev-libs/389-adminutil-1.1.15
index 1b5bd570aa34..291979e686d0 100644
--- a/metadata/md5-cache/dev-libs/389-adminutil-1.1.10
+++ b/metadata/md5-cache/dev-libs/389-adminutil-1.1.15
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig >=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/mozldap-6.0.2 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4
+DEPEND=virtual/pkgconfig >=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 net-nds/openldap
 DESCRIPTION=389 adminutil
-EAPI=2
+EAPI=5
 HOMEPAGE=http://port389.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/mozldap-6.0.2 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4
+RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 >=dev-libs/svrcore-4.0.3 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 net-nds/openldap
 SLOT=0
-SRC_URI=http://port389.org/sources/389-adminutil-1.1.10.tar.bz2
+SRC_URI=http://port389.org/sources/389-adminutil-1.1.15.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f406cf3f17348b02b4d5aa6ca26dbe6e
+_md5_=cd35a723ccfe07a626e029cd74dd6390
diff --git a/metadata/md5-cache/dev-libs/geoip-1.4.8-r3 b/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
index 2aaadff67988..9d51eda7a7bc 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
+++ b/metadata/md5-cache/dev-libs/geoip-1.4.8-r3
@@ -4,10 +4,10 @@ DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entri
 EAPI=4
 HOMEPAGE=http://www.maxmind.com/app/ip-location
 IUSE=city ipv6 perl-geoipupdate static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1 GPL-2 MaxMind2
 RDEPEND=sys-libs/zlib perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-perl )
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz ) ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz ) )
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=055bed9ad1238a0bb9dc221f2b6bfa55
+_md5_=cc7ef7e6445484088c5d1f430a43a8c3
diff --git a/metadata/md5-cache/dev-libs/klibc-1.5.20 b/metadata/md5-cache/dev-libs/klibc-1.5.20
index 2ce9e9590883..e4bc9cb6c7c8 100644
--- a/metadata/md5-cache/dev-libs/klibc-1.5.20
+++ b/metadata/md5-cache/dev-libs/klibc-1.5.20
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/klibc/1.5/klibc-1.5.20.tar.bz2 mirror://kernel/linux/libs/klibc/Current/klibc-1.5.20.tar.bz2 mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.bz2 mirror://kernel/linux/kernel/v2.6/testing/linux-2.6.36.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c280abda487a7c3d24159357ea461cb8
+_md5_=ed07bea5660a9b7bd97c179c64ba3837
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2 b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
index 2dcc35c93f9c..0486b23fe0a2 100644
--- a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sas
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozldap-6.0.6.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=83879dd291a5f421af774e3ad1a0042d
+_md5_=0e69f84fe3b30c506aa148751142e434
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.7 b/metadata/md5-cache/dev-libs/mozldap-6.0.7
new file mode 100644
index 000000000000..707562dbd641
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+DESCRIPTION=Mozilla LDAP C SDK
+EAPI=5
+HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
+IUSE=ipv6 debug +sasl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-1.1 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
+SLOT=0
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/mozldap-6.0.7.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=282b900f90826a556390506772d3695f
diff --git a/metadata/md5-cache/dev-libs/nettle-2.6 b/metadata/md5-cache/dev-libs/nettle-2.6
index 42868419961b..8a6d5a0ab795 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.6
+++ b/metadata/md5-cache/dev-libs/nettle-2.6
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level cryptographic library
 EAPI=5
 HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 IUSE=doc +gmp static-libs test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.6.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ec2a9d5024610c6f09715ba3fb67ecd8
+_md5_=0800d91be245105f2ec8914443476f5e
diff --git a/metadata/md5-cache/dev-libs/nss-3.14.3 b/metadata/md5-cache/dev-libs/nss-3.14.3
index d6e813d5566e..2d95c7da2e75 100644
--- a/metadata/md5-cache/dev-libs/nss-3.14.3
+++ b/metadata/md5-cache/dev-libs/nss-3.14.3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/nspr-4.9.5 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/nss-3.14.3.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f36b787c64469beca5cc42cd5eb84bc5
+_md5_=1523f60d1f19854acbefa36daed0b70f
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.10 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.10
index b4b7ef70e581..f988083c1d0e 100644
--- a/metadata/md5-cache/dev-libs/pkcs11-helper-1.10
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.10
@@ -4,9 +4,9 @@ DESCRIPTION=PKCS#11 helper library
 EAPI=4
 HOMEPAGE=http://www.opensc-project.org/opensc/wiki/pkcs11-helper
 IUSE=doc gnutls nss static-libs
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=dev-libs/openssl-0.9.7 gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/pkcs11-helper/pkcs11-helper-1.10.tar.bz2
-_md5_=2b6cff5d25596e4fa4653afd577c2575
+_md5_=2b93a819ebacd2d422b3e1d45f4ebe91
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05
index 4b46b27ef4ee..6c27ddca4beb 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.32.05
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=4
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 static-libs threads
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses sys-libs/readline curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( static-libs abyss curl cxx )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~maksbotan/xmlrpc-c-1.32.05.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e7e20edcf83e15e699fc87ae2a25901
+_md5_=8b8d69e8051fd52cabb2784dd7efa250
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419 b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419
deleted file mode 100644
index c7faf7582e17..000000000000
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20090419
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm test unpack
-DEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52
-DESCRIPTION=GNU Common Lisp
-EAPI=1
-HOMEPAGE=http://www.gnu.org/software/gcl/gcl.html
-IUSE=+ansi debug doc emacs +readline tk X
-KEYWORDS=~amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/gcl-2.6.8_pre20090419.tar.bz2
-_eclasses_=elisp-common	21605c8f0b2a5ffa3233faeb3f9df309	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3022093cbc9aacb83923b56bdb35fdb9
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221 b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20130314
similarity index 82%
rename from metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221
rename to metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20130314
index a8c3f3c2678d..f2c19cf31d0a 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20111221
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.8_pre20130314
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEFINED_PHASES=compile configure install postinst postrm test
 DEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base doc? ( virtual/texi2dvi ) >=app-text/texi2html-1.64 >=sys-devel/autoconf-2.52
 DESCRIPTION=GNU Common Lisp
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gcl/gcl.html
 IUSE=+ansi debug doc emacs +readline tk X
-KEYWORDS=~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) readline? ( sys-libs/readline ) >=dev-libs/gmp-4.1 tk? ( dev-lang/tk ) X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) virtual/latex-base
 RESTRICT=strip
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~grozin/gcl-2.6.8_pre20111221.tar.bz2
+SRC_URI=http://dev.gentoo.org/~grozin/gcl-2.6.8_pre20130314.tar.bz2
 _eclasses_=elisp-common	21605c8f0b2a5ffa3233faeb3f9df309	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c92782e6360bf88681aed6a956b31805
+_md5_=2f5666cb27e65c38f092ad609ef53718
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.840.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.840.0
index 0708bb131a32..6ed8fe85ea14 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.840.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.840.0
@@ -4,10 +4,10 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/
 IUSE=idn
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Net-SSLeay-1.330.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN ) ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.84.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fea6f4bd1796e08c574b97e0f53890f6
+_md5_=1dab4eeb5514d1b17cbed84ac3760a98
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.520.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.520.0
index eaa0ed6f6932..f17ead904658 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.520.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.520.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl dev-lang/perl[-build]
 DESCRIPTION=Net::SSLeay module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=SSLeay
 RDEPEND=dev-libs/openssl dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.52.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c00d87a83473958db07ad78af9c90a0
+_md5_=c3e6d00239fa170e62f72a5f02dbbe9d
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.13.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.13.0
index c64cd98f4a62..b1e0ad9d65b0 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.13.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl XS frontend to the Xapian C++ search library.
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Search-Xapian/
 IUSE=examples
-KEYWORDS=amd64 ~arm ~mips ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-libs/xapian-1.2.9 !dev-libs/xapian-bindings[perl] dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.13.0.tar.gz http://oligarchy.co.uk/xapian/1.2.13/Search-Xapian-1.2.13.0.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d79285d1089328cc27b657e3c4b3bdb9
+_md5_=f62cbd6fbd45a6f70ab1b490cb64793a
diff --git a/metadata/md5-cache/dev-php/adodb-5.17-r1 b/metadata/md5-cache/dev-php/adodb-5.17-r1
index 7ba8c181ddaa..b37715cb8c3d 100644
--- a/metadata/md5-cache/dev-php/adodb-5.17-r1
+++ b/metadata/md5-cache/dev-php/adodb-5.17-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip =dev-lang/php-5* dev-lang/php
 DESCRIPTION=Active Data Objects Data Base library for PHP.
 EAPI=4
 HOMEPAGE=http://adodb.sourceforge.net/
-KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND==dev-lang/php-5* dev-lang/php
 SLOT=0
 SRC_URI=mirror://sourceforge/adodb/adodb517.zip
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	php-lib-r1	d7318e400ae0d443613d286980877fd4	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=66c17d8f8804f1153895910275d7570a
+_md5_=3b5c94422ece9773f23217c348dc536b
diff --git a/metadata/md5-cache/dev-php/pecl-amqp-1.0.9 b/metadata/md5-cache/dev-php/pecl-amqp-1.0.9
new file mode 100644
index 000000000000..391186b30beb
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-amqp-1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=net-libs/rabbitmq-c || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers.
+EAPI=4
+HOMEPAGE=http://pecl.php.net/amqp
+IUSE=php_targets_php5-3 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=net-libs/rabbitmq-c || ( =dev-php/pecl-amqp-1.0.9[php_targets_php5-3] =dev-php/pecl-amqp-1.0.9[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/amqp-1.0.9.tgz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f19c3687a639a37cd203382b96d7cb1b
diff --git a/metadata/md5-cache/dev-python/astng-0.24.2 b/metadata/md5-cache/dev-python/astng-0.24.2
new file mode 100644
index 000000000000..3ac830c1dc1a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astng-0.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/logilab-common-0.53.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( >=dev-python/egenix-mx-base-3.0.0[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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_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_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=5
+HOMEPAGE=http://www.logilab.org/project/logilab-astng http://pypi.python.org/pypi/logilab-astng
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/logilab-common-0.53.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] 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_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_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.24.2.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.24.2.tar.gz
+_eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=01e6d9a9d6306c40582b8221d2d222e4
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.1.1-r1 b/metadata/md5-cache/dev-python/dbus-python-1.1.1-r1
index aeb3986d7f35..d1f0a17a6d6c 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/dbus-python-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/DBusBindings http://dbus.freedesktop.org/doc/dbus-python/
 IUSE=doc examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=sys-apps/dbus-1.6:= 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(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.1.1.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=791e2cfd6f22738ee58a3ccfd07a01a8
+_md5_=91170aaba89a2458457e6a8803497317
diff --git a/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1 b/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1
index e7f72ae9e5d2..82472f5dffcb 100644
--- a/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1
+++ b/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1
@@ -1,5 +1,5 @@
 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_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(-)] dev-python/django 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(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/django test? ( dev-python/nose ) 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=A Django application that will run cron jobs for other django apps
 EAPI=5
 HOMEPAGE=http://code.google.com/p/django-evolution/ http://pypi.python.org/pypi/django_evolution/
@@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/d/django_evolution/django_evolution-0.6.7.tar.gz
 _eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0227275b66e229d8bc466919d8fa0464
+_md5_=bf01f56aaf1b2c1f4d3189b6a247c5a8
diff --git a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2 b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
index 46258683cee8..8532f434b825 100644
--- a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
+++ b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for generating API documentation for Python modules from docstr
 EAPI=5
 HOMEPAGE=http://epydoc.sourceforge.net/
 IUSE=doc latex tk python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/docutils[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(-)] latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) python_targets_python2_5? ( dev-lang/python:2.5[tk?] ) python_targets_python2_6? ( dev-lang/python:2.6[tk?] ) python_targets_python2_7? ( dev-lang/python:2.7[tk?] ) 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=mirror://sourceforge/epydoc/epydoc-3.0.1.tar.gz
 _eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f0d836a9f36cac6c6b04ad334649800
+_md5_=b635de787e3ba3431be3212f8bd6fb8f
diff --git a/metadata/md5-cache/dev-python/paste-1.7.5.1-r1 b/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
index b4f4c531ea9c..9a1ad3975925 100644
--- a/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
+++ b/metadata/md5-cache/dev-python/paste-1.7.5.1-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz
 _eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c7ce1826e9c95cac9d835b462d1084a
+_md5_=f12c07111dbb9515ed4885ac15f44b65
diff --git a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
index 7f6702da18fd..02a7f6e3f4cd 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
 IUSE=+cairo examples test +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31.0:2 >=dev-libs/gobject-introspection-1.31.20 virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.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 ) 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(-)] !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.2/pygobject-3.2.2.tar.xz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c8a8bea8555fdcdf51250f0c7860174a
+_md5_=d824591476ca992851e687e898214dcf
diff --git a/metadata/md5-cache/dev-python/urwid-1.1.1-r1 b/metadata/md5-cache/dev-python/urwid-1.1.1-r1
new file mode 100644
index 000000000000..58fe7ff6e1e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urwid-1.1.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_python3_3(-)?,-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_python3_3(-)] 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_python3_3(-)?,-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_python3_3(-)] ) test? ( dev-python/twisted ) python_targets_python2_5? ( dev-lang/python:2.5[ncurses] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses] ) python_targets_python3_1? ( dev-lang/python:3.1[ncurses] ) python_targets_python3_2? ( dev-lang/python:3.2[ncurses] ) python_targets_python3_3? ( dev-lang/python:3.3[ncurses] ) 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_python3_3(-)?,-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_python3_3(-)]
+DESCRIPTION=Urwid is a curses-based user interface library for Python
+EAPI=5
+HOMEPAGE=http://excess.org/urwid/ http://pypi.python.org/pypi/urwid
+IUSE=doc examples test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5[ncurses] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses] ) python_targets_python3_1? ( dev-lang/python:3.1[ncurses] ) python_targets_python3_2? ( dev-lang/python:3.2[ncurses] ) python_targets_python3_3? ( dev-lang/python:3.3[ncurses] ) 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_python3_3(-)?,-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_python3_3(-)]
+SLOT=0
+SRC_URI=http://excess.org/urwid/urwid-1.1.1.tar.gz
+_eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=69862346d286fe7d24221f337ccaa57b
diff --git a/metadata/md5-cache/dev-python/yolk-0.4.3-r1 b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
new file mode 100644
index 000000000000..78ef2c8e77ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools dev-python/yolk-portage 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=Tool and library for querying PyPI and locally installed Python packages
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/yolk
+IUSE=examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools dev-python/yolk-portage 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/y/yolk/yolk-0.4.3.tar.gz
+_eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0be6bce457fe4ae04e69bf3d42eac8be
diff --git a/metadata/md5-cache/dev-ruby/mail-2.5.3 b/metadata/md5-cache/dev-ruby/mail-2.5.3
new file mode 100644
index 000000000000..e15f94a62c41
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ruby18] >=dev-ruby/mime-types-1.16[ruby_targets_ruby18] >=dev-ruby/treetop-1.4.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/treetop-1.4.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ree18] >=dev-ruby/mime-types-1.16[ruby_targets_ree18] >=dev-ruby/treetop-1.4.8[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=An email handling library
+EAPI=5
+HOMEPAGE=https://github.com/mikel/mail
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ruby18] >=dev-ruby/mime-types-1.16[ruby_targets_ruby18] >=dev-ruby/treetop-1.4.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ruby19] >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >=dev-ruby/treetop-1.4.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/i18n-0.4.0[ruby_targets_ree18] >=dev-ruby/mime-types-1.16[ruby_targets_ree18] >=dev-ruby/treetop-1.4.8[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=2.5
+SRC_URI=https://github.com/mikel/mail/archive/2.5.3.tar.gz -> mail-2.5.3-git.tar.gz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	java-utils-2	dcda71e114d638cdf01db57b8445337d	multilib	ded93e450747134a079e647d888aa80b	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1492af206910e63f388fd17e3962557d
diff --git a/metadata/md5-cache/dev-tex/hevea-2.00 b/metadata/md5-cache/dev-tex/hevea-2.00
deleted file mode 100644
index 53dc9853d148..000000000000
--- a/metadata/md5-cache/dev-tex/hevea-2.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?]
-DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
-EAPI=2
-HOMEPAGE=http://hevea.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ppc ~ppc64 sparc x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?]
-SLOT=0
-SRC_URI=http://hevea.inria.fr/distri/hevea-2.00.tar.gz
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8d84e6bcb44d2a13d0ff21b89de9eb2
diff --git a/metadata/md5-cache/dev-tex/hevea-2.02 b/metadata/md5-cache/dev-tex/hevea-2.02
index 26880c567c61..6c5b7434963e 100644
--- a/metadata/md5-cache/dev-tex/hevea-2.02
+++ b/metadata/md5-cache/dev-tex/hevea-2.02
@@ -4,10 +4,10 @@ DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
 EAPI=5
 HOMEPAGE=http://hevea.inria.fr/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=QPL
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 SLOT=0
 SRC_URI=http://hevea.inria.fr/distri/hevea-2.02.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9eddd487cf4c8173cfba34e7653eec9
+_md5_=b5a45173a71eee66aad8fdfcba751379
diff --git a/metadata/md5-cache/dev-util/cloc-1.58 b/metadata/md5-cache/dev-util/cloc-1.58
new file mode 100644
index 000000000000..d768405605a4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cloc-1.58
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=dev-lang/perl-5.6
+DESCRIPTION=Count Lines of Code
+EAPI=5
+HOMEPAGE=http://cloc.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6 dev-perl/Algorithm-Diff dev-perl/regexp-common virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-File-Spec virtual/perl-File-Temp
+SLOT=0
+SRC_URI=mirror://sourceforge/cloc/cloc-1.58.pl mirror://sourceforge/cloc/cloc.1.pod
+_md5_=67255837fe6988c810a05b9d22ac203a
diff --git a/metadata/md5-cache/dev-util/mdds-0.7.0 b/metadata/md5-cache/dev-util/mdds-0.7.1
similarity index 80%
rename from metadata/md5-cache/dev-util/mdds-0.7.0
rename to metadata/md5-cache/dev-util/mdds-0.7.1
index e338c3bc4da4..ec8414f4bff9 100644
--- a/metadata/md5-cache/dev-util/mdds-0.7.0
+++ b/metadata/md5-cache/dev-util/mdds-0.7.1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/boost
 SLOT=0
-SRC_URI=http://multidimalgorithm.googlecode.com/files/mdds_0.7.0.tar.bz2
+SRC_URI=http://multidimalgorithm.googlecode.com/files/mdds_0.7.1.tar.bz2
 _eclasses_=multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=9b2a5a8868d3b7ffe3d7d481f37827e2
+_md5_=870df0dec6ef8e9dcc86f6767b65f25b
diff --git a/metadata/md5-cache/dev-util/umockdev-0.2.1 b/metadata/md5-cache/dev-util/umockdev-0.2.1
new file mode 100644
index 000000000000..7fbc6d29ee78
--- /dev/null
+++ b/metadata/md5-cache/dev-util/umockdev-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/udev[gudev] >=dev-libs/glib-2.24:2 test? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:3.3 dev-lang/python:3.2 dev-lang/python:3.1 ) ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=5
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/udev[gudev] >=dev-libs/glib-2.24:2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://launchpad.net/umockdev/trunk/0.2/+download/umockdev-0.2.1.tar.xz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=86f0fa0d852c2831fc87835b1271d9a7
diff --git a/metadata/md5-cache/kde-misc/magneto-kde-183 b/metadata/md5-cache/kde-misc/magneto-kde-183
new file mode 100644
index 000000000000..8e918088f256
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/magneto-kde-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet KDE frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-183 kde-base/pykde4 dev-python/PyQt4[dbus] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=685ad8f68f9ef5631f8d985f7c2a34b3
diff --git a/metadata/md5-cache/mail-client/thunderbird-17.0.4 b/metadata/md5-cache/mail-client/thunderbird-17.0.4
index 309f70a1d252..8dd7016f1df2 100644
--- a/metadata/md5-cache/mail-client/thunderbird-17.0.4
+++ b/metadata/md5-cache/mail-client/thunderbird-17.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Thunderbird Mail Client
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
 IUSE=bindist gconf +crypt +jit +ipc ldap +lightning +minimal mozdom selinux custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) >=media-libs/libpng-1.5.11[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 kernel_linux? ( media-libs/alsa-lib ) >=media-libs/libvpx-1.0.0 virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) selinux? ( sec-policy/selinux-thunderbird ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ar.xpi -> thunderbird-17.0.4esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ast.xpi -> thunderbird-17.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/be.xpi -> thunderbird-17.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/bg.xpi -> thunderbird-17.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-17.0.4esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/br.xpi -> thunderbird-17.0.4esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ca.xpi -> thunderbird-17.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/cs.xpi -> thunderbird-17.0.4esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/da.xpi -> thunderbird-17.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/de.xpi -> thunderbird-17.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/el.xpi -> thunderbird-17.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/en-GB.xpi -> thunderbird-17.0.4esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/es-AR.xpi -> thunderbird-17.0.4esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/es-ES.xpi -> thunderbird-17.0.4esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/et.xpi -> thunderbird-17.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/eu.xpi -> thunderbird-17.0.4esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/fi.xpi -> thunderbird-17.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/fr.xpi -> thunderbird-17.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-17.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-17.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/gd.xpi -> thunderbird-17.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/gl.xpi -> thunderbird-17.0.4esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/he.xpi -> thunderbird-17.0.4esr-he.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/hr.xpi -> thunderbird-17.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/hu.xpi -> thunderbird-17.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/hy-AM.xpi -> thunderbird-17.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/id.xpi -> thunderbird-17.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/is.xpi -> thunderbird-17.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/it.xpi -> thunderbird-17.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ja.xpi -> thunderbird-17.0.4esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ko.xpi -> thunderbird-17.0.4esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/lt.xpi -> thunderbird-17.0.4esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-17.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/nl.xpi -> thunderbird-17.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-17.0.4esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-17.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/pl.xpi -> thunderbird-17.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-17.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-17.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/rm.xpi -> thunderbird-17.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ro.xpi -> thunderbird-17.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ru.xpi -> thunderbird-17.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/si.xpi -> thunderbird-17.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/sk.xpi -> thunderbird-17.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/sl.xpi -> thunderbird-17.0.4esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/sq.xpi -> thunderbird-17.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/sr.xpi -> thunderbird-17.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-17.0.4esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-17.0.4esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/tr.xpi -> thunderbird-17.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/uk.xpi -> thunderbird-17.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/vi.xpi -> thunderbird-17.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-17.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//17.0.4esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-17.0.4esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/17.0.4esr/source/thunderbird-17.0.4esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.5.0.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-17.0-patches-01.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-17.0-patches-0.4.tar.xz http://dev.gentoo.org/~nirbheek/mozilla/patchsets/firefox-17.0-patches-0.4.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-17.0-patches-01.tar.xz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	4eecca819170c6b71a66bda7fd56c503	mozcoreconf-2	2a626ad4c1fc2464ae55194bcc880b38	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	5b1ba3795fea6a2fcced53a5c01b5ea6	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=12e4aea8ecf303217840982700354294
+_md5_=9f5a31debc9dc109f87e012a11d51ded
diff --git a/metadata/md5-cache/media-gfx/nomacs-1.0.0 b/metadata/md5-cache/media-gfx/nomacs-1.0.0
new file mode 100644
index 000000000000..e16a8eb6c05d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/nomacs-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=media-gfx/exiv2-0.20[zlib] >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 raw? ( >=media-libs/libraw-0.14 >=media-libs/opencv-2.4.0[qt4] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Qt4-based image viewer
+EAPI=5
+HOMEPAGE=http://www.nomacs.org/
+IUSE=raw
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/exiv2-0.20[zlib] >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 raw? ( >=media-libs/libraw-0.14 >=media-libs/opencv-2.4.0[qt4] )
+SLOT=0
+SRC_URI=mirror://sourceforge/nomacs/nomacs-1.0.0.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bf7ec51aa58352e999f734768e14afcf
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.9 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.10
similarity index 66%
rename from metadata/md5-cache/media-gfx/rawtherapee-4.0.9
rename to metadata/md5-cache/media-gfx/rawtherapee-4.0.10
index defa60755abb..416bd7dd7ec4 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.9
+++ b/metadata/md5-cache/media-gfx/rawtherapee-4.0.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/expat dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg app-arch/xz-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.rawtherapee.com/
 IUSE=bzip2 doc openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/expat dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
+RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg
 SLOT=0
-SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz
+SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=58cc1d0ea95b47c20ab99d1faee71bf6
+_md5_=23aad6c0b5fbc7fb0f1e3df31adbeafd
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.8 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
deleted file mode 100644
index dadb990c3a22..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=4
-HOMEPAGE=http://www.rawtherapee.com/
-IUSE=bzip2 doc openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
-SLOT=0
-SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.8.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5d85235d053a798e4c21cb5e691111e9
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.23-r1 b/metadata/md5-cache/media-gfx/sane-backends-1.0.23-r1
new file mode 100644
index 000000000000..dd226ddc3bce
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg media-libs/tiff ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2:= virtual/jpeg ) v4l? ( media-libs/libv4l ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) v4l? ( sys-kernel/linux-headers ) doc? ( virtual/latex-base dev-texlive/texlive-latexextra ) >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Scanner Access Now Easy - Backends
+EAPI=5
+HOMEPAGE=http://www.sane-project.org/
+IUSE=avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 +sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek +sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 public-domain
+RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg media-libs/tiff ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:0 ) gphoto2? ( media-libs/libgphoto2:= virtual/jpeg ) v4l? ( media-libs/libv4l ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) !<sys-fs/udev-114
+REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	fea2246732f911905d6991fed203e65c	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7c8c555499d39d63bd98c6ce4da43cc9
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.17 b/metadata/md5-cache/media-libs/opengtl-0.9.17
index 2e31c8d9885f..271d06162b41 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.17
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.17
@@ -7,7 +7,8 @@ IUSE=debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng =sys-devel/llvm-3.1*
+RESTRICT=test
 SLOT=0
 SRC_URI=http://download.opengtl.org/OpenGTL-0.9.17.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6a11bf564dd3feeb524fe4adea9de64
+_md5_=e52ca0042dff5fd00fdb5805ed30c87b
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.16 b/metadata/md5-cache/media-libs/opengtl-0.9.18
similarity index 56%
rename from metadata/md5-cache/media-libs/opengtl-0.9.16
rename to metadata/md5-cache/media-libs/opengtl-0.9.18
index 6278809fe5c8..e5b9dd61ff4e 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.16
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.18
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libpng =sys-devel/llvm-3.0* sys-libs/zlib test? ( dev-util/lcov ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=media-libs/libpng:0 >=sys-devel/llvm-3.1 <sys-devel/llvm-3.3 test? ( dev-util/lcov ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Collection of libraries for graphics transformation algorithms
-EAPI=4
+EAPI=5
 HOMEPAGE=http://opengtl.org/
 IUSE=debug test
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2
-RDEPEND=media-libs/libpng =sys-devel/llvm-3.0* sys-libs/zlib
+RDEPEND=media-libs/libpng:0 >=sys-devel/llvm-3.1 <sys-devel/llvm-3.3
+RESTRICT=test
 SLOT=0
-SRC_URI=http://download.opengtl.org/OpenGTL-0.9.16.tar.bz2
+SRC_URI=http://download.opengtl.org/OpenGTL-0.9.18.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=adc7032ef414850e1e28586b5de73177
+_md5_=0232eff61300c541154a40bc62217410
diff --git a/metadata/md5-cache/media-sound/flac123-0.0.12 b/metadata/md5-cache/media-sound/flac123-0.0.12
index 713e3bdd89e3..5e110bece29a 100644
--- a/metadata/md5-cache/media-sound/flac123-0.0.12
+++ b/metadata/md5-cache/media-sound/flac123-0.0.12
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt media-libs/flac media-libs/libao media-libs/libogg || ( >=s
 DESCRIPTION=console app for playing FLAC audio files
 EAPI=4
 HOMEPAGE=http://flac-tools.sourceforge.net
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt media-libs/flac media-libs/libao media-libs/libogg
 SLOT=0
 SRC_URI=mirror://sourceforge/flac-tools/flac123-0.0.12-release.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=9196b1a123d174ba5c68a76415ec57fa
+_md5_=91b36fc0bc679003f93b2a71bbaface7
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.14 b/metadata/md5-cache/media-sound/lilypond-2.17.14
new file mode 100644
index 000000000000..0500baed370b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) 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(+)?] app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost virtual/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=GNU Music Typesetter
+EAPI=5
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW 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 ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) 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(+)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.14.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	elisp-common	21605c8f0b2a5ffa3233faeb3f9df309	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	ac5bf9438dc6ee497650a74d7a1402c2	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e0e0af8169e7d137d591974c0598bf3f
diff --git a/metadata/md5-cache/media-sound/nted-1.10.18-r3 b/metadata/md5-cache/media-sound/nted-1.10.18-r3
index a2b2e1d97303..80b084f5d881 100644
--- a/metadata/md5-cache/media-sound/nted-1.10.18-r3
+++ b/metadata/md5-cache/media-sound/nted-1.10.18-r3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2 media-libs/alsa-lib >=media-libs/freetype-2 x11-libs/c
 SLOT=0
 SRC_URI=http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-1.10.18.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ce09512f2c4d4de1fad8edccb72a523c
+_md5_=eec8a3b9cbf96a521dad86a8330a7745
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.3 b/metadata/md5-cache/media-video/ffmpeg-0.10.3
deleted file mode 100644
index 784e4f545a83..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
-EAPI=4
-HOMEPAGE=http://ffmpeg.org/
-IUSE=aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
-REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
-SLOT=0
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2
-_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0b25b6f9607bc064b89950f133191c8
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.6 b/metadata/md5-cache/media-video/ffmpeg-0.10.6
index 87e229b69f98..5aa2fbb82131 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.6
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.6
@@ -4,11 +4,11 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=4
 HOMEPAGE=http://ffmpeg.org/
 IUSE=aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.6.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ac03d23f307aa07c94319da7ade22f3c
+_md5_=b835ebfbff6636a84daae80ea6100714
diff --git a/metadata/md5-cache/media-video/ffmpeg-1.2 b/metadata/md5-cache/media-video/ffmpeg-1.2
new file mode 100644
index 000000000000..74f97338e08d
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) celt? ( >=media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
+EAPI=4
+HOMEPAGE=http://ffmpeg.org/
+IUSE=aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
+RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) celt? ( >=media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
+REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
+SLOT=0
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.2.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=748f6009b64f29ab1081cefaf4fa17c9
diff --git a/metadata/md5-cache/net-analyzer/nmap-6.25 b/metadata/md5-cache/net-analyzer/nmap-6.25
index ea886c1b8c38..991f11611e97 100644
--- a/metadata/md5-cache/net-analyzer/nmap-6.25
+++ b/metadata/md5-cache/net-analyzer/nmap-6.25
@@ -4,10 +4,10 @@ DESCRIPTION=A utility for network exploration or security auditing
 EAPI=4
 HOMEPAGE=http://nmap.org/
 IUSE=gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_zh
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/apr dev-libs/libpcre net-libs/libpcap[ipv6?] gtk? ( >=x11-libs/gtk+-2.6:2 >=dev-python/pygtk-2.6 || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] ) ndiff? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-6.25.tar.bz2 http://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f17a4bb280b5b6e0850100f126295716
+_md5_=ae298eef81e30c2b543d11a8bebe5640
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4 b/metadata/md5-cache/net-dialup/pptpd-1.3.4
deleted file mode 100644
index 181e3f8e8dea..000000000000
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
-HOMEPAGE=http://www.poptop.org/
-IUSE=tcpd gre-extreme-debug
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70dd74b3ff4e9029b66370c5944566ce
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1 b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1
deleted file mode 100644
index a12d22e61305..000000000000
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
-EAPI=4
-HOMEPAGE=http://poptop.sourceforge.net/
-IUSE=tcpd gre-extreme-debug
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d020a7f353c671091268d09e9011cd6f
diff --git a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2 b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
index 445546f188a7..f2519c61b1fe 100644
--- a/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
+++ b/metadata/md5-cache/net-dialup/pptpd-1.3.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
 EAPI=5
 HOMEPAGE=http://poptop.sourceforge.net/
 IUSE=tcpd gre-extreme-debug
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed787c48cb5301f19a5374aba7481f0c
+_md5_=f71ceeec3fd70d1d3417727b57ffcbbb
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.5 b/metadata/md5-cache/net-ftp/lftp-4.4.5
new file mode 100644
index 000000000000..ad5d987c3743
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl nls? ( sys-devel/gettext ) 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=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
+EAPI=5
+HOMEPAGE=http://lftp.yar.ru/
+IUSE=gnutls nls socks5 +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
+SLOT=0
+SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.5.tar.xz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=52732952113884d48e65fb46174d0ddd
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.7 b/metadata/md5-cache/net-im/pidgin-2.10.7
index bd64437f1824..f32681c87e60 100644
--- a/metadata/md5-cache/net-im/pidgin-2.10.7
+++ b/metadata/md5-cache/net-im/pidgin-2.10.7
@@ -4,10 +4,10 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=4
 HOMEPAGE=http://pidgin.im/
 IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( <dev-lang/python-3 ) python? ( <dev-lang/python-3 ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( gnome-extra/evolution-data-server ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* || ( net-libs/farstream:0.1 net-libs/farsight2 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl ) tk? ( dev-lang/tk ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.10.7.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e35bfcbb3ddca3560b5e016f6116ec84
+_md5_=0eea5209d730810c78549b528a5a7d55
diff --git a/metadata/md5-cache/net-libs/libssh-0.5.3 b/metadata/md5-cache/net-libs/libssh-0.5.3
deleted file mode 100644
index 7c4ff6105222..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.4 ) doc? ( app-doc/doxygen ) test? ( dev-util/cmockery ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=4
-HOMEPAGE=http://www.libssh.org/
-IUSE=debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-SLOT=0
-SRC_URI=https://red.libssh.org/attachments/download/38/libssh-0.5.3.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8048ade128d85eb7e52e947c64fd72d5
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.3.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.3.0
new file mode 100644
index 000000000000..db444c298b74
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=RabbitMQ C client
+EAPI=5
+HOMEPAGE=https://github.com/alanxz/rabbitmq-c
+IUSE=tools
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/rabbitmq-c-v0.3.0.zip
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	2dda478e7e4206f6fb1aa72785cb5ef7	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2eefb8a950fadcf5c468c9377caff180
diff --git a/metadata/md5-cache/net-mail/dovecot-2.1.15 b/metadata/md5-cache/net-mail/dovecot-2.1.15
index c3fa79e2939b..2f50aead3469 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.1.15
+++ b/metadata/md5-cache/net-mail/dovecot-2.1.15
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 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
+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.15.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	28706ddc21464b4ed255eee9fc70b516	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fd3d65e6cf7091531dba3f2055903202
+_md5_=bf599c1f81e59fd503b0571c9a72a2f3
diff --git a/metadata/md5-cache/net-misc/connman-1.11 b/metadata/md5-cache/net-misc/connman-1.11
new file mode 100644
index 000000000000..068a27bba9f4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
+DESCRIPTION=Provides a daemon for managing internet connections
+EAPI=5
+HOMEPAGE=http://connman.net
+IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
+SLOT=0
+SRC_URI=mirror://kernel/linux/network/connman/connman-1.11.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7730703cacda80a8aa516d772a18c654
diff --git a/metadata/md5-cache/net-misc/connman-1.4 b/metadata/md5-cache/net-misc/connman-1.4
deleted file mode 100644
index 823089e348aa..000000000000
--- a/metadata/md5-cache/net-misc/connman-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
-DESCRIPTION=Provides a daemon for managing internet connections
-EAPI=4
-HOMEPAGE=http://connman.net
-IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax )
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.4.tar.xz
-_md5_=2fa484727abe2274f1584df9d1aa5744
diff --git a/metadata/md5-cache/net-misc/connman-1.5 b/metadata/md5-cache/net-misc/connman-1.5
deleted file mode 100644
index 9515cbb66f2e..000000000000
--- a/metadata/md5-cache/net-misc/connman-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
-DESCRIPTION=Provides a daemon for managing internet connections
-EAPI=4
-HOMEPAGE=http://connman.net
-IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax )
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.5.tar.xz
-_md5_=aada8f8dbb83067b54e840d6897e0a54
diff --git a/metadata/md5-cache/net-misc/connman-1.6 b/metadata/md5-cache/net-misc/connman-1.6
deleted file mode 100644
index 5ff29b883028..000000000000
--- a/metadata/md5-cache/net-misc/connman-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
-DESCRIPTION=Provides a daemon for managing internet connections
-EAPI=4
-HOMEPAGE=http://connman.net
-IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax )
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.6.tar.xz
-_md5_=c2646f717eb0bc0c9f9cd3290fe872c5
diff --git a/metadata/md5-cache/net-misc/connman-1.7 b/metadata/md5-cache/net-misc/connman-1.7
deleted file mode 100644
index fc61f9343b9a..000000000000
--- a/metadata/md5-cache/net-misc/connman-1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
-DESCRIPTION=Provides a daemon for managing internet connections
-EAPI=4
-HOMEPAGE=http://connman.net
-IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax )
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.7.tar.xz
-_md5_=b1891d88961633ee451e242515fa42d3
diff --git a/metadata/md5-cache/net-misc/connman-1.8 b/metadata/md5-cache/net-misc/connman-1.8
deleted file mode 100644
index 9fc68a213a4b..000000000000
--- a/metadata/md5-cache/net-misc/connman-1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax ) >=sys-kernel/linux-headers-2.6.39 doc? ( dev-util/gtk-doc )
-DESCRIPTION=Provides a daemon for managing internet connections
-EAPI=4
-HOMEPAGE=http://connman.net
-IUSE=bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 >=dev-libs/libnl-1.1 >=net-firewall/iptables-1.4.8 net-libs/gnutls bluetooth? ( net-wireless/bluez ) ofono? ( net-misc/ofono ) policykit? ( sys-auth/polkit ) openvpn? ( net-misc/openvpn ) vpnc? ( net-misc/vpnc ) wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] ) wimax? ( net-wireless/wimax )
-SLOT=0
-SRC_URI=mirror://kernel/linux/network/connman/connman-1.8.tar.xz
-_md5_=959f9977aa8530c50355e571c69d3ff9
diff --git a/metadata/md5-cache/net-misc/lldpd-0.7.1 b/metadata/md5-cache/net-misc/lldpd-0.7.1
index 61434c9aac39..725c49245914 100644
--- a/metadata/md5-cache/net-misc/lldpd-0.7.1
+++ b/metadata/md5-cache/net-misc/lldpd-0.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=5
 HOMEPAGE=http://github.com/vincentbernat/lldpd/wiki
 IUSE=cdp doc +dot1 +dot3 edp fdp graph json +lldpmed sonmp snmp readline xml
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) json? ( dev-libs/jansson )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.7.1.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aba3c1f9cbf90f9b082f3213c1a8d6dc
+_md5_=6179565e5e58025b6d59c0cffe6bf5e2
diff --git a/metadata/md5-cache/net-misc/radvd-1.9.2-r1 b/metadata/md5-cache/net-misc/radvd-1.9.2-r1
index 9f4ebb087e64..367fb07bbba4 100644
--- a/metadata/md5-cache/net-misc/radvd-1.9.2-r1
+++ b/metadata/md5-cache/net-misc/radvd-1.9.2-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-devel/bison sys-devel/flex 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=Linux IPv6 Router Advertisement Daemon
 EAPI=4
 HOMEPAGE=http://v6web.litech.org/radvd/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-1.9.2.tar.gz
-_eclasses_=systemd	28706ddc21464b4ed255eee9fc70b516	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2d4e0c3a6432992ea7cd4256b4619932
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	28706ddc21464b4ed255eee9fc70b516	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=69d3d6786fa939b13b48d8dbf92e4e1c
diff --git a/metadata/md5-cache/net-misc/vpnc-0.5.3_p527 b/metadata/md5-cache/net-misc/vpnc-0.5.3_p527
new file mode 100644
index 000000000000..2fac303c8950
--- /dev/null
+++ b/metadata/md5-cache/net-misc/vpnc-0.5.3_p527
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=dev-lang/perl dev-libs/libgcrypt >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl )
+DESCRIPTION=Free client for Cisco VPN routing software
+EAPI=5
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~massar/vpnc/
+IUSE=resolvconf +gnutls bindist
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-lang/perl dev-libs/libgcrypt >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) resolvconf? ( net-dns/openresolv )
+REQUIRED_USE=bindist? ( gnutls )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/vpnc-0.5.3_p527.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4446101956c750b61c961c6647bdf181
diff --git a/metadata/md5-cache/net-nds/389-admin-1.1.23 b/metadata/md5-cache/net-nds/389-admin-1.1.23
deleted file mode 100644
index 1588c26d6e26..000000000000
--- a/metadata/md5-cache/net-nds/389-admin-1.1.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-apps/sed >=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/mozldap dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] =www-servers/apache-2.2* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=389 Directory Server (admin)
-EAPI=2
-HOMEPAGE=http://port389.org/
-IUSE=debug ipv6 selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 Apache-2.0
-RDEPEND=>=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/mozldap dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] www-client/lynx =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-admin-1.1.23.tar.bz2
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d3d90b9bc7d3bd86d0fea4298b22248
diff --git a/metadata/md5-cache/net-nds/389-admin-1.1.16 b/metadata/md5-cache/net-nds/389-admin-1.1.31
similarity index 80%
rename from metadata/md5-cache/net-nds/389-admin-1.1.16
rename to metadata/md5-cache/net-nds/389-admin-1.1.31
index 0e8b0105e33e..2c716e17a368 100644
--- a/metadata/md5-cache/net-nds/389-admin-1.1.16
+++ b/metadata/md5-cache/net-nds/389-admin-1.1.31
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-apps/sed >=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/mozldap dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] =www-servers/apache-2.2* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=sys-apps/sed >=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] net-nds/openldap selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] =www-servers/apache-2.2* =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=389 Directory Server (admin)
-EAPI=2
+EAPI=5
 HOMEPAGE=http://port389.org/
 IUSE=debug ipv6 selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 Apache-2.0
-RDEPEND=>=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/mozldap dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] www-client/lynx =www-servers/apache-2.2*
+RDEPEND=>=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] net-nds/openldap selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils sec-policy/selinux-base-policy ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] www-client/lynx =www-servers/apache-2.2*
 SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-admin-1.1.16.tar.bz2
+SRC_URI=http://directory.fedoraproject.org/sources/389-admin-1.1.31.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ddc2fa05da2d01957e0be8711c74dd8
+_md5_=3d356c73aa2bd22b92308805bd968def
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.2.11.15 b/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
similarity index 51%
rename from metadata/md5-cache/net-nds/389-ds-base-1.2.11.15
rename to metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
index 1d12f981474a..8d512bff9982 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.2.11.15
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.3.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!>=sys-libs/db-5.0 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/openssl dev-libs/libpcre:3 dev-libs/mozldap dev-perl/perl-mozldap >=net-analyzer/net-snmp-5.1.2 sys-apps/tcp-wrappers >=sys-libs/db-4.5 sys-libs/pam sys-libs/zlib kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) selinux? ( sys-devel/m4 >=sys-apps/checkpolicy-1.30.12 ) sys-apps/sed =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!>=sys-libs/db-5.0 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/openssl dev-libs/libpcre:3 dev-perl/perl-mozldap >=net-analyzer/net-snmp-5.1.2 net-nds/openldap sys-apps/tcp-wrappers >=sys-libs/db-4.5 sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) selinux? ( sys-devel/m4 >=sys-apps/checkpolicy-1.30.12 ) sys-apps/sed =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=389 Directory Server (core librares and daemons )
-EAPI=2
+EAPI=5
 HOMEPAGE=http://port389.org/
 IUSE=autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2-with-exceptions
-RDEPEND=!>=sys-libs/db-5.0 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/openssl dev-libs/libpcre:3 dev-libs/mozldap dev-perl/perl-mozldap >=net-analyzer/net-snmp-5.1.2 sys-apps/tcp-wrappers >=sys-libs/db-4.5 sys-libs/pam sys-libs/zlib kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/perl-Time-Local virtual/perl-MIME-Base64
+RDEPEND=!>=sys-libs/db-5.0 >=dev-libs/cyrus-sasl-2.1.19 >=dev-libs/icu-3.4 dev-libs/nss[utils] dev-libs/nspr dev-libs/svrcore dev-libs/openssl dev-libs/libpcre:3 dev-perl/perl-mozldap >=net-analyzer/net-snmp-5.1.2 net-nds/openldap sys-apps/tcp-wrappers >=sys-libs/db-4.5 sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( >=sys-apps/policycoreutils-1.30.30 sec-policy/selinux-base-policy ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-ds-base-1.2.11.15.tar.bz2
+SRC_URI=http://directory.fedoraproject.org/sources/389-ds-base-1.3.0.2.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=158c6c9f9a02595c9a5a57be2561eb6f
+_md5_=614a1f581d554b972eae47759caa13e4
diff --git a/metadata/md5-cache/net-news/quiterss-0.11.0 b/metadata/md5-cache/net-news/quiterss-0.11.0
index b7cc3582641a..a689a79bb0ac 100644
--- a/metadata/md5-cache/net-news/quiterss-0.11.0
+++ b/metadata/md5-cache/net-news/quiterss-0.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt4-based RSS/Atom feed reader
 EAPI=5
 HOMEPAGE=http://code.google.com/p/quite-rss/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4
 SLOT=0
 SRC_URI=http://quite-rss.googlecode.com/files/QuiteRSS-0.11.0-src.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f124ed8c7f1837b7e589cb7941ee9f31
+_md5_=c4f923f69a1d646bc482b1d06b2be1c4
diff --git a/metadata/md5-cache/net-nntp/nzbget-10.0_pre577 b/metadata/md5-cache/net-nntp/nzbget-10.0_pre577
new file mode 100644
index 000000000000..93894f70c421
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/nzbget-10.0_pre577
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/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
+DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
+EAPI=5
+HOMEPAGE=http://nzbget.sourceforge.net/
+IUSE=debug gnutls ncurses parcheck ssl zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/nzbget/nzbget-10.0-testing-r577.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e564f1f03efeeaad7b3bef0d5e95ccf6
diff --git a/metadata/md5-cache/net-proxy/squid-3.2.9 b/metadata/md5-cache/net-proxy/squid-3.2.9
index 62c8d1a299cc..54a80277d484 100644
--- a/metadata/md5-cache/net-proxy/squid-3.2.9
+++ b/metadata/md5-cache/net-proxy/squid-3.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client ssl-crtd mysql postgres sqlite qos tproxy pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.9.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c273bfae1e626a660c91b69c21d96aac
+_md5_=2996ca82e3695599e817a1dd970bfaf7
diff --git a/metadata/md5-cache/sys-apps/entropy-183 b/metadata/md5-cache/sys-apps/entropy-183
new file mode 100644
index 000000000000..c9045b16d768
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/entropy-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=dev-db/sqlite[soundex] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9 sys-devel/gettext dev-util/intltool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+DESCRIPTION=Entropy Package Manager foundation library
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite[soundex] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9 sys-devel/gettext =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2509e2657474180603c0e795d4a703c1
diff --git a/metadata/md5-cache/sys-apps/entropy-server-183 b/metadata/md5-cache/sys-apps/entropy-server-183
new file mode 100644
index 000000000000..4f075b0c527d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/entropy-server-183
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-text/asciidoc =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager server-side tools
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+IUSE=+matter
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/entropy-183 matter? ( ~app-admin/matter-183[entropy] ) =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=76729db68d07454565c625a4584d19a4
diff --git a/metadata/md5-cache/sys-apps/magneto-core-183 b/metadata/md5-cache/sys-apps/magneto-core-183
new file mode 100644
index 000000000000..fa40b4e111a6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/magneto-core-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=~sys-apps/rigo-daemon-183 =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet library
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/rigo-daemon-183 x11-misc/xdg-utils =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=541b99b974bdb02fe4904b984fe47c58
diff --git a/metadata/md5-cache/sys-apps/rigo-daemon-183 b/metadata/md5-cache/sys-apps/rigo-daemon-183
new file mode 100644
index 000000000000..349ab4f994ff
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rigo-daemon-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Client DBus Services, aka RigoDaemon
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/dbus-python dev-python/pygobject:3 ~sys-apps/entropy-183 sys-auth/polkit[introspection] sys-devel/gettext =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=21e6655302da71b40d7467821505bc99
diff --git a/metadata/md5-cache/sys-cluster/nova-2012.2.3-r1 b/metadata/md5-cache/sys-cluster/nova-2012.2.3-r2
similarity index 98%
rename from metadata/md5-cache/sys-cluster/nova-2012.2.3-r1
rename to metadata/md5-cache/sys-cluster/nova-2012.2.3-r2
index 942ee16a316b..3fd39c5885ac 100644
--- a/metadata/md5-cache/sys-cluster/nova-2012.2.3-r1
+++ b/metadata/md5-cache/sys-cluster/nova-2012.2.3-r2
@@ -10,4 +10,4 @@ RDEPEND==dev-python/amqplib-0.6.1 >=dev-python/anyjson-0.2.4 >=dev-python/sqlalc
 SLOT=0
 SRC_URI=http://launchpad.net/nova/folsom/2012.2.3/+download/nova-2012.2.3.tar.gz
 _eclasses_=distutils-r1	b0e385aa50f6f85a0eb08281706524f9	eutils	50d18ebffcbd8bd63614b89c2d664d0d	multibuild	09ecc885e84a763742480174a993ee70	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	9e27078cbd192d8f424351fa8e0ee975	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9ef7305bb2a20adefa4aa148db836cda
+_md5_=3c5402922a936fa1a09d610ca39d0445
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2 b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2
new file mode 100644
index 000000000000..dc7e284f24a8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/pacemaker-gui-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=app-arch/bzip2 dev-libs/glib:2 dev-libs/libxslt dev-libs/openssl net-libs/gnutls sys-apps/util-linux sys-cluster/cluster-glue >=sys-cluster/pacemaker-1.1 heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib gtk? ( dev-lang/swig ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-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=Pacemaker python GUI and management daemon
+EAPI=4
+HOMEPAGE=http://hg.clusterlabs.org/pacemaker/pygui/
+IUSE=-gtk heartbeat nls snmp static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 dev-libs/glib:2 dev-libs/libxslt dev-libs/openssl net-libs/gnutls sys-apps/util-linux sys-cluster/cluster-glue >=sys-cluster/pacemaker-1.1 heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib sys-devel/libtool =dev-lang/python-2*
+SLOT=0
+SRC_URI=https://github.com/gao-yan/pacemaker-mgmt/tarball/pacemaker-mgmt-2.1.2 -> pacemaker-gui-2.1.2.tar.gz
+_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d6e9dcef211881c74c3ff122c15ae3cf
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-3.8.0 b/metadata/md5-cache/sys-fs/aufs-headers-3.8_p20130318
similarity index 75%
rename from metadata/md5-cache/sys-fs/aufs-headers-3.8.0
rename to metadata/md5-cache/sys-fs/aufs-headers-3.8_p20130318
index 0916646f2c93..b6789787f5fe 100644
--- a/metadata/md5-cache/sys-fs/aufs-headers-3.8.0
+++ b/metadata/md5-cache/sys-fs/aufs-headers-3.8_p20130318
@@ -5,6 +5,6 @@ HOMEPAGE=http://aufs.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-headers-3.8.0.tar.xz
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-headers-3.8_p20130318.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9be68ad1e0a226531bd9bd27024aa440
+_md5_=6870b1e7e60d901f868d5ee059e78a01
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.8.0 b/metadata/md5-cache/sys-fs/aufs-util-3.8_p20130318
similarity index 73%
rename from metadata/md5-cache/sys-fs/aufs-util-3.8.0
rename to metadata/md5-cache/sys-fs/aufs-util-3.8_p20130318
index fd8761ad6ca2..605654c8654d 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-3.8.0
+++ b/metadata/md5-cache/sys-fs/aufs-util-3.8_p20130318
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !sys-fs/aufs3 ~sys-fs/aufs-headers-3.8.0
+DEPEND=!sys-fs/aufs2 !sys-fs/aufs3 ~sys-fs/aufs-headers-3.8_p20130318
 DESCRIPTION=Utilities are always necessary for aufs
 EAPI=5
 HOMEPAGE=http://aufs.sourceforge.net/
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/aufs2 !sys-fs/aufs3
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.8.0.tar.xz
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.8_p20130318.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f4f7dcbf0880f65f35d808eb1e71be70
+_md5_=536ffd4ce6dbfbd9e7d51e90eac01577
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20130318 b/metadata/md5-cache/sys-fs/aufs3-3_p20130318
new file mode 100644
index 000000000000..29d0fa0cade2
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20130318
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=5
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
+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
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.12 b/metadata/md5-cache/sys-fs/inotify-tools-3.12
deleted file mode 100644
index 90b522181a48..000000000000
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.12
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=a set of command-line programs providing a simple interface to inotify
-HOMEPAGE=http://inotify-tools.sourceforge.net/
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/inotify-tools/inotify-tools-3.12.tar.gz
-_md5_=465283b2d29850aa2c541e6ee239f400
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.13 b/metadata/md5-cache/sys-fs/inotify-tools-3.13
deleted file mode 100644
index a667429931f2..000000000000
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.13
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=a set of command-line programs providing a simple interface to inotify
-HOMEPAGE=http://inotify-tools.sourceforge.net/
-KEYWORDS=~amd64 ~hppa ~x86 ~arm
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/inotify-tools/inotify-tools-3.13.tar.gz
-_md5_=e8cf5db47dff47269a66f20070b12e9b
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.13-r1 b/metadata/md5-cache/sys-fs/inotify-tools-3.13-r1
index f454f750afff..e6331af77049 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.13-r1
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.13-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=a set of command-line programs providing a simple interface to inotify
 EAPI=2
-HOMEPAGE=http://inotify-tools.sourceforge.net/
+HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 IUSE=doc
 KEYWORDS=amd64 arm hppa x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/inotify-tools/inotify-tools-3.13.tar.gz
-_md5_=34898e882ab6bad7cd926e697ad625ae
+_md5_=d0551dda4181e7dec9d41f79261a8772
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.14 b/metadata/md5-cache/sys-fs/inotify-tools-3.14
index 758e4858511d..894cfaa2a08b 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.14
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.14
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
 DEPEND=doc? ( app-doc/doxygen )
 DESCRIPTION=a set of command-line programs providing a simple interface to inotify
 EAPI=2
-HOMEPAGE=http://inotify-tools.sourceforge.net/
+HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 IUSE=doc
 KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-3.14.tar.gz
-_md5_=c583c64a3dbcb852019359f76c2b7eeb
+_md5_=ba442d1c95346895dfbcbe3b5b4dbbd3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r1
index 38fab81914ca..47d0a3683f7c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r1
@@ -6,10 +6,10 @@ 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.0 !build? ( virtual/dev-manager )
+PDEPEND=>=sys-fs/aufs-util-3.8 !build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
 SLOT=3.8.2-r1
 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-4.base.tar.xz mirror://gentoo/genpatches-3.8-4.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.8.2.tar.xz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	ffd9ec26791c58893983f16c9944d364	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=977bb5bd5994aa755fb9a929cbca64b0
+_md5_=139f8fc0538f5a938d316a77e408ce89
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r2 b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r2
new file mode 100644
index 000000000000..fe2dae27c783
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.8.2-r2
@@ -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 )
+RESTRICT=binchecks strip
+SLOT=3.8.2-r2
+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-4.base.tar.xz mirror://gentoo/genpatches-3.8-4.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.8_p20130318.tar.xz
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	kernel-2	ffd9ec26791c58893983f16c9944d364	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7c8f769d68dbb737dedf53e1aa38d2c5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.69 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.69
new file mode 100644
index 000000000000..a9912810222b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.69
@@ -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 )
+RESTRICT=binchecks strip
+SLOT=3.0.69
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.69.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	ffd9ec26791c58893983f16c9944d364	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d4da3843d36782b2eeb262d396aacb79
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.36 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.36
new file mode 100644
index 000000000000..26c574d4e3b5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.36
@@ -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 )
+RESTRICT=binchecks strip
+SLOT=3.4.36
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.36.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	ffd9ec26791c58893983f16c9944d364	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ca2b20ad19cac216fb6dd950f34a5e23
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.3
new file mode 100644
index 000000000000..8c887b91691e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.8.3
@@ -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 )
+RESTRICT=binchecks strip
+SLOT=3.8.3
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.8.3.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	ffd9ec26791c58893983f16c9944d364	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=90417cf40519392ea958bc9aff962913
diff --git a/metadata/md5-cache/www-apps/389-dsgw-1.1.5 b/metadata/md5-cache/www-apps/389-dsgw-1.1.10
similarity index 71%
rename from metadata/md5-cache/www-apps/389-dsgw-1.1.5
rename to metadata/md5-cache/www-apps/389-dsgw-1.1.10
index 13d81a01be9c..b4820c5e6798 100644
--- a/metadata/md5-cache/www-apps/389-dsgw-1.1.5
+++ b/metadata/md5-cache/www-apps/389-dsgw-1.1.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu dev-libs/389-adminutil net-nds/openldap || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=389 Directory Server Gateway Web Application
-EAPI=2
+EAPI=5
 HOMEPAGE=http://port389.org/
 IUSE=debug +adminserver
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
+RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu dev-libs/389-adminutil net-nds/openldap dev-perl/perl-mozldap virtual/perl-CGI
 SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.5.tar.bz2
+SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.10.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=27b9e0979c5bf9a61b62d32aee239e09
+_md5_=9ea330ddd2c374f593e239ba60b63568
diff --git a/metadata/md5-cache/www-apps/389-dsgw-1.1.6 b/metadata/md5-cache/www-apps/389-dsgw-1.1.6
deleted file mode 100644
index 25eac150c315..000000000000
--- a/metadata/md5-cache/www-apps/389-dsgw-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=389 Directory Server Gateway Web Application
-EAPI=2
-HOMEPAGE=http://port389.org/
-IUSE=debug +adminserver
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
-SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.6.tar.bz2
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=41b23bdf1e4bf0d3cd118a72c6adeae3
diff --git a/metadata/md5-cache/www-apps/389-dsgw-1.1.7 b/metadata/md5-cache/www-apps/389-dsgw-1.1.7
deleted file mode 100644
index 5e5815ea053e..000000000000
--- a/metadata/md5-cache/www-apps/389-dsgw-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=389 Directory Server Gateway Web Application
-EAPI=2
-HOMEPAGE=http://port389.org/
-IUSE=debug +adminserver
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
-SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.7.tar.bz2
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ab4918b702f4aac9252b0d7323164d6
diff --git a/metadata/md5-cache/www-client/firefox-17.0.4 b/metadata/md5-cache/www-client/firefox-17.0.4
index 88260e145a24..4e71d814fb2a 100644
--- a/metadata/md5-cache/www-client/firefox-17.0.4
+++ b/metadata/md5-cache/www-client/firefox-17.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Firefox Web Browser
 EAPI=3
 HOMEPAGE=http://www.mozilla.com/firefox
 IUSE=bindist gstreamer +jit +minimal pgo selinux system-sqlite custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.14.1 >=dev-libs/nspr-4.9.4 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 >=media-libs/libpng-1.5.11[apng] virtual/libffi gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] ) system-sqlite? ( >=dev-db/sqlite-3.7.13[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) >=media-libs/libvpx-1.0.0 kernel_linux? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) virtual/freedesktop-icon-theme dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
 SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/af.xpi -> firefox-17.0.4esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ak.xpi -> firefox-17.0.4esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ar.xpi -> firefox-17.0.4esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/as.xpi -> firefox-17.0.4esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ast.xpi -> firefox-17.0.4esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/be.xpi -> firefox-17.0.4esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/bg.xpi -> firefox-17.0.4esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/bn-BD.xpi -> firefox-17.0.4esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/bn-IN.xpi -> firefox-17.0.4esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/br.xpi -> firefox-17.0.4esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/bs.xpi -> firefox-17.0.4esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ca.xpi -> firefox-17.0.4esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/cs.xpi -> firefox-17.0.4esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/csb.xpi -> firefox-17.0.4esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/cy.xpi -> firefox-17.0.4esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/da.xpi -> firefox-17.0.4esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/de.xpi -> firefox-17.0.4esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/el.xpi -> firefox-17.0.4esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/en-GB.xpi -> firefox-17.0.4esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/en-ZA.xpi -> firefox-17.0.4esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/eo.xpi -> firefox-17.0.4esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/es-AR.xpi -> firefox-17.0.4esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/es-CL.xpi -> firefox-17.0.4esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/es-ES.xpi -> firefox-17.0.4esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/es-MX.xpi -> firefox-17.0.4esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/et.xpi -> firefox-17.0.4esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/eu.xpi -> firefox-17.0.4esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/fa.xpi -> firefox-17.0.4esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/fi.xpi -> firefox-17.0.4esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/fr.xpi -> firefox-17.0.4esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/fy-NL.xpi -> firefox-17.0.4esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ga-IE.xpi -> firefox-17.0.4esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/gd.xpi -> firefox-17.0.4esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/gl.xpi -> firefox-17.0.4esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/gu-IN.xpi -> firefox-17.0.4esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/he.xpi -> firefox-17.0.4esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/hi-IN.xpi -> firefox-17.0.4esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/hr.xpi -> firefox-17.0.4esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/hu.xpi -> firefox-17.0.4esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/hy-AM.xpi -> firefox-17.0.4esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/id.xpi -> firefox-17.0.4esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/is.xpi -> firefox-17.0.4esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/it.xpi -> firefox-17.0.4esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ja.xpi -> firefox-17.0.4esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/kk.xpi -> firefox-17.0.4esr-kk.xpi ) linguas_km? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/km.xpi -> firefox-17.0.4esr-km.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/kn.xpi -> firefox-17.0.4esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ko.xpi -> firefox-17.0.4esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ku.xpi -> firefox-17.0.4esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/lg.xpi -> firefox-17.0.4esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/lt.xpi -> firefox-17.0.4esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/lv.xpi -> firefox-17.0.4esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/mai.xpi -> firefox-17.0.4esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/mk.xpi -> firefox-17.0.4esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ml.xpi -> firefox-17.0.4esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/mr.xpi -> firefox-17.0.4esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/nb-NO.xpi -> firefox-17.0.4esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/nl.xpi -> firefox-17.0.4esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/nn-NO.xpi -> firefox-17.0.4esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/nso.xpi -> firefox-17.0.4esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/or.xpi -> firefox-17.0.4esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/pa-IN.xpi -> firefox-17.0.4esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/pl.xpi -> firefox-17.0.4esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/pt-BR.xpi -> firefox-17.0.4esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/pt-PT.xpi -> firefox-17.0.4esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/rm.xpi -> firefox-17.0.4esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ro.xpi -> firefox-17.0.4esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ru.xpi -> firefox-17.0.4esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/si.xpi -> firefox-17.0.4esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/sk.xpi -> firefox-17.0.4esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/sl.xpi -> firefox-17.0.4esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/son.xpi -> firefox-17.0.4esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/sq.xpi -> firefox-17.0.4esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/sr.xpi -> firefox-17.0.4esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/sv-SE.xpi -> firefox-17.0.4esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ta.xpi -> firefox-17.0.4esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/ta-LK.xpi -> firefox-17.0.4esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/te.xpi -> firefox-17.0.4esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/th.xpi -> firefox-17.0.4esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/tr.xpi -> firefox-17.0.4esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/uk.xpi -> firefox-17.0.4esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/vi.xpi -> firefox-17.0.4esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/zh-CN.xpi -> firefox-17.0.4esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/zh-TW.xpi -> firefox-17.0.4esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/linux-i686/xpi/zu.xpi -> firefox-17.0.4esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-17.0-patches-0.4.tar.xz http://dev.gentoo.org/~nirbheek/mozilla/patchsets/firefox-17.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//17.0.4esr/source/firefox-17.0.4esr.source.tar.bz2
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	mozconfig-3	4eecca819170c6b71a66bda7fd56c503	mozcoreconf-2	2a626ad4c1fc2464ae55194bcc880b38	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	5b1ba3795fea6a2fcced53a5c01b5ea6	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-any-r1	9bedbe95123c76570994470ea4e0cc5b	python-utils-r1	c5012e18184f3e0473a1f1a7b9662ab0	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f635dd41425888ff24ae6a9924241820
+_md5_=912885cea5806b9f4be3625227c96565
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.67 b/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.68
similarity index 90%
rename from metadata/md5-cache/www-plugins/adobe-flash-10.3.183.67
rename to metadata/md5-cache/www-plugins/adobe-flash-10.3.183.68
index 335941103777..175295e2ffa1 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.67
+++ b/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.68
@@ -9,6 +9,6 @@ LICENSE=AdobeFlash-10.3
 RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( www-plugins/nspluginwrapper ) selinux? ( sec-policy/selinux-flash )
 RESTRICT=strip mirror
 SLOT=0
-SRC_URI=http://fpdownload.macromedia.com/get/flashplayer/pdc/10.3.183.67/install_flash_player_10_linux.tar.gz -> adobe-flash-10.3.183.67.i386.tar.gz
+SRC_URI=http://fpdownload.macromedia.com/get/flashplayer/pdc/10.3.183.68/install_flash_player_10_linux.tar.gz -> adobe-flash-10.3.183.68.i386.tar.gz
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0072dd7e5ddfcbfb6b5f10da31750219
+_md5_=957c788abf362c77f8aa8a4a2106815c
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.275 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.275
new file mode 100644
index 000000000000..cb673063ba6f
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.275
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst pretend setup unpack
+DEPEND=amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) ) selinux? ( sec-policy/selinux-flash )
+DESCRIPTION=Adobe Flash Player
+EAPI=4
+HOMEPAGE=http://www.adobe.com/products/flashplayer.html
+IUSE=multilib -32bit +64bit selinux vdpau kde +sse2check
+KEYWORDS=-* amd64 x86
+LICENSE=AdobeFlash-11.x
+RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) ) selinux? ( sec-policy/selinux-flash )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.275/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.275.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.275/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.275.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.275/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.275.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.275/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.275.x86_64.tar.gz ) )
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	nsplugins	b195a1306f4ee7cf507037dc6aa5ba89	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d79ddccb5f70710f4489fa85bac8a1f8
diff --git a/metadata/md5-cache/www-servers/varnish-2.0.4-r1 b/metadata/md5-cache/www-servers/varnish-2.0.4-r1
deleted file mode 100644
index 1df0ef68879d..000000000000
--- a/metadata/md5-cache/www-servers/varnish-2.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator.
-EAPI=2
-HOMEPAGE=http://varnish.projects.linpro.no/
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 GPL-2
-RDEPEND=sys-devel/gcc
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/varnish/varnish-2.0.4.tar.gz
-_eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=420679b9b0a8c01588ba303f40611b0c
diff --git a/metadata/md5-cache/www-servers/varnish-3.0.3 b/metadata/md5-cache/www-servers/varnish-3.0.3-r1
similarity index 64%
rename from metadata/md5-cache/www-servers/varnish-3.0.3
rename to metadata/md5-cache/www-servers/varnish-3.0.3-r1
index 78b4486d36bd..923772b2accb 100644
--- a/metadata/md5-cache/www-servers/varnish-3.0.3
+++ b/metadata/md5-cache/www-servers/varnish-3.0.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) dev-python/docutils virtual/pkgconfig
+DEPEND=dev-libs/libpcre jemalloc? ( dev-libs/jemalloc ) libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) dev-python/docutils virtual/pkgconfig
 DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.varnish-cache.org/
-IUSE=doc libedit static-libs +tools
+IUSE=doc jemalloc libedit static-libs +tools
 KEYWORDS=~amd64 ~mips ~x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) sys-devel/gcc
+RDEPEND=dev-libs/libpcre jemalloc? ( dev-libs/jemalloc ) libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) sys-devel/gcc
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
 _eclasses_=autotools	cf83655b19ed98f9ea3b44f4572b51a3	autotools-utils	c3608254689d959486b175186734d10d	eutils	50d18ebffcbd8bd63614b89c2d664d0d	libtool	2b273eea1976cfaed3449345d94331ac	multilib	ded93e450747134a079e647d888aa80b	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab8d1b071ab5eaf1fd5502dbbf542ca5
+_md5_=af75d8e2c53c25b9fd2fadf7f9864930
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.84 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.84
index e113db1f0064..97768ed9ad13 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.84
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.84
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA X11 driver and GLX libraries
 EAPI=4
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA
 PDEPEND=X? ( >=x11-libs/libvdpau-0.3-r1 )
 RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) X? ( <x11-base/xorg-server-1.14.99 >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) X? ( x11-libs/libXvMC ) kernel_linux? ( virtual/modutils )
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/304.84/NVIDIA-Linux-x86-304.84.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/304.84/NVIDIA-Linux-x86_64-304.84.run ) amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/304.84/NVIDIA-FreeBSD-x86_64-304.84.tar.gz ) x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/304.84/NVIDIA-FreeBSD-x86-304.84.tar.gz )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	nvidia-driver	80e162b87fb4c2e236684d64adc96ed4	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	fea2246732f911905d6991fed203e65c	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cfadc7efe5f37e39043eca76016982ab
+_md5_=e3a72545831776e91c2a97739ef151f6
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-310.40 b/metadata/md5-cache/x11-drivers/nvidia-drivers-310.40
index b12f020195c7..ea16b2c6161d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-310.40
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-310.40
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA X11 driver and GLX libraries
 EAPI=4
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA
 RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) X? ( <x11-base/xorg-server-1.14.99 >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) X? ( >=x11-libs/libvdpau-0.3-r1 ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/310.40/NVIDIA-Linux-x86-310.40.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/310.40/NVIDIA-Linux-x86_64-310.40.run ) amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/310.40/NVIDIA-FreeBSD-x86_64-310.40.tar.gz ) x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/310.40/NVIDIA-FreeBSD-x86-310.40.tar.gz )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	nvidia-driver	80e162b87fb4c2e236684d64adc96ed4	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	fea2246732f911905d6991fed203e65c	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8b1de391f1421b69efb57b4a05ea706c
+_md5_=709b91f7fd2b389ade7609604685854c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-313.26 b/metadata/md5-cache/x11-drivers/nvidia-drivers-313.26
index aec51d82f35a..372a402ba36a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-313.26
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-313.26
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA X11 driver and GLX libraries
 EAPI=5
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA
 RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) X? ( <x11-base/xorg-server-1.14.99 >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( >=x11-libs/libvdpau-0.3-r1 ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/313.26/NVIDIA-Linux-x86-313.26.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/313.26/NVIDIA-Linux-x86_64-313.26.run ) amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/313.26/NVIDIA-FreeBSD-x86_64-313.26.tar.gz ) x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/313.26/NVIDIA-FreeBSD-x86-313.26.tar.gz )
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	ded93e450747134a079e647d888aa80b	nvidia-driver	80e162b87fb4c2e236684d64adc96ed4	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	fea2246732f911905d6991fed203e65c	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5e873d3bd9380f4d7b33361c9da29483
+_md5_=60d05071d249e25dae14a10084765c0b
diff --git a/metadata/md5-cache/x11-misc/i3status-2.6 b/metadata/md5-cache/x11-misc/i3status-2.6
index 794e9d979fb7..dff4d955dc84 100644
--- a/metadata/md5-cache/x11-misc/i3status-2.6
+++ b/metadata/md5-cache/x11-misc/i3status-2.6
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/confuse >=dev-libs/yajl-2.0.2 media-libs/alsa-lib net-wireless/
 SLOT=0
 SRC_URI=http://i3wm.org/i3status/i3status-2.6.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fcaps	6719ae71a423a3f427a62731d126b098	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8d63bb61a77a39dd56e3f9f2d800392a
+_md5_=f8c68c7af1a42d720ae107c0a636b865
diff --git a/metadata/md5-cache/x11-misc/i3status-2.7 b/metadata/md5-cache/x11-misc/i3status-2.7
index 28730b7ec84d..75d93852b14a 100644
--- a/metadata/md5-cache/x11-misc/i3status-2.7
+++ b/metadata/md5-cache/x11-misc/i3status-2.7
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/confuse >=dev-libs/yajl-2.0.2 media-libs/alsa-lib net-wireless/
 SLOT=0
 SRC_URI=http://i3wm.org/i3status/i3status-2.7.tar.bz2
 _eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	fcaps	6719ae71a423a3f427a62731d126b098	multilib	ded93e450747134a079e647d888aa80b	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e90d2fedb8479b15bebd960854649129
+_md5_=95fbf65cfd0a0d9f1e4f98d3919b8fcf
diff --git a/metadata/md5-cache/x11-misc/magneto-gtk-183 b/metadata/md5-cache/x11-misc/magneto-gtk-183
new file mode 100644
index 000000000000..42c3d5c9780a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/magneto-gtk-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet GTK2 frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-183 dev-python/notify-python dev-python/pygtk:2 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=102bfd04f02b64f6a344e3235bca57f3
diff --git a/metadata/md5-cache/x11-misc/magneto-gtk3-183 b/metadata/md5-cache/x11-misc/magneto-gtk3-183
new file mode 100644
index 000000000000..ae5045958367
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/magneto-gtk3-183
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet GTK3 frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-183 dev-libs/gobject-introspection x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-183.tar.bz2
+_eclasses_=eutils	50d18ebffcbd8bd63614b89c2d664d0d	multilib	ded93e450747134a079e647d888aa80b	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=467c587a456118be24062d2bddbaa9e8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bcf8dc714a45..c7993f0ac9f2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Mar 2013 10:36:56 +0000
+Fri, 15 Mar 2013 13:06:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 744f791a5431..1212f2dd94d3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Mar 14 10:36:54 UTC 2013
+Fri Mar 15 13:06:52 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 523aa2b6c4ef..2526165f9705 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Mar 2013 11:00:01 +0000
+Fri, 15 Mar 2013 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ef26afb64f64..abc8cd0b22cd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1363257301 Thu Mar 14 10:35:01 2013 UTC
+1363352701 Fri Mar 15 13:05:01 2013 UTC
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index c3f6fce822a1..40abd39b1979 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.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-analyzer/nmap/nmap-6.25.ebuild,v 1.24 2013/03/14 07:51:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.26 2013/03/14 16:22:27 ago Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
 NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
diff --git a/net-dialup/pptpd/files/pptpd-init b/net-dialup/pptpd/files/pptpd-init
deleted file mode 100644
index 117e324ac62f..000000000000
--- a/net-dialup/pptpd/files/pptpd-init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting pptpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pptpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
-	result=$?
-	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pptpctrl
-	result=$(( $result + $? ))
-	eend $result
-}
diff --git a/net-dialup/pptpd/files/pptpd-init-r1 b/net-dialup/pptpd/files/pptpd-init-r1
deleted file mode 100644
index 36af3f25fff0..000000000000
--- a/net-dialup/pptpd/files/pptpd-init-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting pptpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pptpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
-	result=$?
-	start-stop-daemon --stop --quiet --exec /usr/sbin/pptpctrl
-	result=$(( $result + $? ))
-	eend $result
-}
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild
deleted file mode 100644
index 4e09c1905808..000000000000
--- a/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r1.ebuild,v 1.4 2011/11/02 15:21:13 mattst88 Exp $
-
-EAPI="4"
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
-HOMEPAGE="http://poptop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="tcpd gre-extreme-debug"
-
-DEPEND="net-dialup/ppp
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
-
-	#Match pptpd-logwtmp.so's version with pppd's version (#89895)
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "plugins/patchlevel.h"
-	sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile
-
-	eautoreconf
-}
-
-src_configure() {
-	use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	econf --enable-bcrelay \
-		${myconf}
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS}"
-}
-
-src_install () {
-	einstall
-
-	insinto /etc
-	doins samples/pptpd.conf
-
-	insinto /etc/ppp
-	doins samples/options.pptpd
-
-	newinitd "${FILESDIR}/pptpd-init-r1" pptpd
-	newconfd "${FILESDIR}/pptpd-confd" pptpd
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-	docinto samples
-	dodoc samples/*
-}
diff --git a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild b/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild
index d44ff6240ee4..e276b0fac503 100644
--- a/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild
+++ b/net-dialup/pptpd/pptpd-1.3.4-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/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild,v 1.1 2013/03/10 12:47:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4-r2.ebuild,v 1.3 2013/03/14 13:24:32 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="tcpd gre-extreme-debug"
 
 DEPEND="net-dialup/ppp
diff --git a/net-dialup/pptpd/pptpd-1.3.4.ebuild b/net-dialup/pptpd/pptpd-1.3.4.ebuild
deleted file mode 100644
index b3d733dc49cc..000000000000
--- a/net-dialup/pptpd/pptpd-1.3.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.4.ebuild,v 1.12 2011/11/02 15:21:13 mattst88 Exp $
-
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server"
-SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz"
-HOMEPAGE="http://www.poptop.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="tcpd gre-extreme-debug"
-
-DEPEND="net-dialup/ppp
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-more-reodering-fixes.patch"
-
-	#Match pptpd-logwtmp.so's version with pppd's version (#89895)
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "plugins/patchlevel.h"
-	sed -e "/^LDFLAGS/{s:=:+=:}" -i plugins/Makefile
-
-	eautoreconf
-}
-
-src_compile() {
-	use gre-extreme-debug && append-flags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
-	local myconf
-	use tcpd && myconf="--with-libwrap"
-	econf --enable-bcrelay \
-		${myconf}
-	emake COPTS="${CFLAGS}" || die "make failed"
-}
-
-src_install () {
-	einstall || die "make install failed"
-
-	insinto /etc
-	doins samples/pptpd.conf
-
-	insinto /etc/ppp
-	doins samples/options.pptpd
-
-	newinitd "${FILESDIR}/pptpd-init" pptpd
-	newconfd "${FILESDIR}/pptpd-confd" pptpd
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-	docinto samples
-	dodoc samples/*
-}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 7bb800e58b0a..24db7ad7cd73 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -2,3 +2,4 @@ DIST lftp-4.4.0.tar.xz 1428284 SHA256 c79326af45f2f51a5e590d2691f64b3885b3516e0c
 DIST lftp-4.4.2.tar.xz 1425904 SHA256 e1d1397a252c44c8ef452e865d31869637ca30f13fb919530569cff69231f694 SHA512 0f995b77bbb48ccc16c8f330985c394eb6f6ef87eac8d39120fd34b567b3e1096cf996c0931815f7ac9e8618858a8acc001e48f628d138b56e8bafc22edc893e WHIRLPOOL b01c91c74e3baf72a3c527fe01ebcac605bb0c835a528585d105dc845806f29c31cb622ded48ed4afe004e29ca316ff37d10bda3b412472b564b77b2082db91f
 DIST lftp-4.4.3.tar.xz 1426736 SHA256 f34ee95d921b0161335aed85880c55f96c448198818f3c58158d9e5bcababb76 SHA512 ca873ad64fde7f577c8b3f5c50002546c3f749676e16d1a0c157a05619d690add314e8b4b4aabc4c067f96d2a79ae07827c1474ceabf63ffa03dc4909a8c3604 WHIRLPOOL a465d4de9e7e91f6b5f021a5467bf22f5a3f42475f0281581fbee61d5be2ffcd1e21e7e2b298188a0b66a617e15b28397791c56aa5a0fc845df6c58c8cb03b4d
 DIST lftp-4.4.4.tar.xz 1430232 SHA256 b8a6cb23ae346ac3434fcb141899b158b58e4f91489903fb192393763cdaf29d SHA512 80db29cc30842d661965798aa1ae18b67bcc0a9af1cbb63fa8627b5986d1ca1c72a1927fac90a4015b0ae9f7f1d0caf2bfb987cf718d052bc971ebee756ff81f WHIRLPOOL b151ac323a1c7d6e5c08691ed504f8d8f2d3e4a9efaa02bb9264400d5c541e0531744ce6f956160d573f5220dde641d0e31655a1e3d1cbe9bb7f401a297bde20
+DIST lftp-4.4.5.tar.xz 1429592 SHA256 b8dfd5faf64c18df9a9233d208eb61595a5b2ef29dbf3d186f3759259aee76dc SHA512 02873fb0c5b899d04b9db3a7183d7d03259a363cd4782b1ce56313240c1960819aad528031202f07d54bf7bb146f7a34bd9c5fa4870cf8df970933019298f7ce WHIRLPOOL 4d1c3227811f38e8d13b6db6967304b19d6d4adb39ff07650495ec531aeb8da4cc326422b101699706b0c1f505ff70886dc3b8723e0f2d91f23a5cfd3be7ee89
diff --git a/net-ftp/lftp/lftp-4.4.5.ebuild b/net-ftp/lftp/lftp-4.4.5.ebuild
new file mode 100644
index 000000000000..24d5bb4071f7
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.4.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.5.ebuild,v 1.1 2013/03/14 17:47:42 jer Exp $
+
+EAPI=5
+inherit autotools eutils libtool
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="ftp://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="gnutls nls socks5 +ssl"
+LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW )
+IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
+
+RDEPEND="
+	dev-libs/expat
+	>=sys-libs/ncurses-5.1
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		virtual/pam )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3 )
+		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+	)
+	>=sys-libs/readline-5.1
+"
+
+DEPEND="
+	${RDEPEND}
+	=sys-devel/libtool-2*
+	app-arch/xz-utils
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README  README.debug-levels
+	README.dnssec  README.modules THANKS TODO
+)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
+		"${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
+		"${FILESDIR}/${PN}-4.3.8-gets.patch"
+	eautoreconf
+	elibtoolize # for Darwin bundles
+}
+
+src_configure() {
+	local myconf=""
+
+	if use ssl && use gnutls ; then
+		myconf="${myconf} --without-openssl"
+	elif use ssl && ! use gnutls ; then
+		myconf="${myconf} --without-gnutls --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-gnutls --without-openssl"
+	fi
+
+	use socks5 && myconf="${myconf} --with-socksdante=${EPREFIX}/usr" \
+		|| myconf="${myconf} --without-socksdante"
+
+	econf \
+		$(use_enable nls) \
+		${myconf} \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--without-included-regex
+}
diff --git a/net-im/pidgin/pidgin-2.10.7.ebuild b/net-im/pidgin/pidgin-2.10.7.ebuild
index 7c478e40e973..b8d8ec4f8c16 100644
--- a/net-im/pidgin/pidgin-2.10.7.ebuild
+++ b/net-im/pidgin/pidgin-2.10.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-im/pidgin/pidgin-2.10.7.ebuild,v 1.9 2013/03/14 07:47:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7.ebuild,v 1.10 2013/03/14 12:43:17 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 1ddcc018da2a..539b59ce7689 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,2 +1 @@
-DIST libssh-0.5.3.tar.gz 369344 SHA256 ed42a6c94c74bafed580caeaf40af83ec409aaa1b83010cb1e1c60b94f10daf0 SHA512 67cc023a9c5f7da02af378e9be14b720a81074dfff3a9115a061925ba2244a7f508e122c10b229dc831fc8015e3d58616284f3c46d7060721d61d49a3ca94d7e WHIRLPOOL f68bb6a9eb691d31d02f9370d364e5a66c42d3430de86ab449b96aa0335ea7dee774f06c4517e42f3002e4a740701d8306b161ed3933a44b2fef39858538e34d
 DIST libssh-0.5.4.tar.gz 321265 SHA256 5f3825caebf7c47e6c6025aa048cb967e32c2b6cbfdc04109f05a35cbf4dca80 SHA512 1d854ee05e62e9e04ac704bc99a60b6f88237078b728e50e3e0f1142fbc5d1a4b4d04d675f257491c82c8b222b97db7a7f8e243f4a0f723e82788ecef3a7a71d WHIRLPOOL fad488dcb6ec8b4502921595b1735510c5f71a405cae64d369603945e13634f581a65cea693cf98eae179da095694c322da09144c33effbfbbb7a39c1dd489ea
diff --git a/net-libs/libssh/libssh-0.5.3.ebuild b/net-libs/libssh/libssh-0.5.3.ebuild
deleted file mode 100644
index 20d0d5067e95..000000000000
--- a/net-libs/libssh/libssh-0.5.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.3.ebuild,v 1.6 2012/12/03 11:14:57 nativemad Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/38/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmockery )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	epatch "${FILESDIR}"/${PN}-0.5.0-no-pdf-doc.patch \
-		"${FILESDIR}"/${PN}-0.5.0-tests.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib LIBZ)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
new file mode 100644
index 000000000000..9627f489969c
--- /dev/null
+++ b/net-libs/rabbitmq-c/Manifest
@@ -0,0 +1 @@
+DIST rabbitmq-c-v0.3.0.zip 156945 SHA256 77554c6d83c72af5248ad0179edd6fa227545d611159f3ad18e2ade5eb07a1b6 SHA512 8b05bb5847caae6e383de0aff0b5544cc44722da4af86b0c4670780e04de4cf8ee681ab848e44c16b082b8ea2025cec841b41703b0fe34747a81f53042f61050 WHIRLPOOL 3bd908f9fe454dcae6d5aa17c36a4d427cb5192a2bd31afc14b9fa1ae5b32f98b924a10dfc4958d09a7b1b98935e52039e0d0c46a5ae0f865f1903cb131c84bb
diff --git a/net-libs/rabbitmq-c/files/xmlto.patch b/net-libs/rabbitmq-c/files/xmlto.patch
new file mode 100644
index 000000000000..b1b97edd2edd
--- /dev/null
+++ b/net-libs/rabbitmq-c/files/xmlto.patch
@@ -0,0 +1,25 @@
+--- CMakeLists.txt.orig	2013-01-19 02:58:22.179338944 -0700
++++ CMakeLists.txt	2013-01-19 03:18:40.936984417 -0700
+@@ -49,6 +49,7 @@
+ include(CheckFunctionExists)
+ include(CheckLibraryExists)
+ include(CMakePushCheckState)
++include(FindXmlTo)
+ 
+ # Detect if we need to link against a socket library:
+ cmake_push_check_state()
+@@ -195,7 +196,13 @@
+ endif (REGENERATE_AMQP_FRAMING)
+ 
+ find_package(POPT)
+-find_package(XmlTo)
++
++set ( XmlTo_FOUND false )
++find_program ( XMLTO_EXECUTABLE NAMES xmlto
++  DOC "path to the xmlto docbook xslt frontend" )
++if ( XMLTO_EXECUTABLE )
++  set ( XmlTo_FOUND true )
++endif ( XMLTO_EXECUTABLE )
+ 
+ if (POPT_FOUND AND XmlTo_FOUND)
+   set(DO_DOCS ON)
diff --git a/net-libs/rabbitmq-c/metadata.xml b/net-libs/rabbitmq-c/metadata.xml
new file mode 100644
index 000000000000..3917af45bc58
--- /dev/null
+++ b/net-libs/rabbitmq-c/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>olemarkus@gentoo.org</email>
+		<name>Ole Markus With</name>
+	</maintainer>
+	<use>
+		<flag name='tools'>Builds cli tools to interact with brokers</flag>
+	</use>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
+
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild
new file mode 100644
index 000000000000..867286efe8bc
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild,v 1.1 2013/03/14 18:50:36 olemarkus Exp $
+
+EAPI="5"
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git"
+	KEYWORDS="-*"
+else
+	SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/${PN}-v${PV}.zip"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
+PATCHES=( "${FILESDIR}/xmlto.patch" )
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+		mv ${PN}* ${P} || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use tools BUILD_TOOLS)
+		$(cmake-utils_use tools BUILD_TOOLS_DOCS)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-mail/dovecot/dovecot-2.1.15.ebuild b/net-mail/dovecot/dovecot-2.1.15.ebuild
index 7acd43ec4d8b..7d27bef38020 100644
--- a/net-mail/dovecot/dovecot-2.1.15.ebuild
+++ b/net-mail/dovecot/dovecot-2.1.15.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-mail/dovecot/dovecot-2.1.15.ebuild,v 1.9 2013/03/14 07:46:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.15.ebuild,v 1.11 2013/03/14 16:17:03 ago Exp $
 
 EAPI=5
 inherit eutils versionator ssl-cert systemd user multilib
@@ -20,7 +20,7 @@ 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"
+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"
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index bf4f2348b945..c8e3c97cbd77 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,7 +1,3 @@
 DIST connman-1.0.tar.gz 743543 SHA256 62ed6aa093700e393456dfab98f098bc151fc10baccc577bbb7d927221e23e50 SHA512 0baf3d87e26b94e6969dbbf22a465e7dbdea57bd954305a21e2a40d7cac0a4d6aef09ef9a6ba82ba4e7587cf0ee6e8e3ed5f56a0000de9c48c391c3118e6e151 WHIRLPOOL 68bf676ffd73c68dba0bcf9f1ab7819426ea3d4396de32753145ed071c65375b6b2511b25221cf58aeb275e3b3ae7994571e22cd71ade42d818996d84a8172db
-DIST connman-1.4.tar.xz 527076 SHA256 469d49d3665e65110c3f380cf0c9d4ea48bc892b0e7dba9e2c9c405fd1acdd84 SHA512 f0f48835ead4080f5a3c725b5ecb4450a9c54435fa9a631a8bed6a3859671342205a0d3385390427c11529a1ac9a31d750ae531c85793e55f5d0a7798cbd22f5 WHIRLPOOL dc1a8cee4954338773617cbaedec90cb2acf40118e9de75662ed980f2373178a08890011df57ce471a8b14dd4ec59684e0e5be8aaac7eccf429d0a4a80fc157f
-DIST connman-1.5.tar.xz 529284 SHA256 f973198e90083a30a7c8233cfe87ddf77bb40eac1ba8d8733b9b75131aec1e94 SHA512 7e16549f141795660305fe5e5c0a3e6e924664c310ab87d2a01f6970f02a1f65876b7f64a35ee1e7142dd1a16cf278eb65393987127cc315a7bbc5f8b6481d6e WHIRLPOOL be8d42526fcd739c0d7454fa08460b625962a99ebd55292ba4fd21da1e221d879ba8bb28094776e10e5c3768eec1fb7c9f4604b243ed122ccd71b4d8e821a5e3
-DIST connman-1.6.tar.xz 529712 SHA256 43adfbee249f836c7cfb2c75e9e9ff1961c95b0f7ee4c0100196b7e2ecfcca59 SHA512 1598325944faca93fabcbd98b7f3b7d26a923266c50659abae49b86b93771dea603b3337fdffe8221c811d39d1ed4af3f4521791fbcaa95ccb4cb4cc9d00a8d7 WHIRLPOOL 43852a77226360f71b900945e00cde0b8c05a9e536f6936e392d977643620d0facbbf4a210e5960b193714ca1d509ef79c2f2150952bc39ad77684bbc8d4e941
-DIST connman-1.7.tar.xz 536960 SHA256 142fad547452ada7abf5c6a22c5ec2964ee6ffb6d89cec3a53f0f6bd2148e27d SHA512 e7c145512e1859651c80281fe40ad8b23ad3215f5f97bdfc1032ddc9747ea433c1268d9d3110738c6c704a13d30f00b18c11614dd9789b41167d459bd8445d44 WHIRLPOOL e857536ef9f54958d6a1fa5341f0fff2db528394e3a2721feecf1ca9a38f01202da8494da460061632f66672474fd904db3740e06cd2a9bc40c1c1985f8a767e
-DIST connman-1.8.tar.xz 537832 SHA256 f00ae8eeffdfe04ec6047267c503190c428cb7b4bda3bf5bbe77b31bc712d64c SHA512 ade51b4905fa9c57f8ec6b2f8de7d9a86916b9b4d287ee2665c28f5c4ff9e22b005d600d2f52d210dc4f23979bcf9d648fedeb13d7d08b2a4c2f1e5d78b23fa6 WHIRLPOOL 7910ccc1012023e64575f22325ec1c498247b352e0590497b9493a0310b4667afc8e5ffff8e6c15e87e49e1f01a281b4ce9120f14ebbd68e51e675e4b4d4244f
+DIST connman-1.11.tar.xz 567640 SHA256 c977d732c31acbd6bd815b697f02503c885db8e08d8ecd6e9596345c93206687 SHA512 37ddaf18ee21724fb7254c1259619f6ce8f130edd37559aa099bca05dea7c12eb63d9b23c85fed868e4712042d9cf229eadc7321f71b48fe2eff7037567ecc12 WHIRLPOOL c075ee9363dda7dc37e9fb6bc13d7214b1fea4191119dc73496fab044a12ec56285eb07b11fdae6b138c25a6c95d6923fa99f0f285aaa263b9e7aa2dea52a541
 DIST connman-1.9.tar.xz 539476 SHA256 11c438cddd52bfd0d279762631083aaf69989a4c03501c6f6a434b0d0e359ad1 SHA512 5a650ec827b9d7b7c4c3eac9cbae64833a19578b0501da81ee18c667d3c1edab66fc0d7e8f6d28b5b7d42d825e39751bcf125946753ac71e106d86ead56183bd WHIRLPOOL b44cf76c39575555e93eac3d7efaf767ac78a147808bd062c257cee052df1019720f2efec31a15b426e7ed8fff1b7bf0c6f851809ce899c9d0a7ce2f401851cc
diff --git a/net-misc/connman/connman-1.8.ebuild b/net-misc/connman/connman-1.11.ebuild
similarity index 79%
rename from net-misc/connman/connman-1.8.ebuild
rename to net-misc/connman/connman-1.11.ebuild
index 8b93cac0ec3f..10d3cafb7152 100644
--- a/net-misc/connman/connman-1.8.ebuild
+++ b/net-misc/connman/connman-1.11.ebuild
@@ -1,8 +1,9 @@
-# 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-misc/connman/connman-1.8.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.11.ebuild,v 1.1 2013/03/14 12:51:31 chainsaw Exp $
 
-EAPI="4"
+EAPI="5"
+inherit base
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -11,11 +12,10 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
+IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
 	>=net-firewall/iptables-1.4.8
 	net-libs/gnutls
 	bluetooth? ( net-wireless/bluez )
@@ -23,13 +23,16 @@ RDEPEND=">=dev-libs/glib-2.16
 	policykit? ( sys-auth/polkit )
 	openvpn? ( net-misc/openvpn )
 	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
+	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )"
 
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.39
 	doc? ( dev-util/gtk-doc )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ip6-incomplete-type.patch"
+)
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
@@ -44,7 +47,6 @@ src_configure() {
 		$(use_enable openvpn openvpn builtin) \
 		$(use_enable policykit polkit builtin) \
 		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable threads) \
@@ -59,6 +61,6 @@ src_install() {
 	dobin client/connmanctl || die "client installation failed"
 
 	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN} || die
 	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 }
diff --git a/net-misc/connman/connman-1.4.ebuild b/net-misc/connman/connman-1.4.ebuild
deleted file mode 100644
index 8f161d91b3d7..000000000000
--- a/net-misc/connman/connman-1.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.4.ebuild,v 1.1 2012/07/31 12:18:01 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.5.ebuild b/net-misc/connman/connman-1.5.ebuild
deleted file mode 100644
index 8899e4bb20cc..000000000000
--- a/net-misc/connman/connman-1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.5.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.6.ebuild b/net-misc/connman/connman-1.6.ebuild
deleted file mode 100644
index afc8c8488d6f..000000000000
--- a/net-misc/connman/connman-1.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.6.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.7.ebuild b/net-misc/connman/connman-1.7.ebuild
deleted file mode 100644
index e249b6acbc0b..000000000000
--- a/net-misc/connman/connman-1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.7.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/connmanctl || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/files/connman-1.11-ip6-incomplete-type.patch b/net-misc/connman/files/connman-1.11-ip6-incomplete-type.patch
new file mode 100644
index 000000000000..f44f2e1e66fa
--- /dev/null
+++ b/net-misc/connman/files/connman-1.11-ip6-incomplete-type.patch
@@ -0,0 +1,11 @@
+diff -uNr connman-1.11.ORIG/src/tethering.c connman-1.11/src/tethering.c
+--- connman-1.11.ORIG/src/tethering.c	2013-03-14 12:41:25.279469705 +0000
++++ connman-1.11/src/tethering.c	2013-03-14 12:42:05.745468258 +0000
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <netinet/ip6.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>
+ #include <string.h>
diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
new file mode 100644
index 000000000000..6525df40f0bb
--- /dev/null
+++ b/net-misc/connman/files/connman.initd2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Purpose License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/files/connman.initd2,v 1.1 2013/03/14 12:51:31 chainsaw Exp $
+
+depend() {
+   need dbus
+   provide net
+}
+
+start() {
+   ebegin "Starting Connection Manager"
+   start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS}
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping Connection Manager"
+   start-stop-daemon --stop --quiet --exec /usr/sbin/connmand
+   eend $?
+}
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/net-misc/lldpd/lldpd-0.7.1.ebuild b/net-misc/lldpd/lldpd-0.7.1.ebuild
index f85f6aac6776..5093f1f92876 100644
--- a/net-misc/lldpd/lldpd-0.7.1.ebuild
+++ b/net-misc/lldpd/lldpd-0.7.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-misc/lldpd/lldpd-0.7.1.ebuild,v 1.2 2013/01/16 03:44:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.1.ebuild,v 1.4 2013/03/14 13:23:12 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph json +lldpmed sonmp snmp readline xml"
 
 RDEPEND=">=dev-libs/libevent-2.0.5
diff --git a/net-misc/radvd/files/radvd-1.9.2-sysctl.patch b/net-misc/radvd/files/radvd-1.9.2-sysctl.patch
new file mode 100644
index 000000000000..e8f8aae00ed5
--- /dev/null
+++ b/net-misc/radvd/files/radvd-1.9.2-sysctl.patch
@@ -0,0 +1,85 @@
+From 140c59074c70d7951d046c751b7eaed3cc16946c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 14 Mar 2013 10:17:58 -0400
+Subject: [PATCH] check for sys/sysctl.h availability
+
+Newer Linux ports are dropping sysctl support.  If you try to even
+include the header, you'll get build failures:
+/usr/include/bits/sysctl.h:19:3: error: #error "sysctl system call is unsupported"
+
+Check for the header before we try to use it.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac | 1 +
+ includes.h   | 4 +++-
+ radvd.c      | 8 +++++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 55d6673..0e12d9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,6 +151,7 @@ AC_CHECK_HEADERS( \
+ 	net/if_types.h \
+ 	sys/param.h \
+ 	sys/sockio.h \
++	sys/sysctl.h \
+ 	sys/time.h \
+ 	time.h \
+ )
+diff --git a/includes.h b/includes.h
+index 882c34f..7765925 100644
+--- a/includes.h
++++ b/includes.h
+@@ -72,7 +72,9 @@
+ 
+ #include <arpa/inet.h>
+ 
+-#include <sys/sysctl.h>
++#ifdef HAVE_SYS_SYSCTL_H
++# include <sys/sysctl.h>
++#endif
+ 
+ #include <net/if.h>
+ 
+diff --git a/radvd.c b/radvd.c
+index 7b475de..444574d 100644
+--- a/radvd.c
++++ b/radvd.c
+@@ -761,7 +761,9 @@ check_conffile_perm(const char *username, const char *conf_file)
+ int
+ check_ip6_forwarding(void)
+ {
++#ifdef HAVE_SYS_SYSCTL_H
+ 	int forw_sysctl[] = { SYSCTL_IP6_FORWARDING };
++#endif
+ 	int value;
+ 	size_t size = sizeof(value);
+ 	FILE *fp = NULL;
+@@ -777,18 +779,22 @@ check_ip6_forwarding(void)
+ 		}
+ 		fclose(fp);
+ 	}
+-	else
++	else {
+ 		flog(LOG_DEBUG, "Correct IPv6 forwarding procfs entry not found, "
+ 	                       "perhaps the procfs is disabled, "
+ 	                        "or the kernel interface has changed?");
++		value = -1;
++	}
+ #endif /* __linux__ */
+ 
++#ifdef HAVE_SYS_SYSCTL_H
+ 	if (!fp && sysctl(forw_sysctl, sizeof(forw_sysctl)/sizeof(forw_sysctl[0]),
+ 	    &value, &size, NULL, 0) < 0) {
+ 		flog(LOG_DEBUG, "Correct IPv6 forwarding sysctl branch not found, "
+ 			"perhaps the kernel interface has changed?");
+ 		return(0);	/* this is of advisory value only */
+ 	}
++#endif
+ 
+ 	if (value != 1 && !warned) {
+ 		warned = 1;
+-- 
+1.8.1.2
diff --git a/net-misc/radvd/radvd-1.9.2-r1.ebuild b/net-misc/radvd/radvd-1.9.2-r1.ebuild
index d5c73415ff95..9d3a5c0dfa71 100644
--- a/net-misc/radvd/radvd-1.9.2-r1.ebuild
+++ b/net-misc/radvd/radvd-1.9.2-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/net-misc/radvd/radvd-1.9.2-r1.ebuild,v 1.7 2013/02/06 19:44:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-1.9.2-r1.ebuild,v 1.8 2013/03/14 14:23:43 vapier Exp $
 
 EAPI=4
 
-inherit systemd user
+inherit systemd user eutils autotools
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
 HOMEPAGE="http://v6web.litech.org/radvd/"
@@ -32,6 +32,11 @@ pkg_setup() {
 	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.2-sysctl.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf --with-pidfile=/var/run/radvd/radvd.pid
 }
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index b20f251edb18..e4c4b3751920 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -3,3 +3,4 @@ DIST vpnc-0.5.3_p451.tar.bz2 108492 SHA256 8a4371489e6802f9b0d18de916e05eb46b4b8
 DIST vpnc-0.5.3_p457-r2.tar.bz2 102506 SHA256 d303884c7d4f048457c21f9c506f2350ffe60b211652543194a735315f122be9 SHA512 9a2294bc867606e1f87ab5e3c8c5c0dbf480228e5e1ac6c17cf7d181def1555b814c8670cc5db407c9eb297ea25c990c5d736566a14119f05f850601c1d568a2 WHIRLPOOL 19247e763b58e4fe816102fb163a73554c94f3314acac0ce26f1bff97fc01fba909fce974a66eebf97a6e2721608b5b50a3be7a4af4f8610c84a7801e1c87604
 DIST vpnc-0.5.3_p457.tar.bz2 102502 SHA256 41c6886cb24a15db9c49dc09ee1c98f891ec6248cc2afc46e2b94729f15a776c SHA512 93befd23b72d62600a5a1401f4aa7c6bb2c007a93d45373c6ec6596f4d4f76e6611d4b19dd90adfecc9c07760721f39b8ecffd1465a179b6d0606128275907a7 WHIRLPOOL d008b054c2e3336cb76de9ad6ef817cea2f5d44f83047bc32da8b7e766ab7828d4282d6b47b9cefb4de477d05a05f0d66eb30e5908693c5f7a9bf489e11f19b5
 DIST vpnc-0.5.3_p514.tar.xz 98324 SHA256 95f43e3cbbc6fa7205bab07a466a893ed771ebaa1d11702161b3083bbb042319 SHA512 dde5e9791e92960d73575c95f590784b41dc8b4b15108cd59a78411b005f036022ff8412cfcce916ae953e796fbad4ca8bb64f88fb149248e275ee1b890381a5 WHIRLPOOL 0eceec0b494b45ea2e017d857d7a6e68d227aace7c096f35ae28377212d7e44b1de11b1929213412151dfab04d129d1fd6124f3bb24748536595d650749bde3f
+DIST vpnc-0.5.3_p527.tar.xz 98740 SHA256 4076e40b3be37ba95c393cc5e21cccf87540e994275bd336a4ec0c6b4c3d54de SHA512 6c657039c4f914b03214912ef3471fae755b4dcbf771c3653ed00d90bb044fa83dbca7a5cda9ac0c9389baae96c658566c8b3f3a4b94c078dda8387935532c9f WHIRLPOOL 61aaf00f63e531eebf3583492f288ee339c446b0a273f1ff5c008dc37ab9f74749ee3c74ea0f110018ef764448c838064de6140743941ff17039e4288cfe66e8
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 05c63678ec88..2a2dee5325b7 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -13,6 +13,10 @@
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
   </maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
   <use>
     <flag name="bindist">Using GnuTLS for SSL support as redistribution with OpenSSL as provider violates GPL</flag>
     <flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
diff --git a/net-misc/vpnc/vpnc-0.5.3_p527.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527.ebuild
new file mode 100644
index 000000000000..527240d19fa3
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.3_p527.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/net-misc/vpnc/vpnc-0.5.3_p527.ebuild,v 1.1 2013/03/14 20:10:13 jlec Exp $
+
+EAPI=5
+
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PF}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="resolvconf +gnutls bindist"
+
+REQUIRED_USE="bindist? ( gnutls )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	resolvconf? ( net-dns/openresolv )"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+	if ! use gnutls && ! use bindist; then
+		sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile	|| die
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch
+
+	sed -e 's:test/cert0.pem::g' -i Makefile || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	dodoc README TODO VERSION
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" vpnc
+	sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
+	# COPYING file resides here, should not be installed
+	rm -rf "${D}"/usr/share/doc/vpnc/ || die
+}
+
+pkg_postinst() {
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available in http://www.gentoo.org/doc/en/vpnc-howto.xml"
+}
diff --git a/net-nds/389-admin/389-admin-1.1.16.ebuild b/net-nds/389-admin/389-admin-1.1.16.ebuild
deleted file mode 100644
index 75ff02bbbd38..000000000000
--- a/net-nds/389-admin/389-admin-1.1.16.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-admin/389-admin-1.1.16.ebuild,v 1.1 2011/06/14 19:14:10 lxnay Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="1.9"
-
-MY_PV=${PV/_rc/.rc}
-MY_PV=${MY_PV/_a/.a}
-
-inherit eutils multilib autotools depend.apache
-
-DESCRIPTION="389 Directory Server (admin)"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6 selinux"
-
-# TODO snmp agent init script
-
-COMMON_DEPEND=">=app-admin/389-admin-console-1.1.0
-	>=app-admin/389-ds-console-1.1.0
-	app-misc/mime-types
-	dev-libs/389-adminutil
-	dev-libs/cyrus-sasl
-	dev-libs/icu
-	dev-libs/mozldap
-	dev-libs/nss[utils]
-	|| ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 )
-	dev-libs/svrcore
-	net-analyzer/net-snmp[ipv6?]
-	selinux? (
-		sys-apps/checkpolicy
-		sys-apps/policycoreutils
-		sec-policy/selinux-base-policy
-	)
-	>=sys-libs/db-4.2.52
-	sys-libs/pam
-	sys-apps/tcp-wrappers[ipv6?]
-	www-apache/mod_nss
-	www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads]"
-RDEPEND="${COMMON_DEPEND} www-client/lynx"
-DEPEND="sys-apps/sed ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_apache2_2
-
-src_prepare() {
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-
-	epatch "${FILESDIR}/1.1.11_rc1/0001-gentoo-apache-names.patch"
-	epatch "${FILESDIR}/1.1.11_rc1/0003-find-mod_nss.m4.patch"
-	epatch "${FILESDIR}/1.1.11_rc1/0004-rpath-fix.configure.ac.patch"
-	# Configuration fixes
-	epatch "${FILESDIR}/${PN}-cfgstuff-1.patch"
-
-	sed -e "s!SUBDIRS!# SUBDIRS!g" -i Makefile.am || die "sed failed"
-	# Setup default user/group, in this case it's dirsrv
-	sed -e "s!nobody!dirsrv!g" -i configure.ac || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# stub autoconf triplet  :(
-	local myconf=""
-	use debug && myconf="--enable-debug"
-	use selinux &&  myconf="${myconf} --with-selinux"
-
-	econf \
-		--enable-threading \
-		--disable-rpath \
-		--with-fhs \
-		--with-apr-config \
-		--with-apxs=${APXS} \
-		--with-httpd=${APACHE_BIN} \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-
-	emake DESTDIR="${D}" install || die "emake failed"
-	keepdir /var/log/dirsrv/admin-serv
-
-	# remove redhat style init script.
-	rm -rf "${D}"/etc/rc.d
-	rm -rf "${D}"/etc/default
-
-	# install gentoo style init script.
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	# remove redhat style wrapper scripts
-	# and install gentoo scripts.
-	rm -rf "${D}"/usr/sbin/*-ds-admin
-	dosbin "${FILESDIR}"/*-ds-admin || die "cannot install gentoo start/stop scripts"
-
-	# In this version build systems for modules is delete :(
-	# manually install modules, not using apache-modules eclass
-	# because use bindled library
-
-	# install mod_admserv
-	exeinto "${APACHE_MODULESDIR}"
-	doexe "${S}/.libs"/mod_admserv.so || die "internal ebuild error: mod_admserv not found"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/1.1.11_rc1"/48_mod_admserv.conf 48_mod_admserv \
-				|| die "internal ebuild error: 48_mod_admserv.conf not found"
-
-	# install mod_restard
-	exeinto "${APACHE_MODULESDIR}"
-	doexe "${S}/.libs"/mod_restartd.so || die "internal ebuild error: mod_restartd  not found"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/1.1.11_rc1"/48_mod_restartd.conf 48_mod_restartd \
-		|| die "internal ebuild error: 48_mod_restard.conf not found"
-
-	if use selinux; then
-		local POLICY_TYPES="targeted"
-		cd "${S}"/selinux-build
-		cp /usr/share/selinux/${POLICY_TYPES}/include/Makefile  .
-		make || die "selinux policy compile failed"
-		insinto /usr/share/selinux/${POLICY_TYPES}
-		doins -r "${S}/selinux-build/"*.pp
-	fi
-
-}
-
-pkg_postinst() {
-
-	# show setup information
-	elog "Once you configured www-servers/apache as written above,"
-	elog "you need to run (as root): /usr/sbin/setup-ds-admin.pl"
-	elog
-
-	# show security and sysctl info
-	elog "It is recommended to setup net.ipv4.tcp_keep_alive_time"
-	elog "in /etc/sysctl.conf (or via sysctl -w && sysctl -p) to a reasonable"
-	elog "value (in milliseconds) to avoid temporary server congestions"
-	elog "from lost client connections"
-	elog
-
-	# /etc/security/limits.conf settings
-	elog "It is also recommended to fine tune the maximum open files"
-	elog "settings inside /etc/security/limits.conf:"
-	elog "* soft nofile 2048"
-	elog "* hard nofile 4096"
-	elog
-
-	elog "To start 389 Directory Server Administration Interface at boot"
-	elog "please add 389-admin service to the default runlevel:"
-	elog
-	elog "    rc-update add 389-admin default"
-	elog
-
-	elog "for 389 Directory Server Admin interface to work, you need"
-	elog "to setup a FQDN hostname and use it while running /usr/sbin/setup-ds-admin.pl"
-	elog
-
-}
diff --git a/net-nds/389-admin/389-admin-1.1.23.ebuild b/net-nds/389-admin/389-admin-1.1.31.ebuild
similarity index 96%
rename from net-nds/389-admin/389-admin-1.1.23.ebuild
rename to net-nds/389-admin/389-admin-1.1.31.ebuild
index 4d66516e78da..924422f7a7da 100644
--- a/net-nds/389-admin/389-admin-1.1.23.ebuild
+++ b/net-nds/389-admin/389-admin-1.1.31.ebuild
@@ -1,8 +1,8 @@
-# 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/net-nds/389-admin/389-admin-1.1.23.ebuild,v 1.2 2011/08/16 20:15:51 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-admin/389-admin-1.1.31.ebuild,v 1.1 2013/03/14 18:02:26 lxnay Exp $
 
-EAPI="2"
+EAPI=5
 
 WANT_AUTOMAKE="1.9"
 
@@ -28,11 +28,11 @@ COMMON_DEPEND=">=app-admin/389-admin-console-1.1.0
 	dev-libs/389-adminutil
 	dev-libs/cyrus-sasl
 	dev-libs/icu
-	dev-libs/mozldap
 	dev-libs/nss[utils]
 	|| ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 )
 	dev-libs/svrcore
 	net-analyzer/net-snmp[ipv6?]
+	net-nds/openldap
 	selinux? (
 		sys-apps/checkpolicy
 		sys-apps/policycoreutils
@@ -76,10 +76,12 @@ src_configure() {
 	econf \
 		--enable-threading \
 		--disable-rpath \
-		--with-fhs \
+		--with-adminutil=/usr \
 		--with-apr-config \
 		--with-apxs=${APXS} \
+		--with-fhs \
 		--with-httpd=${APACHE_BIN} \
+		--with-openldap \
 		${myconf} || die "econf failed"
 }
 
diff --git a/net-nds/389-admin/Manifest b/net-nds/389-admin/Manifest
index 96a419c01785..195a76174c60 100644
--- a/net-nds/389-admin/Manifest
+++ b/net-nds/389-admin/Manifest
@@ -1,2 +1 @@
-DIST 389-admin-1.1.16.tar.bz2 614438 RMD160 0c7393afcb321213c68eb26640f62efb0c51e346 SHA1 e2facc231d1475b218321b7dbdb04d8f9b6ebacb SHA256 9c942a010f0fb923ff91fb4f65ba65cb1994a787ebf672ff9be6eb2501d65829
-DIST 389-admin-1.1.23.tar.bz2 628059 RMD160 613d27b12230b15bb784078ba1f7b69ef9d755fe SHA1 b3013f3ce833f5dae8ec33f881f46a064f4d1d3d SHA256 a081df73dab2918e56660f554eb253f866744a2910b973d4f9b8ae281e6d9d89
+DIST 389-admin-1.1.31.tar.bz2 647098 SHA256 79c8c0133f72be4915fec8a4f2490bc21480de5fae77070f2ce13b1d9f28872f SHA512 631cd286a817a9e862adc610464d1c1f7a7af8dbade4cc2d8535330f81591d65df4773b6dbce0256470002165640fe73b49c20ee5093f71e5121d2cfa15ca9c4 WHIRLPOOL bff158c3d2201d8723faf340e21e3fdbeaaa62bbefac033b1f5ac981bd17a2e83f0507908b3919af1911b519442da75a96164b73d4df6953227973feaaab047e
diff --git a/net-nds/389-ds-base/389-ds-base-1.2.11.15.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild
similarity index 91%
rename from net-nds/389-ds-base/389-ds-base-1.2.11.15.ebuild
rename to net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild
index 4bd8aa2768c9..fd1d3b621068 100644
--- a/net-nds/389-ds-base/389-ds-base-1.2.11.15.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.3.0.2.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/net-nds/389-ds-base/389-ds-base-1.2.11.15.ebuild,v 1.2 2012/10/02 20:25:09 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.3.0.2.ebuild,v 1.1 2013/03/14 17:32:02 lxnay Exp $
 
-EAPI=2
+EAPI=5
 
 WANT_AUTOMAKE="1.9"
 MY_P=${P/_alpha/.a}
@@ -26,14 +26,14 @@ ALL_DEPEND="!>=sys-libs/db-5.0
 	dev-libs/svrcore
 	dev-libs/openssl
 	dev-libs/libpcre:3
-	dev-libs/mozldap
 	dev-perl/perl-mozldap
 	>=net-analyzer/net-snmp-5.1.2
+	net-nds/openldap
 	sys-apps/tcp-wrappers
 	>=sys-libs/db-4.5
 	sys-libs/pam
 	sys-libs/zlib
-	kerberos? ( net-nds/openldap >=app-crypt/mit-krb5-1.7-r100[openldap] )
+	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )
 	selinux? ( >=sys-apps/policycoreutils-1.30.30
 		sec-policy/selinux-base-policy )"
 
@@ -57,9 +57,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/selinux.patch"
 	# Fix compilation against mozldap
-	epatch "${FILESDIR}/389-ds-base-1.2.11-fix-mozldap.patch"
-	# Upstream patch, will be in 1.2.11.16, fixes CVE-2012-4450
-	epatch "${FILESDIR}/389-ds-base-1.2.11.16-cve-2012-4450.patch"
+	# epatch "${FILESDIR}/389-ds-base-1.2.11-fix-mozldap.patch"
 
 	# as per 389 documentation, when 64bit, export USE_64
 	use amd64 && export USE_64=1
@@ -91,14 +89,14 @@ src_configure() {
 		--enable-maintainer-mode \
 		--enable-autobind \
 		--with-fhs \
+		--with-openldap \
 		$myconf || die "econf failed"
 }
 
 src_compile() {
 	append-lfs-flags
 
-	# Use -j1 otherwise libacl-plugin.so could fail to install properly
-	emake -j1 || die "compile failed"
+	emake || die "compile failed"
 	if use selinux; then
 		emake -f selinux/Makefile || die " build selinux policy failed"
 	fi
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index c3da91263a9f..13c1e88c2e2b 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1 +1 @@
-DIST 389-ds-base-1.2.11.15.tar.bz2 2983709 SHA256 de193bf5e38e1c7e1b9af0e1eebab70c8b62c2b0daeaa0a33e737add90bcbce0 SHA512 ed41fa07ac57c749ae48270a980173b9c63588748e5b45bb7fa0009aeb9c28c2c62e717f68ce764afca9aae4931443b5544343ab02b484654006829e98c5da7c WHIRLPOOL adebfeaf453de8bcfd46ddbb262e471b7bdb63e2858fbf53f192e58ed5b6be90e9e34ef512cf0322e98448a9a51bee90bc569edd6039b241208085c4f55af9e2
+DIST 389-ds-base-1.3.0.2.tar.bz2 3008002 SHA256 0482f8cddbb32dc44051d59efe085eb744295a32eac65fbcd0b1bfd807319755 SHA512 99d41e2df832eaf8d83ec32fd9e7ef1819d75640fae2c69e62f5d11998c29d780726cb5d97cec7a6ae410c440d5124ca8b9d0cb7091a437a57f2625b16fca29f WHIRLPOOL 8ad72341e15d05e6af0999808a1930f11c7589c211424f7dfa68c1d8d5cd18657086dbf9aa6c856dc84a3926b47ed46484b30e6f72819a22e26277a3c504c1e0
diff --git a/net-news/quiterss/quiterss-0.11.0.ebuild b/net-news/quiterss/quiterss-0.11.0.ebuild
index 354a931cde95..4a1f47d540b2 100644
--- a/net-news/quiterss/quiterss-0.11.0.ebuild
+++ b/net-news/quiterss/quiterss-0.11.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-news/quiterss/quiterss-0.11.0.ebuild,v 1.2 2013/03/02 23:07:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.11.0.ebuild,v 1.4 2013/03/15 11:56:53 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://quite-rss.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="dev-qt/qtcore:4
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 7a7106fe0b12..2f7a4ce1fd90 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,3 +1,4 @@
 DIST nzbget-0.8.0.tar.gz 321351 SHA256 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95 SHA512 ea9830effcfece3cc60592924840de3f65cf3c5581ed5afbc97c819c248c6b703a228e71bfb5997947c52c7efa84a5aa5457f7a7babc97ffae5b729179463ab3 WHIRLPOOL 692013bbf84c47f1bd22bdfce9554e3f5b2fb42892bf5b36e1a4612be7f3e85bad64897dfa48fa69ca96d2e9bd2fe923fca6171bf8843b96986f9ec55f949e2b
 DIST nzbget-10.0-testing-r567.tar.gz 661712 SHA256 2b28522f5973d2ca68d3f40d418ff13147e2c4b457110c7c98c67466a70a2451 SHA512 4dc6db4857e04cf5140dc60ac7b2546515869f1fb230dcf1a084c29304e159844f828b4400d529eb9bf254a761f7ee51e913f6ff986b6ea1d3169a49ebfb8f46 WHIRLPOOL 3a5456cb347cf26f3c4a6a9ed2488f7d26f138c2e355828037309a3dd1761cd6de9f1bd98dae14d4c894323f62ec829dc6dd68c5d70271d23f6939170f919605
+DIST nzbget-10.0-testing-r577.tar.gz 667072 SHA256 6c4fcbed5e43879751cf2254cdc1d8120b5492c60fd115589fb044393e6f98aa SHA512 9a996641a1882fe781ce0ea259004ffeccf78de14ba77c23f6d527c3d432b580459f424d80544414a89fc5b5c2ae43a16a16f5221bc28028245f1607ad768333 WHIRLPOOL 4c82823c206851d32db8af0e820fe12e4bef7c2bab1888d367327c59bbed75f3c450ce24b47c9ed4af48377918d2bbadf1c77c72d0d293a3c08464821dd082c9
 DIST nzbget-9.1.tar.gz 658935 SHA256 0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633 SHA512 902cb2a261d551dad238d7d4751cd47a559e80bf40a63bfd28e2701324f7d29df976e00001606ba850cc7d9a45e1ccb1f03240b08aa2acac0e0490b8324c75b8 WHIRLPOOL 47e8ade8beef8ea4159a9606c7b805a5708ee93a07e4077111f9c56e47f14e116839b5fab62d721801a492b3749ff170f820581327126cbcc302e94d02c5cd98
diff --git a/net-nntp/nzbget/nzbget-10.0_pre577.ebuild b/net-nntp/nzbget/nzbget-10.0_pre577.ebuild
new file mode 100644
index 000000000000..7e4399ba0734
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-10.0_pre577.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-10.0_pre577.ebuild,v 1.1 2013/03/15 08:23:40 radhermit Exp $
+
+EAPI=5
+
+inherit eutils autotools user
+
+MY_P=${P/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
+HOMEPAGE="http://nzbget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnutls ncurses parcheck ssl zlib "
+
+RDEPEND="dev-libs/libxml2
+	ncurses? ( sys-libs/ncurses )
+	parcheck? (
+		app-arch/libpar2
+		dev-libs/libsigc++:2
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${P/_pre*/-testing}
+
+src_prepare() {
+	sed -i 's:^PostProcess=.*:#PostProcess=/usr/share/nzbget/nzbget-postprocess.sh:' \
+		nzbget.conf || die
+
+	sed -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
+		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
+
+	sed -i "/^dist_doc_DATA/d" Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-0.7.0-underlinking.patch
+	epatch "${FILESDIR}"/${PN}-9.0_pre477-buffer-overflows.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ncurses curses) \
+		$(use_enable parcheck) \
+		--disable-libpar2-bugfixes-check \
+		$(use_enable ssl tls) \
+		$(use_enable zlib gzip) \
+		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+}
+
+src_install() {
+	default
+
+	# remove unneeded service script
+	rm "${D}"/usr/sbin/nzbgetd || die
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	exeinto /usr/share/nzbget
+	doexe nzbget-postprocess.sh
+
+	# remove duplicate script/config
+	rm "${D}"/usr/share/nzbget/nzbget.conf
+	rm "${D}"/usr/bin/nzbget-postprocess.sh
+
+	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+	enewgroup nzbget
+	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+	fperms 750 /var/lib/nzbget/{queue,tmp}
+	fperms 770 /var/lib/nzbget/{dst,nzb}
+
+	fowners nzbget:nzbget /var/log/nzbget
+	fperms 750 /var/log/nzbget
+
+	fowners root:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please add users that you want to be able to use the system-wide"
+	elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+	elog "with the --configfile /etc/nzbgetd.conf option."
+	elog
+}
diff --git a/net-proxy/squid/squid-3.2.9.ebuild b/net-proxy/squid/squid-3.2.9.ebuild
index 6bfe74719e97..348d03c112b8 100644
--- a/net-proxy/squid/squid-3.2.9.ebuild
+++ b/net-proxy/squid/squid-3.2.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-proxy/squid/squid-3.2.9.ebuild,v 1.1 2013/03/14 07:49:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.9.ebuild,v 1.6 2013/03/14 17:29:50 jer Exp $
 
 EAPI=4
 inherit eutils pam toolchain-funcs autotools linux-info user versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap icap-client ssl-crtd \
 	mysql postgres sqlite \
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index abab3cc62f79..00cc31ef402b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -161,6 +161,7 @@ app-admin/keepass:aot - Generate native code at build time, rather than runtime.
 app-admin/lcap:lids - If you have the Linux Intrusion Detection System
 app-admin/logrotate:acl - Installs acl support
 app-admin/logrotate:selinux - Installs Security Enhanced Linux support
+app-admin/matter:entropy - Add Entropy support
 app-admin/mcollective:client - Install client utilities
 app-admin/openrc-settingsd:systemd - Use the versions of dbus and polkit files provided by sys-apps/systemd
 app-admin/packagekit-base:connman - Add support for net-misc/connman
@@ -4455,6 +4456,7 @@ net-libs/ptlib:tts - Enable Text-To-Speech server support
 net-libs/ptlib:video - Enable video support
 net-libs/ptlib:vxml - Enable VoiceXML support
 net-libs/ptlib:wav - Enable WAVFILE support
+net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
 net-libs/rest:gnome - Extract proxy information using net-libs/libsoup-gnome
 net-libs/telepathy-glib:vala - Enable bindings for dev-lang/vala
 net-libs/telepathy-qt:farsight - Enable support for farsight connection manager
@@ -5449,6 +5451,7 @@ sys-apps/dmtcp:trace - Enable ptrace support (only valid with debug enabled).
 sys-apps/dstat:wifi - Enable wireless network functions
 sys-apps/elfix:ptpax - Enable PT_PAX_FLAGS support.
 sys-apps/elfix:xtpax - Enable XATTR_PAX_FLAGS support.
+sys-apps/entropy-server:matter - Pull in app-admin/matter
 sys-apps/etckeeper:bazaar - Support dev-vcs/bzr based repository
 sys-apps/etckeeper:cron - Install cron script
 sys-apps/flashrom:atahpt - Highpoint (HPT) ATA/RAID controller support
@@ -6130,6 +6133,7 @@ www-servers/uwsgi:rsyslog - Support direct logging to a app-admin/rsyslog socket
 www-servers/uwsgi:spooler - Build a plugin which gives a network spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).
 www-servers/uwsgi:yaml - Support yaml as a configuration file format.
 www-servers/uwsgi:zeromq - Enable logging and deployment via ZeroMQ. Together with json-support this turns uwsgi into a Mongrel2 handler (see http://projects.unbit.it/uwsgi/wiki/Mongrel2).
+www-servers/varnish:jemalloc - Use dev-libs/jemalloc for allocations
 www-servers/varnish:tools - Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes
 x11-apps/ardesia:cwiid - cwiid support: collection of Linux tools written in C for interfacing to the Nintendo Wiimote.
 x11-apps/xdm:consolekit - Enable native sys-auth/consolekit support
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/sys-apps/entropy-server/entropy-server-183.ebuild b/sys-apps/entropy-server/entropy-server-183.ebuild
new file mode 100644
index 000000000000..ac0ebab92acb
--- /dev/null
+++ b/sys-apps/entropy-server/entropy-server-183.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy-server/entropy-server-183.ebuild,v 1.1 2013/03/14 18:23:42 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager server-side tools"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+matter"
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/server"
+
+RDEPEND="~sys-apps/entropy-${PV}
+	matter? ( ~app-admin/matter-${PV}[entropy] )
+	"
+DEPEND="app-text/asciidoc"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	newbashcomp "${S}/eit-completion.bash" eit
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/entropy/server"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/server"
+}
diff --git a/sys-apps/entropy-server/metadata.xml b/sys-apps/entropy-server/metadata.xml
index 187f7a710efe..7a9ce413fd0d 100644
--- a/sys-apps/entropy-server/metadata.xml
+++ b/sys-apps/entropy-server/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
+		<flag name='matter'>Pull in app-admin/matter</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/sys-apps/entropy/entropy-183.ebuild b/sys-apps/entropy/entropy-183.ebuild
new file mode 100644
index 000000000000..30549f7c534e
--- /dev/null
+++ b/sys-apps/entropy/entropy-183.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/entropy/entropy-183.ebuild,v 1.1 2013/03/14 18:08:47 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+inherit eutils python user
+
+DESCRIPTION="Entropy Package Manager foundation library"
+HOMEPAGE="http://www.sabayon.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE=""
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+RDEPEND="dev-db/sqlite[soundex]
+	net-misc/rsync
+	sys-apps/diffutils
+	sys-apps/sandbox
+	>=sys-apps/portage-2.1.9
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	dev-util/intltool"
+
+REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
+REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d"
+ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
+
+pkg_setup() {
+	# Can:
+	# - update repos
+	# - update security advisories
+	# - handle on-disk cache (atm)
+	enewgroup entropy || die "failed to create entropy group"
+	# Create unprivileged entropy user
+	enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
+	enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
+}
+
+src_compile() {
+	cd "${S}"/lib || die
+	emake || die "make failed"
+}
+
+src_install() {
+	# create directories required by equo
+	dodir /var/run/entropy
+	keepdir /var/run/entropy
+
+	cd "${S}"/lib || die
+	# TODO: drop VARDIR after 146
+	emake DESTDIR="${D}" VARDIR="/var" LIBDIR="usr/lib" install || die "make install failed"
+}
+
+pkg_postinst() {
+	for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do
+		real_conf="${ex_conf%.example}"
+		if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then
+			# skip installation then
+			continue
+		fi
+		elog "Installing: ${real_conf}"
+		cp "${ex_conf}" "${real_conf}" -p
+	done
+
+	# Copy config file over
+	if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
+		elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}"
+		cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p
+	fi
+
+	if [ -d "${ENTROPY_CACHEDIR}" ]; then
+		einfo "Purging current Entropy cache"
+		rm -rf "${ENTROPY_CACHEDIR}"/*
+	fi
+
+	# Fixup Entropy Resources Lock, and /etc/entropy/packages
+	# files permissions. This fixes unprivileged Entropy Library usage
+	local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources
+	if [ -f "${res_file}" ]; then
+		chown root:entropy "${res_file}"
+		chmod g+rw "${res_file}"
+		chmod o+r "${res_file}"
+	fi
+	local pkg_files="package.mask package.unmask package.mask.d package.unmask.d"
+	local pkg_file
+	for pkg_file in ${pkg_files}; do
+		pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}"
+		recursive=""
+		if [ -d "${pkg_file}" ]; then
+			recursive="-R"
+		fi
+		if [ -e "${pkg_file}" ]; then
+			chown ${recursive} root:entropy "${pkg_file}"
+			chmod ${recursive} go+r "${pkg_file}"
+		fi
+	done
+
+	# Setup Entropy Library directories ownership
+	chown -R root:entropy "${ROOT}/var/tmp/entropy"
+	chown root:entropy "${ROOT}/var/lib/entropy" # no recursion
+	chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion
+	chown root:entropy "${ROOT}/var/log/entropy" # no recursion
+
+	python_mod_optimize "/usr/lib/entropy/lib/entropy"
+
+	echo
+	elog "If you want to enable Entropy packages delta download support, please"
+	elog "install dev-util/bsdiff."
+	echo
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/lib/entropy"
+}
diff --git a/sys-apps/magneto-core/Manifest b/sys-apps/magneto-core/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/sys-apps/magneto-core/Manifest
+++ b/sys-apps/magneto-core/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/sys-apps/magneto-core/magneto-core-183.ebuild b/sys-apps/magneto-core/magneto-core-183.ebuild
new file mode 100644
index 000000000000..3a9f479d5d24
--- /dev/null
+++ b/sys-apps/magneto-core/magneto-core-183.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/magneto-core/magneto-core-183.ebuild,v 1.1 2013/03/14 18:25:46 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python multilib
+
+DESCRIPTION="Entropy Package Manager notification applet library"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~sys-apps/rigo-daemon-${PV}"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-core-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/magneto"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/$(get_libdir)/entropy/magneto"
+}
diff --git a/sys-apps/rigo-daemon/Manifest b/sys-apps/rigo-daemon/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/sys-apps/rigo-daemon/Manifest
+++ b/sys-apps/rigo-daemon/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/sys-apps/rigo-daemon/rigo-daemon-183.ebuild b/sys-apps/rigo-daemon/rigo-daemon-183.ebuild
new file mode 100644
index 000000000000..320f56bc5a9b
--- /dev/null
+++ b/sys-apps/rigo-daemon/rigo-daemon-183.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/sys-apps/rigo-daemon/rigo-daemon-183.ebuild,v 1.1 2013/03/14 18:24:35 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+MY_PN="RigoDaemon"
+DESCRIPTION="Entropy Client DBus Services, aka RigoDaemon"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/rigo/${MY_PN}"
+
+DEPEND=""
+RDEPEND="dev-python/dbus-python
+	dev-python/pygobject:3
+	~sys-apps/entropy-${PV}
+	sys-auth/polkit[introspection]
+	sys-devel/gettext"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_preinst() {
+	# ask RigoDaemon to shutdown, if running
+	# TODO: this will be removed in future
+	local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py
+	[[ -x "${shutdown_exec}" ]] && "${shutdown_exec}"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/rigo/${MY_PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/rigo/${MY_PN}"
+}
diff --git a/sys-cluster/nova/files/nova-folsom-3-CVE-2013-1838.patch b/sys-cluster/nova/files/nova-folsom-3-CVE-2013-1838.patch
new file mode 100644
index 000000000000..18ae387b2525
--- /dev/null
+++ b/sys-cluster/nova/files/nova-folsom-3-CVE-2013-1838.patch
@@ -0,0 +1,507 @@
+From 9561484166f245d0e4602a36351d6cac72dd9426 Mon Sep 17 00:00:00 2001
+From: Michael Still <mikal@stillhq.com>
+Date: Wed, 13 Mar 2013 04:44:14 +1100
+Subject: [PATCH] Add quotas for fixed ips.
+
+DocImpact: there is now a default quota of 10 fixed ips per tenant.
+This will need to be adjusted by deployers if that number does not
+meet their needs.
+
+Resolves bug 1125468 for folsom.
+
+Change-Id: I970d540cfa6a61b7e903703f845a6453ff55f225
+---
+ nova/db/api.py                                     |  6 ++
+ nova/db/sqlalchemy/api.py                          | 21 +++++
+ nova/exception.py                                  |  4 +
+ nova/network/manager.py                            | 89 ++++++++++++++--------
+ nova/quota.py                                      | 10 +++
+ .../compute/contrib/test_quota_classes.py          | 14 ++--
+ .../api/openstack/compute/contrib/test_quotas.py   | 16 ++--
+ nova/tests/network/test_manager.py                 | 15 ++++
+ nova/tests/test_quota.py                           | 24 ++++++
+ 9 files changed, 157 insertions(+), 42 deletions(-)
+
+diff --git a/nova/db/api.py b/nova/db/api.py
+index bb69558..9f2ff73 100644
+--- a/nova/db/api.py
++++ b/nova/db/api.py
+@@ -507,6 +507,12 @@ def fixed_ip_update(context, address, values):
+     """Create a fixed ip from the values dictionary."""
+     return IMPL.fixed_ip_update(context, address, values)
+ 
++
++def fixed_ip_count_by_project(context, project_id, session=None):
++    """Count fixed ips used by project."""
++    return IMPL.fixed_ip_count_by_project(context, project_id,
++                                          session=session)
++
+ ####################
+ 
+ 
+diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
+index 4bdab49..013ff69 100644
+--- a/nova/db/sqlalchemy/api.py
++++ b/nova/db/sqlalchemy/api.py
+@@ -1273,6 +1273,27 @@ def fixed_ip_update(context, address, values):
+         fixed_ip_ref.save(session=session)
+ 
+ 
++@require_context
++def fixed_ip_count_by_project(context, project_id, session=None):
++    authorize_project_context(context, project_id)
++
++    # NOTE(mikal): Yes I know this is horrible, but I couldn't
++    # get a query using a join working, mainly because of a failure
++    # to be able to express the where clause sensibly. Patches
++    # welcome.
++    session = get_session()
++    with session.begin():
++        instance_uuid_query = model_query(context, models.Instance.uuid,
++                                          read_deleted="no", session=session).\
++                                 filter(models.Instance.project_id == \
++                                            project_id)
++        uuid_filter = models.FixedIp.instance_uuid.in_(instance_uuid_query)
++        return model_query(context, models.FixedIp, read_deleted="no",
++                           session=session).\
++                           filter(uuid_filter).\
++                           count()
++
++
+ ###################
+ 
+ 
+diff --git a/nova/exception.py b/nova/exception.py
+index 64d31a1..fe80ca2 100644
+--- a/nova/exception.py
++++ b/nova/exception.py
+@@ -998,6 +998,10 @@ class FloatingIpLimitExceeded(QuotaError):
+     message = _("Maximum number of floating ips exceeded")
+ 
+ 
++class FixedIpLimitExceeded(QuotaError):
++    message = _("Maximum number of fixed ips exceeded")
++
++
+ class MetadataLimitExceeded(QuotaError):
+     message = _("Maximum number of metadata items exceeds %(allowed)d")
+ 
+diff --git a/nova/network/manager.py b/nova/network/manager.py
+index 00a6e58..df4493b 100644
+--- a/nova/network/manager.py
++++ b/nova/network/manager.py
+@@ -1294,37 +1294,53 @@ class NetworkManager(manager.SchedulerDependentManager):
+         address = None
+         instance_ref = self.db.instance_get(context, instance_id)
+ 
+-        if network['cidr']:
+-            address = kwargs.get('address', None)
+-            if address:
+-                address = self.db.fixed_ip_associate(context,
+-                                                     address,
+-                                                     instance_ref['uuid'],
+-                                                     network['id'])
+-            else:
+-                address = self.db.fixed_ip_associate_pool(context.elevated(),
+-                                                          network['id'],
+-                                                          instance_ref['uuid'])
+-            self._do_trigger_security_group_members_refresh_for_instance(
+-                                                                   instance_id)
+-            get_vif = self.db.virtual_interface_get_by_instance_and_network
+-            vif = get_vif(context, instance_ref['uuid'], network['id'])
+-            values = {'allocated': True,
+-                      'virtual_interface_id': vif['id']}
+-            self.db.fixed_ip_update(context, address, values)
+-
+-        name = instance_ref['display_name']
+-
+-        if self._validate_instance_zone_for_dns_domain(context, instance_ref):
+-            uuid = instance_ref['uuid']
+-            self.instance_dns_manager.create_entry(name, address,
+-                                                   "A",
+-                                                   self.instance_dns_domain)
+-            self.instance_dns_manager.create_entry(uuid, address,
+-                                                   "A",
+-                                                   self.instance_dns_domain)
+-        self._setup_network_on_host(context, network)
+-        return address
++        # Check the quota; can't put this in the API because we get
++        # called into from other places
++        try:
++            reservations = QUOTAS.reserve(context, fixed_ips=1)
++        except exception.OverQuota:
++            pid = context.project_id
++            LOG.warn(_("Quota exceeded for %(pid)s, tried to allocate "
++                       "fixed IP") % locals())
++            raise exception.FixedIpLimitExceeded()
++
++        try:
++            if network['cidr']:
++                address = kwargs.get('address', None)
++                if address:
++                    address = self.db.fixed_ip_associate(context,
++                                                         address,
++                                                         instance_ref['uuid'],
++                                                         network['id'])
++                else:
++                    address = self.db.fixed_ip_associate_pool(
++                        context.elevated(), network['id'],
++                        instance_ref['uuid'])
++                self._do_trigger_security_group_members_refresh_for_instance(
++                    instance_id)
++                get_vif = self.db.virtual_interface_get_by_instance_and_network
++                vif = get_vif(context, instance_ref['uuid'], network['id'])
++                values = {'allocated': True,
++                          'virtual_interface_id': vif['id']}
++                self.db.fixed_ip_update(context, address, values)
++
++            name = instance_ref['display_name']
++
++            if self._validate_instance_zone_for_dns_domain(context,
++                                                           instance_ref):
++                uuid = instance_ref['uuid']
++                self.instance_dns_manager.create_entry(
++                    name, address, "A", self.instance_dns_domain)
++                self.instance_dns_manager.create_entry(
++                    uuid, address, "A", self.instance_dns_domain)
++            self._setup_network_on_host(context, network)
++
++            QUOTAS.commit(context, reservations)
++            return address
++
++        except Exception:
++            with excutils.save_and_reraise_exception():
++                QUOTAS.rollback(context, reservations)
+ 
+     def deallocate_fixed_ip(self, context, address, host=None, teardown=True):
+         """Returns a fixed ip to the pool."""
+@@ -1334,6 +1350,13 @@ class NetworkManager(manager.SchedulerDependentManager):
+                 context.elevated(read_deleted='yes'),
+                 fixed_ip_ref['instance_uuid'])
+ 
++        try:
++            reservations = QUOTAS.reserve(context, fixed_ips=-1)
++        except Exception:
++            reservations = None
++            LOG.exception(_("Failed to update usages deallocating "
++                            "fixed IP"))
++
+         self._do_trigger_security_group_members_refresh_for_instance(
+             instance['uuid'])
+ 
+@@ -1373,6 +1396,10 @@ class NetworkManager(manager.SchedulerDependentManager):
+                 #             callback will get called by nova-dhcpbridge.
+                 self.driver.release_dhcp(dev, address, vif['address'])
+ 
++        # Commit the reservations
++        if reservations:
++            QUOTAS.commit(context, reservations)
++
+     def lease_fixed_ip(self, context, address):
+         """Called by dhcp-bridge when ip is leased."""
+         LOG.debug(_('Leased IP |%(address)s|'), locals(), context=context)
+diff --git a/nova/quota.py b/nova/quota.py
+index d3ba0aa..31e2794 100644
+--- a/nova/quota.py
++++ b/nova/quota.py
+@@ -50,6 +50,10 @@ quota_opts = [
+     cfg.IntOpt('quota_floating_ips',
+                default=10,
+                help='number of floating ips allowed per project'),
++    cfg.IntOpt('quota_fixed_ips',
++               default=10,
++               help=('number of fixed ips allowed per project (this should be '
++                     'at least the number of instances allowed)')),
+     cfg.IntOpt('quota_metadata_items',
+                default=128,
+                help='number of metadata items allowed per instance'),
+@@ -778,6 +782,11 @@ def _sync_floating_ips(context, project_id, session):
+             context, project_id, session=session))
+ 
+ 
++def _sync_fixed_ips(context, project_id, session):
++    return dict(fixed_ips=db.fixed_ip_count_by_project(
++            context, project_id, session=session))
++
++
+ def _sync_security_groups(context, project_id, session):
+     return dict(security_groups=db.security_group_count_by_project(
+             context, project_id, session=session))
+@@ -794,6 +803,7 @@ resources = [
+     ReservableResource('gigabytes', _sync_volumes, 'quota_gigabytes'),
+     ReservableResource('floating_ips', _sync_floating_ips,
+                        'quota_floating_ips'),
++    ReservableResource('fixed_ips', _sync_fixed_ips, 'quota_fixed_ips'),
+     AbsoluteResource('metadata_items', 'quota_metadata_items'),
+     AbsoluteResource('injected_files', 'quota_injected_files'),
+     AbsoluteResource('injected_file_content_bytes',
+diff --git a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
+index b732f88..5bee208 100644
+--- a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
++++ b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
+@@ -25,10 +25,11 @@ from nova.tests.api.openstack import fakes
+ def quota_set(class_name):
+     return {'quota_class_set': {'id': class_name, 'metadata_items': 128,
+             'volumes': 10, 'gigabytes': 1000, 'ram': 51200,
+-            'floating_ips': 10, 'instances': 10, 'injected_files': 5,
+-            'cores': 20, 'injected_file_content_bytes': 10240,
+-            'security_groups': 10, 'security_group_rules': 20,
+-            'key_pairs': 100, 'injected_file_path_bytes': 255}}
++            'floating_ips': 10, 'fixed_ips': 10, 'instances': 10,
++            'injected_files': 5, 'cores': 20,
++            'injected_file_content_bytes': 10240, 'security_groups': 10,
++            'security_group_rules': 20, 'key_pairs': 100,
++            'injected_file_path_bytes': 255}}
+ 
+ 
+ class QuotaClassSetsTest(test.TestCase):
+@@ -44,6 +45,7 @@ class QuotaClassSetsTest(test.TestCase):
+             'ram': 51200,
+             'volumes': 10,
+             'floating_ips': 10,
++            'fixed_ips': 10,
+             'metadata_items': 128,
+             'gigabytes': 1000,
+             'injected_files': 5,
+@@ -91,7 +93,8 @@ class QuotaClassSetsTest(test.TestCase):
+         body = {'quota_class_set': {'instances': 50, 'cores': 50,
+                                     'ram': 51200, 'volumes': 10,
+                                     'gigabytes': 1000, 'floating_ips': 10,
+-                                    'metadata_items': 128, 'injected_files': 5,
++                                    'fixed_ips': 10, 'metadata_items': 128,
++                                    'injected_files': 5,
+                                     'injected_file_content_bytes': 10240,
+                                     'injected_file_path_bytes': 255,
+                                     'security_groups': 10,
+@@ -139,6 +142,7 @@ class QuotaTemplateXMLSerializerTest(test.TestCase):
+                 gigabytes=40,
+                 ram=50,
+                 floating_ips=60,
++                fixed_ips=10,
+                 instances=70,
+                 injected_files=80,
+                 security_groups=10,
+diff --git a/nova/tests/api/openstack/compute/contrib/test_quotas.py b/nova/tests/api/openstack/compute/contrib/test_quotas.py
+index f628535..adfe129 100644
+--- a/nova/tests/api/openstack/compute/contrib/test_quotas.py
++++ b/nova/tests/api/openstack/compute/contrib/test_quotas.py
+@@ -26,11 +26,12 @@ from nova.tests.api.openstack import fakes
+ 
+ def quota_set(id):
+     return {'quota_set': {'id': id, 'metadata_items': 128, 'volumes': 10,
+-            'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10,
+-            'instances': 10, 'injected_files': 5, 'cores': 20,
+-            'injected_file_content_bytes': 10240,
+-            'security_groups': 10, 'security_group_rules': 20,
+-            'key_pairs': 100, 'injected_file_path_bytes': 255}}
++                          'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10,
++                          'fixed_ips': 10, 'instances': 10,
++                          'injected_files': 5, 'cores': 20,
++                          'injected_file_content_bytes': 10240,
++                          'security_groups': 10, 'security_group_rules': 20,
++                          'key_pairs': 100, 'injected_file_path_bytes': 255}}
+ 
+ 
+ class QuotaSetsTest(test.TestCase):
+@@ -46,6 +47,7 @@ class QuotaSetsTest(test.TestCase):
+             'ram': 51200,
+             'volumes': 10,
+             'floating_ips': 10,
++            'fixed_ips': 10,
+             'metadata_items': 128,
+             'gigabytes': 1000,
+             'injected_files': 5,
+@@ -88,6 +90,7 @@ class QuotaSetsTest(test.TestCase):
+                     'volumes': 10,
+                     'gigabytes': 1000,
+                     'floating_ips': 10,
++                    'fixed_ips': 10,
+                     'metadata_items': 128,
+                     'injected_files': 5,
+                     'injected_file_path_bytes': 255,
+@@ -120,7 +123,7 @@ class QuotaSetsTest(test.TestCase):
+                               'injected_file_path_bytes': 255,
+                               'security_groups': 10,
+                               'security_group_rules': 20,
+-                              'key_pairs': 100}}
++                              'key_pairs': 100, 'fixed_ips': 10}}
+ 
+         req = fakes.HTTPRequest.blank('/v2/fake4/os-quota-sets/update_me',
+                                       use_admin_context=True)
+@@ -171,6 +174,7 @@ class QuotaXMLSerializerTest(test.TestCase):
+                 gigabytes=40,
+                 ram=50,
+                 floating_ips=60,
++                fixed_ips=10,
+                 instances=70,
+                 injected_files=80,
+                 security_groups=10,
+diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
+index e983ad6..f27a176 100644
+--- a/nova/tests/network/test_manager.py
++++ b/nova/tests/network/test_manager.py
+@@ -30,6 +30,7 @@ from nova.openstack.common import importutils
+ from nova.openstack.common import log as logging
+ from nova.openstack.common import rpc
+ import nova.policy
++from nova import quota
+ from nova import test
+ from nova.tests import fake_network
+ from nova import utils
+@@ -278,6 +279,7 @@ class FlatNetworkTestCase(test.TestCase):
+         self.mox.StubOutWithMock(db,
+                               'virtual_interface_get_by_instance_and_network')
+         self.mox.StubOutWithMock(db, 'fixed_ip_update')
++        self.mox.StubOutWithMock(quota.QUOTAS, 'reserve')
+ 
+         db.fixed_ip_update(mox.IgnoreArg(),
+                            mox.IgnoreArg(),
+@@ -291,6 +293,10 @@ class FlatNetworkTestCase(test.TestCase):
+         db.instance_get(mox.IgnoreArg(),
+                         mox.IgnoreArg()).AndReturn({'security_groups':
+                                                              [{'id': 0}]})
++
++        quota.QUOTAS.reserve(mox.IgnoreArg(),
++                             fixed_ips=mox.IgnoreArg()).AndReturn(None)
++
+         db.fixed_ip_associate_pool(mox.IgnoreArg(),
+                                    mox.IgnoreArg(),
+                                    mox.IgnoreArg()).AndReturn('192.168.0.101')
+@@ -310,6 +316,7 @@ class FlatNetworkTestCase(test.TestCase):
+         self.mox.StubOutWithMock(db,
+                               'virtual_interface_get_by_instance_and_network')
+         self.mox.StubOutWithMock(db, 'fixed_ip_update')
++        self.mox.StubOutWithMock(quota.QUOTAS, 'reserve')
+ 
+         db.fixed_ip_update(mox.IgnoreArg(),
+                            mox.IgnoreArg(),
+@@ -323,6 +330,10 @@ class FlatNetworkTestCase(test.TestCase):
+         db.instance_get(mox.IgnoreArg(),
+                         mox.IgnoreArg()).AndReturn({'security_groups':
+                                                              [{'id': 0}]})
++
++        quota.QUOTAS.reserve(mox.IgnoreArg(),
++                             fixed_ips=mox.IgnoreArg()).AndReturn(None)
++
+         db.fixed_ip_associate_pool(mox.IgnoreArg(),
+                                    mox.IgnoreArg(),
+                                    mox.IgnoreArg()).AndReturn('192.168.0.101')
+@@ -376,6 +387,7 @@ class FlatNetworkTestCase(test.TestCase):
+         self.mox.StubOutWithMock(db,
+                               'virtual_interface_get_by_instance_and_network')
+         self.mox.StubOutWithMock(db, 'fixed_ip_update')
++        self.mox.StubOutWithMock(quota.QUOTAS, 'reserve')
+ 
+         db.fixed_ip_update(mox.IgnoreArg(),
+                            mox.IgnoreArg(),
+@@ -390,6 +402,9 @@ class FlatNetworkTestCase(test.TestCase):
+                         mox.IgnoreArg()).AndReturn({'security_groups':
+                                                              [{'id': 0}]})
+ 
++        quota.QUOTAS.reserve(mox.IgnoreArg(),
++                             fixed_ips=mox.IgnoreArg()).AndReturn(None)
++
+         db.fixed_ip_associate_pool(mox.IgnoreArg(),
+                                    mox.IgnoreArg(),
+                                    mox.IgnoreArg()).AndReturn(fixedip)
+diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
+index dd86c7c..5baf966 100644
+--- a/nova/tests/test_quota.py
++++ b/nova/tests/test_quota.py
+@@ -723,6 +723,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+                    quota_volumes=10,
+                    quota_gigabytes=1000,
+                    quota_floating_ips=10,
++                   quota_fixed_ips=10,
+                    quota_metadata_items=128,
+                    quota_injected_files=5,
+                    quota_injected_file_content_bytes=10 * 1024,
+@@ -755,6 +756,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+                 volumes=10,
+                 gigabytes=1000,
+                 floating_ips=10,
++                fixed_ips=10,
+                 metadata_items=128,
+                 injected_files=5,
+                 injected_file_content_bytes=10 * 1024,
+@@ -791,6 +793,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+                 volumes=10,
+                 gigabytes=500,
+                 floating_ips=10,
++                fixed_ips=10,
+                 metadata_items=64,
+                 injected_files=5,
+                 injected_file_content_bytes=5 * 1024,
+@@ -847,6 +850,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+         self._stub_quota_class_get_all_by_name()
+ 
+     def test_get_project_quotas(self):
++        self.maxDiff = None
+         self._stub_get_by_project()
+         result = self.driver.get_project_quotas(
+             FakeContext('test_project', 'test_class'),
+@@ -888,6 +892,11 @@ class DbQuotaDriverTestCase(test.TestCase):
+                     in_use=2,
+                     reserved=0,
+                     ),
++                fixed_ips=dict(
++                    limit=10,
++                    in_use=0,
++                    reserved=0,
++                    ),
+                 metadata_items=dict(
+                     limit=64,
+                     in_use=0,
+@@ -926,6 +935,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+                 ))
+ 
+     def test_get_project_quotas_alt_context_no_class(self):
++        self.maxDiff = None
+         self._stub_get_by_project()
+         result = self.driver.get_project_quotas(
+             FakeContext('other_project', 'other_class'),
+@@ -966,6 +976,11 @@ class DbQuotaDriverTestCase(test.TestCase):
+                     in_use=2,
+                     reserved=0,
+                     ),
++                fixed_ips=dict(
++                    limit=10,
++                    in_use=0,
++                    reserved=0,
++                    ),
+                 metadata_items=dict(
+                     limit=128,
+                     in_use=0,
+@@ -1004,6 +1019,7 @@ class DbQuotaDriverTestCase(test.TestCase):
+                 ))
+ 
+     def test_get_project_quotas_alt_context_with_class(self):
++        self.maxDiff = None
+         self._stub_get_by_project()
+         result = self.driver.get_project_quotas(
+             FakeContext('other_project', 'other_class'),
+@@ -1045,6 +1061,11 @@ class DbQuotaDriverTestCase(test.TestCase):
+                     in_use=2,
+                     reserved=0,
+                     ),
++                fixed_ips=dict(
++                    limit=10,
++                    in_use=0,
++                    reserved=0,
++                    ),
+                 metadata_items=dict(
+                     limit=64,
+                     in_use=0,
+@@ -1145,6 +1166,9 @@ class DbQuotaDriverTestCase(test.TestCase):
+                 floating_ips=dict(
+                     limit=10,
+                     ),
++                fixed_ips=dict(
++                    limit=10,
++                    ),
+                 metadata_items=dict(
+                     limit=64,
+                     ),
+-- 
+1.8.1.5
+
diff --git a/sys-cluster/nova/nova-2012.2.3-r1.ebuild b/sys-cluster/nova/nova-2012.2.3-r2.ebuild
similarity index 94%
rename from sys-cluster/nova/nova-2012.2.3-r1.ebuild
rename to sys-cluster/nova/nova-2012.2.3-r2.ebuild
index 1addf2883bf6..cb080dad8b99 100644
--- a/sys-cluster/nova/nova-2012.2.3-r1.ebuild
+++ b/sys-cluster/nova/nova-2012.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/sys-cluster/nova/nova-2012.2.3-r1.ebuild,v 1.1 2013/02/26 21:44:05 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.3-r2.ebuild,v 1.1 2013/03/14 20:40:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -46,6 +46,7 @@ RDEPEND="=dev-python/amqplib-0.6.1
 PATCHES=(
 			"${FILESDIR}/nova-folsom-CVE-2013-1664.patch"
 			"${FILESDIR}/nova-folsom-3-CVE-2013-0335.patch"
+			"${FILESDIR}/nova-folsom-3-CVE-2013-1838.patch"
 )
 
 python_install() {
diff --git a/sys-cluster/pacemaker-gui/Manifest b/sys-cluster/pacemaker-gui/Manifest
index c33823fcdaa0..3e32e32cbe73 100644
--- a/sys-cluster/pacemaker-gui/Manifest
+++ b/sys-cluster/pacemaker-gui/Manifest
@@ -1 +1,2 @@
 DIST pacemaker-gui-2.1.1.tar.gz 394443 SHA256 62609ef13591502ce8b7d67702eb2d2b89fada8cd8556a1d2a8f9754a8de1211 SHA512 5b14ad4c87c52f13befa163fbf77e2cbb47e0c161cba909a90686872cfd4fbae994aeece077473c6ba486091d53e23971c86934e040fab8fc99a795259e33e7a WHIRLPOOL b8d5b106dd5f306755a23ac63c3f489405de2bc44c67d7ef9fc1dcbd64a424fbe2045217563e093ebafcee97e2cb3b53d93c57702acd42443d41bf2c6fedee21
+DIST pacemaker-gui-2.1.2.tar.gz 398311 SHA256 9c431916a186c027fe714b46acf84f017440ed120cdca174cf244cd946fbfac3 SHA512 7d1bffbe6478a250452ce692371f2e47d6cba11eaa2a7684e99cf2befdb32662c092d0e6b59973fe076ed9ce640082fd4ebb3e7b7cd8730cfa697af82dfdf06f WHIRLPOOL 3f2913a283d9a2ef18153d10f477348e15c292a19070173dec761e0f5aee2999c7395476e237e6d5690efdc29d9157de4a0d6ef2280b46f7c8895057b3850428
diff --git a/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch b/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch
new file mode 100644
index 000000000000..72d1ff5d183d
--- /dev/null
+++ b/sys-cluster/pacemaker-gui/files/pacemaker-mgmt-query-node-uuid.patch
@@ -0,0 +1,13 @@
+diff --git a/mgmt/daemon/mgmt_crm.c b/mgmt/daemon/mgmt_crm.c
+index 9e5140c..3b5ff36 100644
+--- a/mgmt/daemon/mgmt_crm.c
++++ b/mgmt/daemon/mgmt_crm.c
+@@ -1602,7 +1602,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 	delete_lrm_rsc(crmd_channel, argv[1], argv[2]);
+ 	refresh_lrm(crmd_channel, NULL); 
+ 	
+-	rc = query_node_uuid(cib_conn, argv[1], &dest_node);
++	rc = query_node_uuid(cib_conn, argv[1], &dest_node, NULL);
+ 	if (rc != 0) {
+ 		mgmt_log(LOG_WARNING, "Could not map uname=%s to a UUID: %s\n",
+ 				argv[1], pcmk_strerror(rc));
diff --git a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild
new file mode 100644
index 000000000000..9af32d363239
--- /dev/null
+++ b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.2.ebuild,v 1.1 2013/03/15 10:19:47 ultrabug Exp $
+
+EAPI=4
+PYTHON_DEPEND="2"
+MY_P="pacemaker-mgmt-${PV}"
+MY_TREE="3c95739"
+
+inherit python base autotools
+
+DESCRIPTION="Pacemaker python GUI and management daemon"
+HOMEPAGE="http://hg.clusterlabs.org/pacemaker/pygui/"
+SRC_URI="https://github.com/gao-yan/pacemaker-mgmt/tarball/${MY_P} -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="-gtk heartbeat nls snmp static-libs"
+
+CDEPEND="
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-libs/openssl
+	net-libs/gnutls
+	sys-apps/util-linux
+	sys-cluster/cluster-glue
+	>=sys-cluster/pacemaker-1.1
+	heartbeat? ( sys-cluster/pacemaker[heartbeat] )
+	gtk? (
+		dev-python/pygtk
+		)
+	sys-libs/ncurses
+	sys-libs/pam
+	sys-libs/zlib"
+RDEPEND="${CDEPEND}
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	gtk? ( dev-lang/swig )
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+S="${WORKDIR}/gao-yan-pacemaker-mgmt-${MY_TREE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.1-doc.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	base_src_prepare
+	# FIXME upstream said they will find a way to avoid this patch
+	if has_version ">sys-cluster/pacemaker-1.1.8"; then
+		epatch "${FILESDIR}"/pacemaker-mgmt-query-node-uuid.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myopts=""
+	use heartbeat || myopts="--with-ais-support"
+	econf $(use_with heartbeat heartbeat-support) \
+		$(use_enable snmp) \
+		$(use_enable nls) \
+		$(use_enable gtk mgmt-client) \
+		$(use_enable static-libs static) \
+		${myopts} \
+		--disable-fatal-warnings
+}
+
+src_install() {
+	base_src_install
+	use static-libs || find "${D}"/usr/$(get_libdir)/ -name "*.la" -delete
+	dodoc README doc/AUTHORS || die
+}
+
+pkg_postinst() {
+	elog "IMPORTANT: To have the mgmtd daemon started with your cluster,"
+	elog "you must add this directive in /etc/corosync/service.d/pacemaker :"
+	elog ""
+	elog "use_mgmtd: 1"
+	elog ""
+	elog "NB: To access the GUI, your user must be part of the 'haclient' group"
+}
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index b71fc65c2688..596ce8e78159 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1 +1 @@
-DIST aufs-headers-3.8.0.tar.xz 2180 SHA256 3cb51c22f38018f2875276de8bde43bafb877b2ca23fe431de19295b2298c9f6 SHA512 e69eb64595292df381870b3c71d96b6ec153649f4f91577823a1fabb27cdb12d1b0987343291fcce54e0c6377506f5f3326d456425c27e35d7889415c13d22c5 WHIRLPOOL 34da1f2ad5ad2436464d6c43f3a0bbf1c47f1f0f27980cad91b2fb8f03ec6056a9d0633b3278d56e7d05982d0d8c01057de397e164076e90d6980934467c4653
+DIST aufs-headers-3.8_p20130318.tar.xz 2180 SHA256 ba466e8a02beecc36c78ed1b2aaba9c65f68e014fc74f0c7a12225596981b175 SHA512 ce934b5f79f6f691c7665ff87b6fa7c3b258b8b4b974a8824e3b68889f024345c950bda31689195db6d76e93ca2374336ec44b53722cc5c653d873d1d4ad720a WHIRLPOOL 5def77b381eb41db35fcb477d1f4fdcbe5049a9b172ad86dc7260528f18fd4d75afe58ecd67f4ef75bfa8c0a141a29065b0deb527fe47965f422bc47cae574a9
diff --git a/sys-fs/aufs-headers/aufs-headers-3.8.0.ebuild b/sys-fs/aufs-headers/aufs-headers-3.8_p20130318.ebuild
similarity index 55%
rename from sys-fs/aufs-headers/aufs-headers-3.8.0.ebuild
rename to sys-fs/aufs-headers/aufs-headers-3.8_p20130318.ebuild
index 393b826c183d..0fa885d9f72f 100644
--- a/sys-fs/aufs-headers/aufs-headers-3.8.0.ebuild
+++ b/sys-fs/aufs-headers/aufs-headers-3.8_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/aufs-headers/aufs-headers-3.8.0.ebuild,v 1.1 2013/03/10 10:39:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-headers/aufs-headers-3.8_p20130318.ebuild,v 1.1 2013/03/15 09:24:28 jlec Exp $
 
 EAPI=5
 
@@ -8,6 +8,12 @@ inherit versionator
 
 DESCRIPTION="User space headers for aufs3"
 HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
+# Check Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -exec rmdir {} +
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
@@ -18,7 +24,7 @@ IUSE=""
 S="${WORKDIR}"
 
 src_install() {
-	sed -e "s:3.x-rcN:$(get_version_component_range 1-2):g" -i include/linux/aufs_type.h || die
+	sed -e "s:3.x-rcN:${PV/_p/-}:g" -i include/linux/aufs_type.h || die
 	insinto /usr
 	doins -r include
 }
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 0daa60d28575..75b64883c17e 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -3,4 +3,4 @@ DIST aufs-sources-3.7.6.tar.xz 143064 SHA256 1360d182b163698725aa0d4cbc61f545ef7
 DIST aufs-util-3.6.tar.xz 76104 SHA256 aa5e8275d33933cbbacc68a65d0b48812917d38e3839b2411f76c0efc3ddcb37 SHA512 e73513a549879c26e354bf642c0fe08d7d98299f877519dc654045d6d8d145df7f6cddbd7f0922fbcbd250d9118e505775328aaf7bbdfc0b507d5e93fab69f36 WHIRLPOOL ea0767baf7ef759e1f018f9b6467ce0e64f1684de7c494fca73fd9b79823f2b36924cceea958d9890b22699b09b632d47afcf95bd8cd1510bad0f4c488966851
 DIST aufs-util-3.7.6.tar.xz 76264 SHA256 6a254233d3b0deee00b59c3b792cd425a7f9a7f570468f345500bfbf65041fd6 SHA512 9530d3ac06cc7178fdd321bcf1d5591e6e2f679a5f12794d6481d5ea6fa2ac1f4355a3bf5dfc2e744b26c2be7fa8e2300b62f2aa7ddc5744c9686e0bd192e1c2 WHIRLPOOL d051956c5f6174466d5c704ae6931f9294b47026940a7903df81740b35740079ac68bc3a35c0737a7712b3aeaa3dd7f02e0f70aebd5d1f97a5116ace43572d12
 DIST aufs-util-3.7.tar.xz 76252 SHA256 1353f2d73443f921ca9968cf4a4ce281c0c22ee4c4b506179757275b74bc3cc2 SHA512 765a12d0d35a97efc81d16badca5ec45fc92ceb21666a21788e76de8a05d408ff501fcc5703ea80f77db78ff36e7772ef922804817ed695f0fdd10b9e44e4457 WHIRLPOOL 103e1ba3d58b24418d7e43d3097f51160d4443d5e89fae5c1c44937d2bc2b05160fdf2d7c835a25072a1873ef6e547b53d122a4800d6c519992027dae3d07f87
-DIST aufs-util-3.8.0.tar.xz 76268 SHA256 c17fa5576ac1185e93081a95323453bf415ea71e62433100dad954f86f47f5d9 SHA512 7b0a46a549e89a6ad8f4c9d8f27c83d185661d50be71799fe9bcb2e57665454890196c6a091850d9cc2bbb9f69d2ce378aa2a4faa7ecf407e46ccdf0dad0f9fb WHIRLPOOL 7473a3dfdb35f296c8c58ade1a18d1bfeb69bf3dad33f6574af90c035eb9ddbe550710aec068b061f22bb55628bf421a335053ff72f60bd786eae04aa95f040e
+DIST aufs-util-3.8_p20130318.tar.xz 76272 SHA256 01407d85756d50c63e07947e66f3132ae049fba68d884af4fd4f3bfcfb62e0d6 SHA512 2775ba08803a9aee738f40d19d895707080309aec6fbea1d240041e76f65b0a2784eddedf7d4bfa75a9abee3e74c857900adfb57d9b6e3e104f67324274a615e WHIRLPOOL 379518aa46fdf1227da860de9698e0139c6fb0dc10178b7af0a1ba5787c2409f0ca3ae66b0ac77f8beea87675733c2276b1fda0310fb634bd04dfb578e747060
diff --git a/sys-fs/aufs-util/aufs-util-3.8.0.ebuild b/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild
similarity index 85%
rename from sys-fs/aufs-util/aufs-util-3.8.0.ebuild
rename to sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild
index 57a2f5fa9af3..3737855f3fa0 100644
--- a/sys-fs/aufs-util/aufs-util-3.8.0.ebuild
+++ b/sys-fs/aufs-util/aufs-util-3.8_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/aufs-util/aufs-util-3.8.0.ebuild,v 1.1 2013/03/10 10:47:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.8_p20130318.ebuild,v 1.1 2013/03/15 09:49:21 jlec Exp $
 
 EAPI=5
 
@@ -9,9 +9,9 @@ inherit flag-o-matic linux-info multilib toolchain-funcs
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=aufs-util-3.8.2/ \
-# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \
-# -o aufs-util-3.8.2.tar && xz -ve9 aufs-util-3.8.2.tar
+# git archive -v --prefix=aufs-util-3.8_p20130318/
+# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0
+# -o aufs-util-3.8_p20130318.tar && xz -ve9 *.tar
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index ebd009360230..95e6c18fb493 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -3,3 +3,4 @@ DIST aufs3-3_p20130107.tar.xz 2311936 SHA256 6a40835128ca30233035dc08dca4eee0e37
 DIST aufs3-3_p20130114.tar.xz 2390020 SHA256 6adf0504a6599685ad3757399a44875aae0a44cd70a04f7de7a780cf4d095e90 SHA512 0c8ea9be38ec64d0462f9a4b33934487654abf71f51d9bcd7df0a4a3e868f47b2489bd981805cc3b1615c41e57c7ec614dedcb6d921ace91360cd70207fcf4ba WHIRLPOOL 3954f3abc878051beef4d251dfd7dbf49f1a188b42aeb1509a3c1523a5aeb48dce0a5ec0bf757f55e4e886b760b7d65494ef9ba92f05fd1f66ee46d01c5d0f87
 DIST aufs3-3_p20130207.tar.xz 2440192 SHA256 69b23941605adc9dd7eb03c789b6368acf1cb498df29dc917e9cc56df2dbfdce SHA512 88048c2419b459a169b7a114d242476cf52770121428d7de2fbcee1869e87ead7a6a1a9f9a6fa3b9be6b19459544f0d8bba014d3c2cd8a1b1bc4a2015e25c02e WHIRLPOOL 0f9ee7664d61856d35b99d475ebf872ee9c8a197909b9ab4f4bc51e0be1a26f182cc69588f801e3dbcee9e1d46de172aea9dea6e275787e2275b9659dafb8bd8
 DIST aufs3-3_p20130306.tar.xz 2569220 SHA256 0511c77a337d33d958fd684dec0d3fdd9f1c307850dad68acc11e6d9c0433bab SHA512 087a2b2972962f9214c4fba0ac1ddec74c1786f9a5573a297aa5985dfd8d2924d37b877e4835e5cbd39eaff4f776ed0001edac17e64988a95bea3bbcd32bbc87 WHIRLPOOL bd62325388f66ac608064b1f87779ae530539ba5267700b1d3511eca8f26a853b949007011e38e42ab95a69b4e1efd10a52647d3703abcd72788a592d2256256
+DIST aufs3-standalone-3_p20130318.tar.xz 2396080 SHA256 1c2e473581e64597c8ba3937c65242cf79fa7a842a35830a852ed4b29bc7e78e SHA512 67ab11d69249fdf2e83eb4945823f2e3bd35bc1e4c673870e9496284969f0b123f823ef73f43913d4e6cc1fcea8f230b8d64e18f47b3e1816d422702d926008c WHIRLPOOL 024fc2526192e98441c112667c513980dff475d5922ac4b0be5e832fb457e633b38ae2cee0e305065fbc9636cc78d0a1ef11222277333d1c135f0bb2fe7aaada
diff --git a/sys-fs/aufs3/aufs3-3_p20130318.ebuild b/sys-fs/aufs3/aufs3-3_p20130318.ebuild
new file mode 100644
index 000000000000..3c11856f8731
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130318.ebuild
@@ -0,0 +1,148 @@
+# 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 $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=8
+# highest supported version
+KERN_MAX_VER=9
+# highest util branch version
+UTIL_MAX_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" ~EXPERIMENTAL !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
+		UTIL_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
+		UTIL_BRANCH="${UTIL_MAX_VER}"
+	else
+		UTIL_BRANCH="${KV_MINOR}"
+	fi
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.patch > /dev/null ); then
+		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
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	local util_branch=origin/${PN}.${UTIL_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-2.patch
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index d4a822587ac2..7ada2804efc1 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,3 +1,2 @@
-DIST inotify-tools-3.12.tar.gz 389417 SHA256 90f69ae24cc21fa6d33dc406077f16c06113b3000f7d267e7056e52f50d0abc0
 DIST inotify-tools-3.13.tar.gz 389473 SHA256 464146acec2c118be63a6c2a090d9252fbe9689c093db85b695d0502fa229445
 DIST inotify-tools-3.14.tar.gz 358772 SHA256 222bcca8893d7bf8a1ce207fb39ceead5233b5015623d099392e95197676c92f
diff --git a/sys-fs/inotify-tools/inotify-tools-3.12.ebuild b/sys-fs/inotify-tools/inotify-tools-3.12.ebuild
deleted file mode 100644
index cc61e41e29ba..000000000000
--- a/sys-fs/inotify-tools/inotify-tools-3.12.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/inotify-tools/inotify-tools-3.12.ebuild,v 1.8 2009/09/23 20:51:05 patrick Exp $
-
-IUSE=""
-DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="http://inotify-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS
-}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild
index 551895e075cd..14420f789d45 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild,v 1.4 2009/11/26 10:37:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/inotify-tools/inotify-tools-3.13-r1.ebuild,v 1.5 2013/03/15 11:56:02 pinkbyte Exp $
 
 EAPI="2"
 
 DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="http://inotify-tools.sourceforge.net/"
+HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/inotify-tools/inotify-tools-3.13.ebuild b/sys-fs/inotify-tools/inotify-tools-3.13.ebuild
deleted file mode 100644
index 70b9411d86e1..000000000000
--- a/sys-fs/inotify-tools/inotify-tools-3.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/inotify-tools/inotify-tools-3.13.ebuild,v 1.4 2009/09/23 20:51:05 patrick Exp $
-
-IUSE=""
-DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="http://inotify-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~arm"
-DEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS AUTHORS
-}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.14.ebuild b/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
index 9197047e472a..1794a6cde4ca 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.14.ebuild
@@ -1,11 +1,11 @@
-# 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/sys-fs/inotify-tools/inotify-tools-3.14.ebuild,v 1.1 2010/06/15 11:47:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/inotify-tools/inotify-tools-3.14.ebuild,v 1.2 2013/03/15 11:56:02 pinkbyte Exp $
 
 EAPI="2"
 
 DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="http://inotify-tools.sourceforge.net/"
+HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki"
 SRC_URI="http://github.com/downloads/rvoicilas/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/udev/ChangeLog-2009 b/sys-fs/udev/ChangeLog-2009
index 536dd6606402..fe94eb88729a 100644
--- a/sys-fs/udev/ChangeLog-2009
+++ b/sys-fs/udev/ChangeLog-2009
@@ -1,6 +1,6 @@
 # ChangeLog for sys-fs/udev
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog-2009,v 1.1 2012/01/01 21:49:17 dilfridge Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog-2009,v 1.2 2013/03/15 09:38:45 ssuominen Exp $
 
   30 Dec 2009; Matthias Schwarzott <zzam@gentoo.org> udev-149.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/ChangeLog-2010 b/sys-fs/udev/ChangeLog-2010
new file mode 100644
index 000000000000..63d0bed5ec37
--- /dev/null
+++ b/sys-fs/udev/ChangeLog-2010
@@ -0,0 +1,257 @@
+# ChangeLog for sys-fs/udev
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog-2010,v 1.1 2013/03/15 09:38:45 ssuominen Exp $
+
+*udev-164-r1 (12 Dec 2010)
+
+  12 Dec 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-164-r1.ebuild:
+  Moved scripts from files to a tarball.
+
+*udev-164 (30 Oct 2010)
+
+  30 Oct 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/164/40-gentoo.rules, +files/164/90-network.rules,
+  +files/164/shell-compat-KV.sh, +files/164/shell-compat-addon.sh,
+  +files/164/udev.confd, +files/164/udev.initd,
+  +files/164/udev-dev-tarball.initd, +files/164/udev-mount.initd,
+  +files/164/udev-postmount.initd, +udev-164.ebuild,
+  +files/164/udev-start.sh, +files/164/udev-stop.sh:
+  Version bumped. Changed udev-postmount script to better check for ro
+  filesystems and non bash shells. Bugs 342403, 326825. Remove /dev/loop if
+  it is empty, Bug #338766.
+
+  29 Oct 2010; Jeroen Roovers <jer@gentoo.org> udev-151-r4.ebuild:
+  Stable for HPPA (bug #324507).
+
+*udev-163 (11 Oct 2010)
+
+  11 Oct 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-163.ebuild:
+  Version bumped.
+
+  27 Sep 2010; Matthias Schwarzott <zzam@gentoo.org> -udev-146.ebuild,
+  -udev-146-r2.ebuild, -udev-146-r3.ebuild,
+  -files/udev-146-printer-usb_device-permission.diff,
+  -files/151/shell-compat-addon.sh, -udev-147-r1.ebuild,
+  -files/151/udev.confd, -udev-145.ebuild, -udev-150-r1.ebuild,
+  -udev-151-r1.ebuild, -udev-151-r2.ebuild, -udev-151-r3.ebuild,
+  -udev-154.ebuild, -udev-156.ebuild, -udev-157.ebuild, -udev-158.ebuild,
+  -udev-159.ebuild, -files/udev-159-path_id.patch, -files/151/udev.initd,
+  -udev-160.ebuild, -files/151/udev-dev-tarball.initd, -udev-145-r1.ebuild,
+  -udev-161.ebuild,
+  -files/udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch,
+  -files/151/shell-compat-KV.sh, -files/151/udev-mount.initd,
+  -files/151/udev-postmount.initd, -files/151/udev-start.sh,
+  -udev-145-r2.ebuild, -files/151/udev-stop.sh, -udev-145-r3.ebuild:
+  Removed a lot of old versions.
+
+*udev-162 (12 Sep 2010)
+
+  12 Sep 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-162.ebuild:
+  Version bumped.
+
+  28 Aug 2010; Raúl Porcel <armin76@gentoo.org> udev-151-r4.ebuild:
+  ia64/m68k/s390/sh/sparc stable wrt #334087
+
+  28 Aug 2010; Markus Meier <maekke@gentoo.org> udev-151-r4.ebuild:
+  arm stable, bug #324507
+
+*udev-161 (24 Aug 2010)
+
+  24 Aug 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-161-cdrom_id_Drop_MEDIA_SESSION_NEXT_for_DVD-RW-RO.patch,
+  +files/161/40-gentoo.rules, +files/161/90-network.rules,
+  +files/161/shell-compat-KV.sh, +files/161/shell-compat-addon.sh,
+  +files/161/udev.confd, +files/161/udev-dev-tarball.initd,
+  +udev-161.ebuild, +files/161/udev.initd, +files/161/udev-mount.initd,
+  +files/161/udev-postmount.initd, +files/161/udev-start.sh,
+  +files/161/udev-stop.sh:
+  Version bumped. Fixed dir_writable check printing an error to console when
+  test fails, bug #326825.
+
+  24 Aug 2010; Matthias Schwarzott <zzam@gentoo.org> udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-151-r2.ebuild,
+  udev-151-r3.ebuild, udev-151-r4.ebuild, udev-154.ebuild, udev-156.ebuild,
+  udev-157.ebuild, udev-158.ebuild, udev-159.ebuild, udev-160.ebuild,
+  udev-9999.ebuild:
+  Fix pkgconfig dependency to be only in DEPEND and not in RDEPEND.
+
+  23 Aug 2010; Mike Frysinger <vapier@gentoo.org> udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-151-r2.ebuild,
+  udev-151-r3.ebuild, udev-151-r4.ebuild, udev-154.ebuild, udev-156.ebuild,
+  udev-157.ebuild, udev-158.ebuild, udev-159.ebuild, udev-160.ebuild,
+  udev-9999.ebuild:
+  Convert kernel headers into a blocker #296546 by Alan Hourihane.
+
+  13 Aug 2010; Joseph Jezak <josejx@gentoo.org> udev-151-r4.ebuild:
+  Marked ppc stable for bug #324507.
+
+  12 Aug 2010; Brent Baude <ranger@gentoo.org> udev-151-r4.ebuild:
+  stable ppc64, bug 324507
+
+  08 Aug 2010; Raúl Porcel <armin76@gentoo.org> udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-151-r2.ebuild,
+  udev-151-r3.ebuild, udev-151-r4.ebuild, udev-154.ebuild, udev-156.ebuild,
+  udev-157.ebuild, udev-158.ebuild, udev-159.ebuild, udev-160.ebuild:
+  Re-add sh
+
+  02 Aug 2010; Matthias Schwarzott <zzam@gentoo.org> udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-151-r2.ebuild,
+  udev-151-r3.ebuild, udev-151-r4.ebuild, udev-154.ebuild, udev-156.ebuild,
+  udev-157.ebuild, udev-158.ebuild, udev-159.ebuild, udev-160.ebuild:
+  Added pkgconfig dependency for udev-149 and newer when using extras
+  use-flag, Bug #327713.
+
+  27 Jul 2010; Pacho Ramos <pacho@gentoo.org> udev-151-r4.ebuild:
+  amd64 stable, bug 324507
+
+  25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> udev-151-r4.ebuild:
+  Stable on alpha, bug #324507
+
+  22 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> udev-151-r4.ebuild:
+  x86 stable wrt bug #324507
+
+  17 Jul 2010; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+  Updated live ebuild, Bug #327823.
+
+*udev-160 (12 Jul 2010)
+
+  12 Jul 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-160.ebuild:
+  Version bumped. This is a bugfix release.
+
+  10 Jul 2010; Raúl Porcel <armin76@gentoo.org> udev-147-r1.ebuild,
+  udev-149.ebuild, udev-150-r1.ebuild, udev-151-r1.ebuild,
+  udev-151-r2.ebuild, udev-151-r3.ebuild, udev-151-r4.ebuild,
+  udev-154.ebuild, udev-156.ebuild, udev-157.ebuild, udev-158.ebuild,
+  udev-159.ebuild:
+  Rekeyword ~alpha now that the glibc issues have been fixed
+
+*udev-159 (07 Jul 2010)
+
+  07 Jul 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-159.ebuild,
+  +files/udev-159-path_id.patch:
+  Version bumped.
+
+*udev-158 (24 Jun 2010)
+
+  24 Jun 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-158.ebuild:
+  Version bumped.
+
+*udev-157 (20 Jun 2010)
+*udev-156 (20 Jun 2010)
+
+  20 Jun 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/156/40-gentoo.rules, +files/156/90-network.rules,
+  +files/156/shell-compat-KV.sh, +files/156/shell-compat-addon.sh,
+  +files/156/udev.confd, +files/156/udev-dev-tarball.initd,
+  +udev-157.ebuild, +files/156/udev.initd, +files/156/udev-mount.initd,
+  +files/156/udev-postmount.initd, udev-9999.ebuild,
+  +files/156/udev-start.sh, +files/156/udev-stop.sh, +udev-156.ebuild:
+  Add version udev-156 and udev-157. These contain some rule changes.
+  Init-scripts improved a bit. Fix udev-postmount on selinux, Bug #317573.
+
+*udev-154 (12 May 2010)
+
+  12 May 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-154.ebuild:
+  Version bumped. Now devfs-compat and oldhd is no longer supported.
+
+*udev-151-r4 (05 May 2010)
+
+  05 May 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/151-r4/shell-compat-KV.sh, +files/151-r4/shell-compat-addon.sh,
+  +files/151-r4/udev.confd, +files/151-r4/udev-dev-tarball.initd,
+  udev-9999.ebuild, +files/151-r4/udev.initd,
+  +files/151-r4/udev-mount.initd, +files/151-r4/udev-postmount.initd,
+  +files/151-r4/udev-start.sh, +files/151-r4/udev-stop.sh,
+  +udev-151-r4.ebuild:
+  Updated init-scripts. Now support setting debug and trace options in
+  config file. Explicitly send add-event for initial population (newer
+  udevds will default to change). Set property STARTUP while booting for
+  compatibility with new eg. lvm2 init-scripts. Sync udev-9999.ebuild.
+
+*udev-151-r3 (02 May 2010)
+
+  02 May 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-151-r3.ebuild:
+  Disable devfs-compat and old-hd-rules use flags by default they will be
+  removed on next udev update.
+
+*udev-146-r3 (20 Apr 2010)
+
+  20 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> +udev-146-r3.ebuild:
+  Alpha cannot use the 151-r2 version due to non-availability of newer
+  kernels, so provide an older ebuild with static libraries for lvm2
+  bumping.
+
+*udev-151-r2 (19 Apr 2010)
+
+  19 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> +udev-151-r2.ebuild:
+  Build static libraries as well, for lvm2 to use when building static
+  versions for early boot purposes.
+
+  19 Apr 2010; Matthias Schwarzott <zzam@gentoo.org> files/151/udev.initd,
+  udev-9999.ebuild:
+  Add keywords nolxc and noopenvz to udev init-script, Bug #310427.
+
+  16 Apr 2010; Brent Baude <ranger@gentoo.org> udev-149.ebuild:
+  Marking udev-149 ppc for bug 303031
+
+  05 Apr 2010; Jeroen Roovers <jer@gentoo.org> udev-149.ebuild:
+  Back to ~hppa (bug #294470).
+
+  22 Mar 2010; Brent Baude <ranger@gentoo.org> udev-149.ebuild:
+  Marking udev-149 ppc64 for bug 303031
+
+  15 Mar 2010; Matthias Schwarzott <zzam@gentoo.org> udev-145.ebuild,
+  udev-145-r1.ebuild, udev-145-r2.ebuild, udev-145-r3.ebuild,
+  udev-146.ebuild, udev-146-r1.ebuild, udev-146-r2.ebuild,
+  udev-147-r1.ebuild, udev-149.ebuild, udev-150-r1.ebuild,
+  udev-151-r1.ebuild, udev-9999.ebuild:
+  Fix tests for udev-149 and udev-151-r1, thanks to Myckel Habets for
+  looking into it, Bug #295958. Restrict test for the other ebuilds.
+
+  07 Mar 2010; Markus Meier <maekke@gentoo.org> udev-149.ebuild:
+  amd64/arm stable, bug #303031
+
+  02 Mar 2010; Jeroen Roovers <jer@gentoo.org> udev-149.ebuild:
+  Stable for HPPA (bug #303031).
+
+  21 Feb 2010; Christian Faulhammer <fauli@gentoo.org> udev-149.ebuild:
+  stable x86, bug 303031
+
+  07 Feb 2010; Matthias Schwarzott <zzam@gentoo.org> udev-141-r1.ebuild,
+  udev-145.ebuild, udev-145-r1.ebuild, udev-145-r2.ebuild,
+  udev-145-r3.ebuild, udev-146.ebuild, udev-146-r1.ebuild,
+  udev-146-r2.ebuild, udev-147-r1.ebuild, udev-149.ebuild,
+  udev-150-r1.ebuild, udev-151-r1.ebuild, udev-9999.ebuild:
+  Improve wording of devfs-compat message, Bug #301141. Sync udev-9999 to
+  latest udev-151-r1.
+
+*udev-151-r1 (01 Feb 2010)
+*udev-150-r1 (01 Feb 2010)
+
+  01 Feb 2010; Matthias Schwarzott <zzam@gentoo.org> -udev-150.ebuild,
+  +udev-150-r1.ebuild, +files/udev-150-fix-missing-firmware-timeout.diff,
+  -udev-151.ebuild, +udev-151-r1.ebuild:
+  Fix missing firmware timeout, to stop modprobe from waiting 60s for no
+  file stretching boot very long, Bug #301667.
+
+  31 Jan 2010; Matthias Schwarzott <zzam@gentoo.org> udev-151.ebuild:
+  Fix install error, bug #302903. Removed old code for multilib-installs.
+
+*udev-151 (29 Jan 2010)
+
+  29 Jan 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-151-readd-hd-rules.diff, +files/151/shell-compat-KV.sh,
+  +files/151/shell-compat-addon.sh, +files/151/udev.confd,
+  +files/151/udev.initd, +files/151/udev-dev-tarball.initd,
+  +files/151/udev-mount.initd, +files/151/udev-postmount.initd,
+  +udev-151.ebuild, +files/151/udev-start.sh, +files/151/udev-stop.sh,
+  metadata.xml:
+  Version bumped. Fix selinux, Bug #297317. Add use-flag old-hd-rules to
+  control re-adding of rules for /dev/hd*, Bug #300627.
+
+*udev-150 (19 Jan 2010)
+
+  19 Jan 2010; Matthias Schwarzott <zzam@gentoo.org> +udev-150.ebuild:
+  Version bumped.
+
+  For previous entries, please see ChangeLog-2009.
diff --git a/sys-fs/udev/ChangeLog-2011 b/sys-fs/udev/ChangeLog-2011
new file mode 100644
index 000000000000..c57b146b29be
--- /dev/null
+++ b/sys-fs/udev/ChangeLog-2011
@@ -0,0 +1,303 @@
+# ChangeLog for sys-fs/udev
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog-2011,v 1.1 2013/03/15 09:38:45 ssuominen Exp $
+
+  30 Dec 2011; William Hubbs <williamh@gentoo.org> -udev-171-r4.ebuild:
+  remove old version
+
+*udev-171-r5 (29 Dec 2011)
+
+  29 Dec 2011; William Hubbs <williamh@gentoo.org> udev-141.ebuild,
+  udev-141-r1.ebuild, udev-146-r1.ebuild, udev-149.ebuild, udev-151-r4.ebuild,
+  udev-164-r2.ebuild, +udev-171-r5.ebuild, udev-175-r1.ebuild,
+  udev-9999.ebuild:
+  add -vserver and -lxc keywords to udev-mount and udev-postmount, fix a typo
+  in udev script and several repoman fixes.
+
+  25 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  udev now needs >=sys-apps/util-linux-2.20
+
+  17 Dec 2011; Raúl Porcel <armin76@gentoo.org> udev-164-r2.ebuild:
+  s390 stable wrt #352827
+
+  15 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Add a compatibility symlink for udevadm and use --exec-prefix to put the
+  binaries in the correct directory.
+
+  14 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  remove prefix support and use bindir to install udevadm in /bin.
+
+  14 Dec 2011; Mike Frysinger <vapier@gentoo.org> udev-171-r4.ebuild:
+  Unify duplicate econf statements with a use_extras helper.
+
+  14 Dec 2011; William Hubbs <williamh@gentoo.org> -udev-171-r1.ebuild,
+  -udev-171-r2.ebuild, -udev-171-r3.ebuild, -udev-175.ebuild:
+  remove old versions
+
+*udev-171-r4 (11 Dec 2011)
+
+  11 Dec 2011; William Hubbs <williamh@gentoo.org> +files/shell-compat-KV.sh,
+  +udev-171-r4.ebuild:
+  rev bump for #338257.
+
+  09 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild
+
+  09 Dec 2011; Mike Frysinger <vapier@gentoo.org> udev-171-r3.ebuild,
+  udev-175.ebuild, udev-175-r1.ebuild:
+  Require pciutils[-zlib] when USE=hwdb #360849 by Samuli Suominen.
+
+*udev-175-r1 (09 Dec 2011)
+*udev-171-r3 (09 Dec 2011)
+
+  09 Dec 2011; William Hubbs <williamh@gentoo.org> +udev-171-r3.ebuild,
+  +udev-175-r1.ebuild:
+  Rev bumps for #380929. All scripts should now be /run aware.
+
+  11 Nov 2011; Mike Frysinger <vapier@gentoo.org> udev-171-r2.ebuild,
+  udev-175.ebuild, udev-9999.ebuild:
+  If we don't run eautoreconf, then run elibtoolize so the local libtool code
+  gets workarounds added to it (e.g. cross-compiling fixes).
+
+  09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  add warning about separate /usr partition.
+
+  09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  fix an indent
+
+  09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  QA Fixes: use should not be called in global scope and clean up the
+  conditional declarations for IUSE and RESTRICT.
+  Thanks to mr_bones_ for pointing these out.
+
+  08 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  sync live ebuild and fix a comment
+
+  08 Nov 2011; William Hubbs <williamh@gentoo.org> -udev-174-r1.ebuild:
+  remove old version
+
+*udev-175 (08 Nov 2011)
+
+  08 Nov 2011; William Hubbs <williamh@gentoo.org> +udev-175.ebuild:
+  version bump
+
+  07 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild.
+
+*udev-174-r1 (07 Nov 2011)
+
+  07 Nov 2011; William Hubbs <williamh@gentoo.org> -udev-174.ebuild,
+  +udev-174-r1.ebuild:
+  backport a patch to re-add permissions to optical drives.
+
+*udev-174 (06 Nov 2011)
+
+  06 Nov 2011; William Hubbs <williamh@gentoo.org> +udev-174.ebuild:
+  version bump
+
+  06 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  fix dependencies for doc use flag in live ebuild.
+
+  04 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Live ebuild now pulls udev gentoo scripts from git.
+
+  03 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Major updates to the live ebuild:
+  - The src_test function was set back to the default per upstream's
+  recommendations. Also, test has been restricted to run if userpriv is
+  not active.
+  - The src_unpack and pkg_preinst functions were removed.
+  - a new version of the udev startup scripts was included which is more
+  integrated to openrc and has had some outdated files removed.
+  - Now the ebuild manually installs the files from udev-gentoo-scripts.
+  - Several other small code cleanups.
+
+  18 Sep 2011; Zac Medico <zmedico@gentoo.org> udev-171-r2.ebuild,
+  udev-9999.ebuild:
+  Fix for prefix and add ~x86-linux keyword.
+
+*udev-171-r2 (13 Sep 2011)
+
+  13 Sep 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-171-r2.ebuild,
+  udev-9999.ebuild:
+  Add src_test function that also tests the udev-scripts. Sync live ebuild and
+  normal version.
+
+  09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> udev-164-r2.ebuild:
+  ppc/ppc64 stable wrt #352827
+
+  07 Jul 2011; Matthias Schwarzott <zzam@gentoo.org> udev-171-r1.ebuild,
+  udev-9999.ebuild:
+  Enforce new enough linux-headers, Bug #368403.
+
+  06 Jul 2011; William Hubbs <williamh@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild, udev-164-r2.ebuild, udev-171-r1.ebuild,
+  udev-9999.ebuild:
+  add blk_dev_bsg to config_check for bug #373535.
+
+  30 Jun 2011; William Hubbs <williamh@gentoo.org> -udev-168-r2.ebuild:
+  removing udev 168 because it breaks X11
+
+  28 Jun 2011; William Hubbs <williamh@gentoo.org> udev-164-r2.ebuild,
+  udev-171-r1.ebuild, udev-9999.ebuild:
+  Fix the target of the udev symbolic link that is installed in the
+  stages.
+
+  25 Jun 2011; Raúl Porcel <armin76@gentoo.org> udev-164-r2.ebuild:
+  ia64/m68k/sh/sparc stable wrt #352827
+
+  22 Jun 2011; William Hubbs <williamh@gentoo.org> udev-164-r2.ebuild,
+  udev-171-r1.ebuild, udev-9999.ebuild:
+  add build to iuse
+
+  14 Jun 2011; Markus Meier <maekke@gentoo.org> udev-164-r2.ebuild:
+  x86 stable, bug #352827
+
+  13 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171-r1.ebuild,
+  udev-9999.ebuild:
+  Update glibc requirement to 2.10 for bug #370691.
+
+  11 Jun 2011; Markus Meier <maekke@gentoo.org> udev-164-r2.ebuild:
+  arm stable, bug #352827
+
+  09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-171-r1.ebuild:
+  Update test tarball to version 171, bug #370849.
+
+  09 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171-r1.ebuild:
+  add temporary support for the extras use flag.
+
+  09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+  Fix unpacking with git-2 eclass, bug #370647.
+
+  09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-171-r1.ebuild,
+  udev-9999.ebuild:
+  Do no longer tell the user to re-emerge HAL in case of problems.
+
+  09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> -udev-162.ebuild,
+  -udev-163.ebuild, -udev-164.ebuild, -udev-164-r1.ebuild, -udev-167.ebuild,
+  -udev-167-r1.ebuild, -udev-168.ebuild, -udev-168-r1.ebuild, -udev-171.ebuild:
+  Removed unneeded versions.
+
+  08 Jun 2011; Markos Chandras <hwoarang@gentoo.org> udev-164-r2.ebuild:
+  Stable on amd64 wrt bug #352827
+
+  08 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  fix typo: VCS should be vcs. bug #370647.
+
+  08 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171-r1.ebuild,
+  udev-9999.ebuild:
+  Do not force the acl, gudev, hwdb or keymap use flags on since these were
+  bringing in dependencies a minimal system does not need. Thanks to Matt
+  Turner for pointing this out.
+
+*udev-171-r1 (07 Jun 2011)
+
+  07 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-171-r1.ebuild:
+  Fix checking kernel versions with strange suffixes, Bug #370009. Also prepare
+  for two digit numbers (3.0).
+
+  07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171.ebuild,
+  udev-9999.ebuild, metadata.xml:
+  Use acl global use flag instead of udev_acl.
+
+  07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  migrate live ebuild to eapi 4.
+
+  05 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild, udev-162.ebuild, udev-163.ebuild,
+  udev-164.ebuild, udev-164-r1.ebuild, udev-164-r2.ebuild, udev-167.ebuild,
+  udev-167-r1.ebuild, udev-168.ebuild, udev-168-r1.ebuild, udev-168-r2.ebuild,
+  udev-171.ebuild, udev-9999.ebuild:
+  Linux-3.0 support for udev version checks.
+
+*udev-171 (05 Jun 2011)
+
+  05 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-171.ebuild,
+  udev-9999.ebuild, metadata.xml:
+  Version bumped, Bug #368331. Split extras use flag into a lot small ones, Bug
+  #348472. Fix cross compiling issue, Bug #360397. Use systemd eclass, Bug
+  #365943. Update minimum required kernel version.
+
+  05 Jun 2011; Jeroen Roovers <jer@gentoo.org> udev-164-r2.ebuild:
+  Stable for HPPA (bug #352827).
+
+  02 Jun 2011; William Hubbs <williamh@gentoo.org> udev-164-r2.ebuild,
+  udev-9999.ebuild:
+  Add udev to the sysinit runlevel for the stages, bug #369037
+
+  01 Jun 2011; Tobias Klausmann <klausman@gentoo.org> udev-164-r2.ebuild:
+  Stable on alpha, bug #352827
+
+*udev-168-r2 (14 May 2011)
+
+  14 May 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-168-r2.ebuild,
+  udev-9999.ebuild:
+  Remove /run is not existing message, Bug #365679. Fix uinput rule to match
+  what newer kernels does, Bug #321677. Only run modprobe unix when unix
+  sockets are not yet available, Bug #363549.
+
+*udev-168-r1 (30 Apr 2011)
+
+  30 Apr 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-168-r1.ebuild:
+  fixed install location of baselayout-1 scripts, bug #364375.
+
+  30 Apr 2011; Matthias Schwarzott <zzam@gentoo.org> udev-168.ebuild,
+  udev-9999.ebuild:
+  Fix helper programs still installed to /lib64/udev
+
+*udev-168 (30 Apr 2011)
+
+  30 Apr 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-168.ebuild,
+  udev-9999.ebuild:
+  Version bumped. Unconditionally install to /lib/udev, also on multilib, Bug
+  #364375. Remove automagic dependency to systemd, Bug #364065.
+
+  15 Apr 2011; Ulrich Mueller <ulm@gentoo.org> udev-114.ebuild,
+  udev-115-r1.ebuild, udev-119.ebuild, udev-124-r1.ebuild, udev-124-r2.ebuild,
+  udev-141.ebuild, udev-141-r1.ebuild, udev-146-r1.ebuild, udev-149.ebuild,
+  udev-151-r4.ebuild, udev-162.ebuild, udev-163.ebuild, udev-164.ebuild,
+  udev-164-r1.ebuild, udev-164-r2.ebuild, udev-167.ebuild, udev-167-r1.ebuild,
+  udev-9999.ebuild:
+  Don't PROVIDE virtual/dev-manager, it is a new-style virtual now. Bug 361133.
+
+  03 Apr 2011; Matthias Schwarzott <zzam@gentoo.org> udev-167.ebuild,
+  udev-167-r1.ebuild, udev-9999.ebuild:
+  Update needed reliable kernel version. Sync live version to latest normal
+  version.
+
+  03 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> udev-167-r1.ebuild:
+  Avoid maintainer-mode triggered automake.
+
+*udev-167-r1 (03 Apr 2011)
+
+  03 Apr 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-167-r1.ebuild,
+  +files/udev-167-revert-disable-all-extras.patch:
+  Let USE=-extras still build important utils like ata_id and usb_id.
+  Backported from udev-168.
+
+*udev-167 (30 Mar 2011)
+
+  30 Mar 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-167.ebuild:
+  Version bumped. udev-167 defaults to using subdir udev in /run if it exists,
+  but as this does not exist on gentoo, it normally falls back to using
+  /dev/.udev, so this is fine.
+
+  30 Mar 2011; Matthias Schwarzott <zzam@gentoo.org> udev-164-r2.ebuild,
+  -files/udev-164-remove-noopenvz.patch:
+  Use updated scripts instead of patching them.
+
+*udev-164-r2 (19 Mar 2011)
+
+  19 Mar 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-164-r2.ebuild,
+  +files/udev-164-remove-noopenvz.patch, +files/udev-164-remove-v4l1.patch:
+  Enable udev inside OpenVZ containers, Bug #346885. Disable v4lv1, so that
+  udev compiles with linux-headers-2.6.38, Bug #359407.
+
+  06 Feb 2011; Mart Raudsepp <leio@gentoo.org> udev-114.ebuild,
+  udev-115-r1.ebuild:
+  Drop to ~mips
+
diff --git a/sys-fs/udev/ChangeLog-2012 b/sys-fs/udev/ChangeLog-2012
new file mode 100644
index 000000000000..ca4120fb737d
--- /dev/null
+++ b/sys-fs/udev/ChangeLog-2012
@@ -0,0 +1,585 @@
+# ChangeLog for sys-fs/udev
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog-2012,v 1.1 2013/03/15 09:38:45 ssuominen Exp $
+
+*udev-171-r10 (18 Dec 2012)
+
+  18 Dec 2012; Richard Yao <ryao@gentoo.org> +udev-171-r10.ebuild:
+  Backport accept4 fallback path from eudev-1_beta1, approved by WilliamH and
+  ssuominen
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> -udev-196.ebuild:
+  old
+
+*udev-196-r1 (02 Dec 2012)
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +udev-196-r1.ebuild,
+  udev-9999.ebuild:
+  USE="hwdb" will now pull in sys-apps/hwids with USE="udev" enabled to gain
+  pci.ids, usb.ids and oui.txt to generate /etc/udev/udev.bin from.
+  Run udevadm hwdb --update too. Thanks to Flameeyes for co-operating with
+  this one.
+
+*udev-196 (02 Dec 2012)
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +udev-196.ebuild,
+  udev-9999.ebuild:
+  Version bump.
+
+  01 Dec 2012; William Hubbs <williamh@gentoo.org> -udev-189.ebuild,
+  -udev-190.ebuild, -udev-191.ebuild, -udev-192.ebuild, -udev-193.ebuild,
+  -udev-194.ebuild:
+  after speaking with the systemd maintainer, older versions of udev are being
+  removed.
+
+  01 Dec 2012; William Hubbs <williamh@gentoo.org> +udev-189.ebuild,
+  +udev-190.ebuild, +udev-191.ebuild, +udev-192.ebuild, +udev-193.ebuild,
+  +udev-194.ebuild:
+  restore old versions so we do not break systemd
+
+  01 Dec 2012; William Hubbs <williamh@gentoo.org> -udev-189.ebuild,
+  -udev-190.ebuild, -udev-191.ebuild, -udev-192.ebuild, -udev-193.ebuild,
+  -udev-194.ebuild:
+  remove old versions
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -udev-171-r8.ebuild:
+  old
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild, udev-164-r2.ebuild:
+  Reset keywording back to ~arch since these can't be considered stable
+  anymore. Use at your own risk.
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r9.ebuild:
+  alpha/ia64/m68k/s390/sh/sparc stable wrt #443592
+
+  20 Nov 2012; Anthony G. Basile <blueness@gentoo.org> udev-171-r9.ebuild:
+  stable arm ppc ppc64, bug #443592
+
+  20 Nov 2012; Jeroen Roovers <jer@gentoo.org> udev-171-r9.ebuild:
+  Stable for HPPA (bug #443592).
+
+  19 Nov 2012; Agostino Sarubbo <ago@gentoo.org> udev-171-r9.ebuild:
+  stable for x86, wrt to bug #443592
+
+  18 Nov 2012; <ago@gentoo.org> udev-171-r9.ebuild:
+  Stable for amd64, wrt bug #443592
+
+*udev-171-r9 (16 Nov 2012)
+
+  16 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> +udev-171-r9.ebuild:
+  Backport upstream patch to skip ATA transport class devices for compability
+  with recent kernels wrt #437418 by "sf"
+
+  01 Nov 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild md5 for default rules with 195.
+
+  01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udev-195.ebuild,
+  udev-9999.ebuild:
+  Use REPLACING_VERSIONS to print out upgrade related messaging only when
+  required wrt #440462 by "poletti.marco"
+
+  01 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r8.ebuild:
+  Update HOMEPAGE and SRC_URI from latest stable wrt #440408
+
+*udev-195 (26 Oct 2012)
+
+  26 Oct 2012; William Hubbs <williamh@gentoo.org> +udev-195.ebuild:
+  version bump
+
+*udev-171-r8 (20 Oct 2012)
+
+  20 Oct 2012; William Hubbs <williamh@gentoo.org> +udev-171-r8.ebuild:
+  Another part of the fix for #438932.
+  Now we require both udev-mount and udev to be added to the sysinit
+  runlevel.
+
+*udev-171-r7 (20 Oct 2012)
+
+  20 Oct 2012; William Hubbs <williamh@gentoo.org> +udev-171-r7.ebuild:
+  This is a hot fix for stable udev for bug #438932.
+  The only change is that udev-mount has "provide dev-mount" added to
+  the depend function. This is going directly to stable with the approval
+  of robbat2 and chainsaw.
+
+  15 Oct 2012; Zac Medico <zmedico@gentoo.org> udev-194.ebuild,
+  udev-9999.ebuild:
+  Set QA_MULTILIB_PATHS for bug #424423.
+
+*udev-194 (04 Oct 2012)
+
+  04 Oct 2012; William Hubbs <williamh@gentoo.org> +udev-194.ebuild,
+  udev-9999.ebuild:
+  version bump and sync live ebuild.
+
+  01 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> udev-193.ebuild:
+  Fix typo.
+
+*udev-193 (30 Sep 2012)
+
+  30 Sep 2012; William Hubbs <williamh@gentoo.org> +udev-193.ebuild:
+  version bump
+
+*udev-192 (26 Sep 2012)
+
+  26 Sep 2012; William Hubbs <williamh@gentoo.org> +udev-192.ebuild:
+  version bump
+
+*udev-191 (22 Sep 2012)
+
+  22 Sep 2012; William Hubbs <williamh@gentoo.org> +udev-191.ebuild:
+  version bump
+
+*udev-190 (21 Sep 2012)
+
+  21 Sep 2012; William Hubbs <williamh@gentoo.org> +udev-190.ebuild:
+  version bump
+
+  11 Sep 2012; William Hubbs <williamh@gentoo.org> udev-164-r2.ebuild,
+  udev-171-r6.ebuild, udev-189.ebuild, udev-9999.ebuild:
+  According to armin76, udev works fine on sh with glibc-2.11. To keep things
+  simple, I am adjusting the block to allow glibc-2.11 on all archs.
+
+  10 Sep 2012; William Hubbs <williamh@gentoo.org> udev-189.ebuild,
+  udev-9999.ebuild:
+  Add more information on persistent net rules and clean up ewarns. this closes
+  #433746 and #434626. Thanks to James Le Cuirot and Pacho Ramos.
+
+  10 Sep 2012; William Hubbs <williamh@gentoo.org> udev-189.ebuild,
+  udev-9999.ebuild:
+  Fix location for preserved library for #434632, thanks to Pacho Ramos.
+
+  10 Sep 2012; William Hubbs <williamh@gentoo.org> -udev-188.ebuild:
+  remove old version
+
+*udev-189 (24 Aug 2012)
+
+  24 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-189.ebuild:
+  version bump
+
+  24 Aug 2012; William Hubbs <williamh@gentoo.org> -udev-187-r1.ebuild,
+  -udev-187-r3.ebuild:
+  remove old versions
+
+  15 Aug 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild
+
+*udev-188 (15 Aug 2012)
+
+  15 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-188.ebuild:
+  version bump
+
+  13 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> udev-187-r3.ebuild,
+  udev-9999.ebuild:
+  Rename reserved check_KV function to udev_check_KV wrt #430562 by "zym"
+
+  11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> udev-164-r2.ebuild,
+  udev-171-r6.ebuild, udev-187-r1.ebuild, udev-187-r3.ebuild, udev-9999.ebuild:
+  Update sys-libs/glibc block from <2.9 to <2.12 wrt #388075 by Tiago Marques
+
+  11 Aug 2012; Michał Górny <mgorny@gentoo.org> udev-187-r3.ebuild:
+  Block older versions of systemd hoping for a sane migration.
+
+*udev-187-r3 (08 Aug 2012)
+
+  08 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-187-r3.ebuild,
+  udev-9999.ebuild:
+  rev bump to put /lib/udev back in /usr/lib/udev as well as add a second
+  compatibility patch so we can run helpers in /lib/udev.
+  Thanks to Egor Egorov for the patch.
+  I also spoke with the other udev maintainer (Samuli), and he agrees that
+  we should be using /usr/lib and allowing packages to put things in /lib
+  for now.
+  This is for bug #430412.
+
+  08 Aug 2012; Justin Lecher <jlec@gentoo.org> udev-187-r1.ebuild,
+  udev-187-r2.ebuild, udev-9999.ebuild:
+  Fix typo
+
+  08 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org> udev-187-r1.ebuild,
+  udev-187-r2.ebuild, udev-9999.ebuild:
+  Update gobject-introspection dependency
+
+*udev-187-r2 (07 Aug 2012)
+
+  07 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-187-r2.ebuild,
+  udev-9999.ebuild:
+  rev bump to move everything back to /lib/udev from /usr/lib/udev.
+  Also sync live ebuild.
+
+  04 Aug 2012; William Hubbs <williamh@gentoo.org> udev-187-r1.ebuild,
+  udev-9999.ebuild:
+  fix if statements
+
+  03 Aug 2012; William Hubbs <williamh@gentoo.org> udev-187-r1.ebuild,
+  udev-9999.ebuild:
+  Add a warning for bug #429466 wrt the /lib/udev->/usr/lib/udev migration.
+
+*udev-187-r1 (03 Aug 2012)
+
+  03 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-187-r1.ebuild,
+  udev-9999.ebuild:
+  Fix the firmware path to search in /usr/lib then /lib. Also sync the
+  live ebuild.
+
+  01 Aug 2012; William Hubbs <williamh@gentoo.org> udev-187.ebuild,
+  udev-9999.ebuild:
+  fix calls to preserve_old_lib and preserve_old_lib_notify
+
+*udev-187 (01 Aug 2012)
+
+  01 Aug 2012; William Hubbs <williamh@gentoo.org> +udev-187.ebuild,
+  udev-9999.ebuild:
+  version bump and sync live ebuild
+
+  31 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/move_tmp_persistent_rules-112-r1.sh, -files/136/udev.confd,
+  -files/147/udev.confd, -files/write_root_link_rule-125,
+  -files/136/udev.initd, -files/147/udev.initd, -files/net-130-r1.sh,
+  -files/136/shell-compat-KV.sh, -files/136/udev-dev-tarball.initd,
+  -files/147/udev-mount.initd, -files/udev-141-remove-devfs-names.diff,
+  -files/136/udev-mount.initd, -files/147/udev-postmount.initd,
+  -files/blacklist-146, -files/136/udev-postmount.initd,
+  -files/147/udev-start.sh, -files/udev-150-fix-missing-firmware-timeout.diff,
+  -files/136/shell-compat-addon.sh, -files/136/udev-start.sh,
+  -files/147/udev-stop.sh, -files/udev-151-readd-hd-rules.diff,
+  -files/136/udev-stop.sh, -files/151-r4/shell-compat-KV.sh,
+  -files/udev-164-remove-v4l1.patch, -files/147/shell-compat-KV.sh,
+  -files/147/shell-compat-addon.sh, -files/147/udev-dev-tarball.initd,
+  -files/151-r4/shell-compat-addon.sh, -files/151-r4/udev.confd,
+  -files/151-r4/udev-dev-tarball.initd, udev-146-r1.ebuild,
+  -files/151-r4/udev-mount.initd, udev-151-r4.ebuild, -files/151-r4/udev.initd,
+  -files/151-r4/udev-postmount.initd, -files/151-r4/udev-start.sh,
+  udev-149.ebuild, udev-164-r2.ebuild, -files/151-r4/udev-stop.sh,
+  udev-141-r1.ebuild, udev-171-r6.ebuild, -files/pnp-aliases,
+  -files/shell-compat-KV.sh:
+  Tarball rest of the legacy files to mirrors.
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -files/blacklist-110,
+  udev-141-r1.ebuild:
+  udev-141-r1 can use blacklist-146 instead of blacklist-110 (because the only
+  difference is in commented out example for usblp)
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r6.ebuild,
+  metadata.xml:
+  Move inherit around in -171-r6.ebuild and remove unused USE="acl" from
+  metadata.xml to silence repoman.
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> -files/net-104-r10.sh,
+  -files/156/udev.confd, -files/udev-110-root-link-1.diff,
+  -files/156/udev.initd, -files/udev-postmount-initd-111-r2,
+  -files/156/udev-postmount.initd, -files/udev-stop-111-r2.sh,
+  -files/156/udev-start.sh, -files/udev-start-113-r2.sh,
+  -files/156/40-gentoo.rules, -files/156/udev-stop.sh,
+  -files/udev-start-114-r1.sh, -files/161/40-gentoo.rules,
+  -files/udev-114-root-link-2.diff, -files/161/90-network.rules,
+  -files/modprobe-114.sh, -files/161/shell-compat-KV.sh,
+  -files/modprobe-115.sh, -files/161/shell-compat-addon.sh,
+  -files/net-118-r1.sh, -files/161/udev.confd, -files/shell-compat-118-r2.sh,
+  -files/161/udev.initd, -files/udev-start-118-r2.sh,
+  -files/161/udev-dev-tarball.initd, -files/udev-stop-118-r2.sh,
+  -files/161/udev-mount.initd, -files/shell-compat-118-r3.sh,
+  -files/156/90-network.rules, -files/161/udev-postmount.initd,
+  -files/udev-start-122-r1.sh, -files/161/udev-start.sh,
+  -files/udev-122-rules-update.diff, -files/161/udev-stop.sh,
+  -files/udev-124-cdrom-autoclose-bug.diff, -files/156/shell-compat-KV.sh,
+  -files/164/40-gentoo.rules, -files/udev-124-encoding-overflow.patch,
+  -files/156/shell-compat-addon.sh, -files/164/90-network.rules,
+  -files/udev-124-netlink-owner-check.patch, -files/156/udev-dev-tarball.initd,
+  -files/164/shell-compat-KV.sh,
+  -files/udev-167-revert-disable-all-extras.patch, -files/156/udev-mount.initd,
+  -files/164/shell-compat-addon.sh, -files/udev-175-zlib.patch,
+  -files/164/udev.confd, -files/164/udev-dev-tarball.initd,
+  -udev-124-r1.ebuild, -files/164/udev.initd, -files/164/udev-mount.initd,
+  -udev-124-r2.ebuild, -files/164/udev-postmount.initd, -udev-114.ebuild,
+  -udev-141.ebuild, -files/164/udev-start.sh, -udev-115-r1.ebuild,
+  -udev-182-r2.ebuild, -files/164/udev-stop.sh, -udev-119.ebuild,
+  -udev-182-r3.ebuild, -files/udev.conf.post_113, -files/udev.conf.post_114,
+  -files/udev.confd, -files/udev.initd, -files/write_root_link_rule,
+  -udev-171-r5.ebuild:
+  old
+
+  30 Jul 2012; Mike Frysinger <vapier@gentoo.org> udev-186.ebuild:
+  Add m68k/s390 keywords #397769 by William Hubbs.
+
+  29 Jul 2012; William Hubbs <williamh@gentoo.org> udev-186.ebuild:
+  Fix the build when a cross emerge is used, thanks to Nick Bowler for the
+  patch. This closes bug #427142.
+
+  22 Jul 2012; Raúl Porcel <armin76@gentoo.org> udev-182-r2.ebuild,
+  udev-182-r3.ebuild, udev-186.ebuild:
+  Add ~alpha/~sh/~sparc wrt #397769
+
+  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> udev-171-r6.ebuild:
+  alpha/ia64/m68k/s390/sh/sparc stable wrt #416653
+
+  05 Jul 2012; William Hubbs <williamh@gentoo.org> udev-186.ebuild:
+  add back dependencies that were unintentionally removed for bug #424874,
+  thanks to Nikoli.
+
+*udev-186 (04 Jul 2012)
+
+  04 Jul 2012; William Hubbs <williamh@gentoo.org> +udev-186.ebuild:
+  version bump. I would like to thank Jonathan Callen for his assistance
+  with this ebuild.
+
+  03 Jul 2012; Jeroen Roovers <jer@gentoo.org> udev-171-r6.ebuild:
+  Stable for HPPA (bug #416653).
+
+  28 May 2012; Markus Meier <maekke@gentoo.org> udev-171-r6.ebuild:
+  arm stable, bug #416653
+
+  22 May 2012; Jeff Horelick <jdhore@gentoo.org> udev-171-r6.ebuild:
+  marked x86 per bug 416653
+
+  20 May 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r6.ebuild:
+  ppc/ppc64 stable wrt #416653
+
+  20 May 2012; Agostino Sarubbo <ago@gentoo.org> udev-171-r6.ebuild:
+  Stable for amd64, wrt bug #416653
+
+*udev-171-r6 (17 May 2012)
+
+  17 May 2012; Samuli Suominen <ssuominen@gentoo.org> +udev-171-r6.ebuild:
+  Remove USE="acl" and from USE="extras" since the functionality is moved to
+  >=sys-auth/consolekit-0.4.5_p20120320[acl].
+
+  16 May 2012; Samuli Suominen <ssuominen@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild:
+  Apply udev-164-remove-v4l1.patch to every old sys-fs/udev ebuild with
+  USE="extras" wrt #413055 by Andreis_Vinogradovs
+
+  04 May 2012; Jeff Horelick <jdhore@gentoo.org> udev-149.ebuild,
+  udev-151-r4.ebuild, udev-164-r2.ebuild, udev-171-r5.ebuild,
+  udev-182-r2.ebuild, udev-182-r3.ebuild, udev-9999.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  23 Apr 2012; Mike Frysinger <vapier@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild, udev-164-r2.ebuild, udev-171-r5.ebuild,
+  udev-182-r2.ebuild, udev-182-r3.ebuild, udev-9999.ebuild:
+  Do not depend on glibc -- block older versions only.
+
+  21 Apr 2012; Mike Frysinger <vapier@gentoo.org> udev-182-r3.ebuild:
+  Restore ~arch keywords #410401.
+
+  12 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild:
+  Try to support sys-apps/hwids also in 171-r5 for people who have temporarily
+  masked >= 180 wrt #411737 by Martin von Gagern
+
+  08 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+  Use sys-apps/hwids for -9999 too. See commit 01 Apr 2012 to udev-182-r3.
+
+  02 Apr 2012; Jeroen Roovers <jer@gentoo.org> udev-182-r3.ebuild:
+  Marked ~hppa (bug #410401).
+
+*udev-182-r3 (01 Apr 2012)
+
+  01 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> +udev-182-r3.ebuild:
+  Make use of the new hwids ebuild.
+
+  28 Mar 2012; Zac Medico <zmedico@gentoo.org> udev-182-r2.ebuild,
+  udev-9999.ebuild:
+  Block <udev-init-scripts-10 due to file collision with
+  /lib/udev/rules.d/40-gentoo.rules. Please ignore repoman dependency.unknown
+  warnings about the blocker which are produced by stable portage. The warnings
+  are disabled in latest protage (see bug #382407).
+
+  24 Mar 2012; William Hubbs <williamh@gentoo.org> -udev-182-r1.ebuild,
+  -udev-182.ebuild, udev-182-r2.ebuild, udev-9999.ebuild:
+  remove broken versions and sync live ebuild with latest udev 182 release
+
+*udev-182-r2 (24 Mar 2012)
+
+  24 Mar 2012; William Hubbs <williamh@gentoo.org> +udev-182-r2.ebuild:
+  revision bump for bug #409487
+
+*udev-182-r1 (23 Mar 2012)
+
+  23 Mar 2012; William Hubbs <williamh@gentoo.org> +udev-182-r1.ebuild:
+  revision bump for bug #409359
+
+  23 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Remove warnings about devfs-compatible rules from the live ebuild
+
+  23 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  Remove some cruft from the live ebuild: The fix_old_persistent_net_rules
+  function has been there since 2008 and is not documented. This code fixed an
+  issue with very old persistent net rules which should be taken care of by now
+  since we have had several stable udev versions with this fix. The ebuild
+  should not touch things in ${ROOT}/lib/udev/devices; remove the code that does
+  this. Remove the code that removes ${ROOT}/etc/dev.d.
+
+  22 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  re-order the econf options to match udev help.
+
+  22 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  quoting fixes, make all tests use [[ and use $D for $ED since we are not on
+  prefix
+
+  22 Mar 2012; William Hubbs <williamh@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  repoman fix -- drop the blocker for <sys-fs/udev-init-scripts-10 since that is
+  no longer in the tree
+
+  22 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  Move gtk-doc documentation to /usr/share/doc/${PF}/html with symlink(s) back
+  to /usr/share/gtk-doc/html wrt #312373
+
+  21 Mar 2012; Zac Medico <zmedico@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  Block <udev-init-scripts-10 due to file collision with
+  /lib/udev/rules.d/40-gentoo.rules.
+
+  20 Mar 2012; William Hubbs <williamh@gentoo.org> -udev-181.ebuild:
+  remove old version
+
+  20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  Support for USE="edd" functionality was removed by upstream, see NEWS:
+  /dev/disk/by-path/ links are no longer created for ATA devices behind
+  an 'ATA transport class', the logic to extract predictable numbers does
+  not exist in the kernel at this moment.
+  /dev/disk/by-id/scsi-* compatibility links are no longer created for
+  ATA devices, they have their own ata-* prefix.
+
+  20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  Fix path to README.keymap.txt wrt #408939 by "candrews"
+
+  20 Mar 2012; William Hubbs <williamh@gentoo.org> udev-182.ebuild,
+  udev-9999.ebuild:
+  Fix location of default rules file for bug #408937
+
+*udev-182 (19 Mar 2012)
+
+  19 Mar 2012; William Hubbs <williamh@gentoo.org> +udev-182.ebuild,
+  udev-181.ebuild, udev-9999.ebuild:
+  version bump, also closes bug #398049 and bug #408379
+
+  19 Mar 2012; William Hubbs <williamh@gentoo.org> +files/40-gentoo.rules,
+  metadata.xml, udev-9999.ebuild:
+  Add 40-gentoo.rules and the openrc use flag for bug #408379.
+
+  19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  Remove sys-apps/baselayout depend from here in favour of letting
+  sys-fs/udev-init-scripts handle it.
+
+  19 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  Revert making the CONFIG_DEVTMPFS check fatal. Checking for kernel config
+  options cannot be fatal because it breaks build hosts. See
+  https://bugs.gentoo.org/show_bug.cgi?id=103878#c29.
+
+  19 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  make check for CONFIG_DEVTMPFS critical. If this is not set, udev will not
+  run.
+
+  17 Mar 2012; Matt Turner <mattst88@gentoo.org> udev-181.ebuild:
+  Added ~mips, bug 397769.
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild,
+  udev-181.ebuild, udev-9999.ebuild:
+  Use correct HOMEPAGE wrt #402671 by Franz Siegfried Metz and Bruce Hill
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild,
+  udev-181.ebuild, udev-9999.ebuild:
+  Raise baselayout depend to >= 2 wrt #407849 by Michael Hill
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  Remove use_enable for hwdb which isn't available and use correct bash syntax
+  for += wrt #408287. Quote the result of $(systemd_with_unitdir). Remove
+  useless libtool files in favour of pkg-config files.
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild,
+  udev-181.ebuild, udev-9999.ebuild:
+  Stop forcing USE="-zlib" for sys-apps/pciutils as part of bug #360849
+
+  11 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  move CONFIG_CHECK variable into pkg_setup, thanks to anarchy@gentoo.org.
+
+  11 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  Add rdepends for dracut, genkernel and openrc so that separate /usr works
+  correctly.
+
+  08 Mar 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  live ebuild updates: remove acl support and remove support for arch-specific
+  rules since they have been removed upstream.
+
+  25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild:
+  ppc64 stable wrt #399717
+
+  19 Feb 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  update kmod dependencies to >=kmod-5
+
+  19 Feb 2012; William Hubbs <williamh@gentoo.org> -udev-175-r1.ebuild,
+  -udev-180.ebuild:
+  remove old masked versions
+
+  12 Feb 2012; Jeff Horelick <jdhore@gentoo.org> udev-171-r5.ebuild:
+  x86 stable per bug 399717
+
+  08 Feb 2012; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+  sync live ebuild
+
+*udev-181 (08 Feb 2012)
+
+  08 Feb 2012; William Hubbs <williamh@gentoo.org> +udev-181.ebuild:
+  version bump
+
+  07 Feb 2012; Jeroen Roovers <jer@gentoo.org> udev-171-r5.ebuild:
+  Stable for HPPA (bug #399717).
+
+  05 Feb 2012; William Hubbs <williamh@gentoo.org> udev-180.ebuild:
+  udev-180 only builds with kmod-4
+
+  05 Feb 2012; Markus Meier <maekke@gentoo.org> udev-171-r5.ebuild:
+  arm stable, bug #399717
+
+  04 Feb 2012; William Hubbs <williamh@gentoo.org> udev-180.ebuild,
+  udev-9999.ebuild:
+  add sys-apps/kmod to the dependencies for bug #402175
+
+*udev-180 (03 Feb 2012)
+
+  03 Feb 2012; William Hubbs <williamh@gentoo.org> +udev-180.ebuild,
+  udev-9999.ebuild:
+  udev 180 version bump. This version uses the split udev-init-scripts package
+  for bug #396181.
+
+  01 Feb 2012; Brent Baude <ranger@gentoo.org> udev-171-r5.ebuild:
+  Marking udev-171-r5 ppc for bug 399717
+
+  25 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> udev-146-r1.ebuild,
+  udev-149.ebuild, udev-151-r4.ebuild, udev-164-r2.ebuild:
+  Remove deprecated warning for HAL wrt #396015
+
+  23 Jan 2012; Agostino Sarubbo <ago@gentoo.org> udev-171-r5.ebuild:
+  Stable for amd64, wrt bug #399717
+
+  12 Jan 2012; William Hubbs <williamh@gentoo.org> files/udev-175-zlib.patch:
+  add back original patch for #397953.
+
+  04 Jan 2012; William Hubbs <williamh@gentoo.org> -files/udev-175-zlib.patch,
+  udev-175-r1.ebuild:
+  remove fix for bug #360849. This was rejected upstream; see the bug for more
+  information.
+
+  03 Jan 2012; William Hubbs <williamh@gentoo.org> udev-141-r1.ebuild,
+  udev-141.ebuild, udev-146-r1.ebuild, udev-149.ebuild, udev-151-r4.ebuild,
+  udev-164-r2.ebuild:
+  complete migration from git to git-2 e eclass.
+
+  02 Jan 2012; Mike Frysinger <vapier@gentoo.org> udev-175-r1.ebuild,
+  +files/udev-175-zlib.patch:
+  Support reading of compressed pci/usb databases #360849 by Samuli Suominen.
+
+  01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2009:
+  Split ChangeLog.
+
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 6615c338304e..17d7ceb2ad10 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -2,6 +2,7 @@ DIST aufs-sources-3.6.11.tar.xz 142476 SHA256 a758a7b81813c882bfb58fd08be35dd18a
 DIST aufs-sources-3.7.10.tar.xz 143020 SHA256 f2aa8921a5bf0687fd34b3f6a637b332e9909a2a918e8746a28c2261d49056bc SHA512 e9192be70856bdea46bb5257fe4d46d0d925e51286831bee212f059267458c6998304028c4ccd83edb3f88637f02f580d7e4c130de116859e2590431b0897d7a WHIRLPOOL 686ea9d6e66f1e426b4a65a50db8d6a87c8c9e48c8943bc716975ac25af9898d74181b3ff4f94d3de6f75907b7087678f2b6b9d4f88b9972badd8d08f277939a
 DIST aufs-sources-3.7.6.tar.xz 143064 SHA256 1360d182b163698725aa0d4cbc61f545ef7adff6fc72166a70232afe0b793da4 SHA512 e41c94e2beedf3d550628e3436cc53bb39ccb40b9ece8bcff107296bdfebfed1a6db419d1082863014a6385566104ea16e91e1df876e9e6c2938bb3fc31a011f WHIRLPOOL 38f5f2f0848bf60b940b0868ba7c887c8ab82a8a17aab07aef07b1e1a8308cc20a46d0f4b75d698fa35ee3d98388ee23648ba69db0f4e6cbdef1a49158136ae1
 DIST aufs-sources-3.8.2.tar.xz 143252 SHA256 f655e3dd7c2b43750153a71150abdb6610fde50ab218805bd55b9cfb1e5a30f5 SHA512 95bcfbb84c92181a64692a3202c88fa1f5a74a149f921455c75b4091900fcba8b95c2e77fbc910242c1102a1e3ad17c7df5da0e2c74ef1bf9a5ce92529d8b2bb WHIRLPOOL fe04a1ec53d46c18e07131007304c61605604a0db3d47a295a543ae1b695f5492ce5e4d43e556f7092d25e98058a38d04fd3479b8974c279c10e4726111fb699
+DIST aufs-sources-3.8_p20130318.tar.xz 143300 SHA256 1573e49b0055ceb78d862ee656b25f10469c2219897a2de6689850289e723e80 SHA512 a63f43dc49ea9ae2092171590041bd052ace8755b7b8fa40c825a9478a5b9ad01158205c2eacb81bb2281a8973ff5d44adfd2874bf18b38d19f13120d8a266ad WHIRLPOOL bb540029d2541f9c0215350073ec7e307297ce9a90493e6bbeb106e7eb61e05df35334bd640eb5d34c935daa277ac84145a537e76d1aa3fb8eba2b916d5a461e
 DIST deblob-3.6 108747 SHA256 93df902f141fe72e9fb15b9acde2b2cb35f4632844d9073a94f0e4f15a074cbc SHA512 399a878b7f30f98434d21b50e2f3055788be5305498758ea00d0bc7fe53a891848435933aad0a9c335a68da0d4ba8fdd9aa87c67252e3ebc43c6e2143c183c84 WHIRLPOOL cb15045b152cd9d44d2b92e2a0bff392d53f2d75d2fe0705962c84113ad4703ef7d14401c4534f7c2752a669140b498eea3a0a4c1afdbadc3b2bc498c631437f
 DIST deblob-3.7 112072 SHA256 8b341a3d8d07ce3a21889d6bde312d534fa97490eac549b04948fa52fabbe7ea SHA512 42ab77708b4f07037b7a161b83b1790fde26408e3459794d793ea91fec21227dc6dbc462d694a13f90630f567f4df6f08d60a6ff8294078426b877b4d8e7a3be WHIRLPOOL c9071fcef9f6143ee2a4d4648bdb92ab3c514f5731e096bde9db392abc8e3450711875d7018c99255869dc280ad1116f7e07f87e1fbde7656aaa39a0ad595b9c
 DIST deblob-3.8 113867 SHA256 883e8f003cabd9168659b4a6c2549bf22f64b8dc7ca9ff106335cfdff23b890c SHA512 acdaecb5a371489f8d0c2cea4776584eb4a76db0ea5dafc363881f2c5bbccd212d98429c2a559e697f0485329d51f1c01ba2f6c82ec703ad6bca9b8d9097a452 WHIRLPOOL 40c723ad41434aef0d30ee5e0ebcd5476778c70bf82043241522ea389a3d5a66a5cd0480722f019daf3eba97a0f30eade1741af0979be956644cfb3e24ee90bc
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild
index 4ebcccbae4fe..d313969782b6 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.8.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/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild,v 1.1 2013/03/10 11:01:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.8.2-r1.ebuild,v 1.2 2013/03/15 10:42:03 jlec Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ UNIPATCH_LIST="
 	"${WORKDIR}"/aufs3-kbuild.patch
 	"${WORKDIR}"/aufs3-base.patch"
 
-PDEPEND=">=sys-fs/aufs-util-3.8.0"
+PDEPEND=">=sys-fs/aufs-util-3.8"
 
 src_unpack() {
 	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.ebuild
new file mode 100644
index 000000000000..578162ee176c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.8.2-r2.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.2-r2.ebuild,v 1.1 2013/03/15 10:42:03 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="4"
+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/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index e8ac9f189fb2..dc0021a12f38 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -18,8 +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.68.xz 811844 SHA256 3051412a842152af6cfce71c3c35fc2a522014c6d2eda583dd2e1bab42fb4424 SHA512 9e32108223f902b503ead263fbb0f1a28d2d0ba36dae5af48b61136fd4d313bee4c5ed5e001b34ee0c1fd42411dd82f40d1122cd07ceadd21f2db2e31cfe7fb2 WHIRLPOOL d51cd2d7f2df865f0fdc604d4d61369381364d5c86a32b6a2507180d15b1d481e0350f0a27918653b2e7c2ecbc4f07e2404c754ed428d0685a739ddcfef77c87
+DIST patch-3.0.69.xz 814784 SHA256 c09ab9b9a1b5de6f070cffe39b23d96b34d9dc4d0753b308eb6baf7601f342a7 SHA512 d5bd1ca85051953da9afd1a632c67adeaa2161ca3231ab815b742cd4024f0d709e2dac85a1396960cf488753d69433b236fe49dc254ddb04fc893dfcc17cbfc7 WHIRLPOOL 0644b8a6aa568374f2f45f9d6cd272aa72bdfba8aecec704261c80f4e166adda6d0e2eea996d250d6aa0212cb0dfd31f075fa14abb422278abba34913fc92198
 DIST patch-3.2.40.xz 796532 SHA256 0a246f95049ac45d91416ee978085a3afbed9dd824074bb3dc84ff2574330f4c SHA512 1a88040649bbfe2cdc23d19f1c9982d5fd46a55c66cb3bfc5f4c76582cfdab4512fdc639342acd6fd255cc6ef531fa4532a2089fe772089ea2242a3731f1accc WHIRLPOOL 78282e8b7d569d2f13d8192ce8c43e9f175f09073c506761e74cf6d272c26b87a39e5fbfc76290bca3b0c44c5aec5aeb627c7f607cec18a35b71d7d0ff074da0
 DIST patch-3.4.35.xz 568060 SHA256 0c2c76d6d7fd444d02b90eef3b97c507908650e693e14a761ef9c19e65d1b1ad SHA512 3fdbc42417ba88635bf0e33fa9a9440c4803e892e92b627ebcc540533a7c1e42107cc27ff732dea7147c821405d0f54f9f26e9ba1709e37d015b6ea528302743 WHIRLPOOL f7b56f485135f830634874957d670304a8a66c119f3277bb73f52571a0f0b0d5b59e0b8606b3fa658e572de05280b2bae0a8126fbef44a4d822888eda7c94bca
+DIST patch-3.4.36.xz 575512 SHA256 0b4023d7bea8721e4a1e1e6139ace925a035ca12bf7c595f7e550063c9ed602c SHA512 34bdcdfb51a56f75c156439197608928d9ea3484ce58da2e8905d4eccc3c5af9b5a88d76adb4a4c0192c5372a00b8aca5b9c3de80205fffdc2b9f9c82a584987 WHIRLPOOL bd10aae4bd1b6d69cd4a2318657e5f572263939b8971cef0b72b748b7c08c91ae653c06fa3703bd793e49b730a83bdbae5a04856a3f554253208489d43f48fce
 DIST patch-3.7.10.xz 212936 SHA256 e5db8a0f0fb0a7ad466b4673489c1a438fe7e6482203e34702e7180d6e2e515a SHA512 939e3290a0e3bc19c519ca05181f673bffc745aa69456b51872c5ea718b64c250dac6926b07f1a195f87ee4aab67c01f7bc746d8bfb9201a983937c12c72823d WHIRLPOOL cdc62c7fe819328356678c85eb6939d1b6281f8b8ceb684e7c7794ea0215f6acfc31f34126f3333c1d7dd982faed5aeebd24d2a1efcd5b3dd99e86a6b281435e
 DIST patch-3.8.1.xz 55948 SHA256 4228a6e00561113c78aa99a71c952dfd2fc59ce10dcc6de4938a22490c4ca32f SHA512 254b640d14d60cc3368d81a4e9b692a0630856d21f16541ff574e2ceacbe9ef85e1544530d13d07228cf87fd5384741a7dda8cf4f585be7c03029734676884a5 WHIRLPOOL a7e9dba482d29a9b82610a5341a5a143503d385b3b222ab897e9f2cfc3d4f745c47a2ff3a09df3e4bbbd9fdab74463de2437b2a14ca006b5d68707b3442d5e9d
 DIST patch-3.8.2.xz 82128 SHA256 2bd1a39db4608a03250bfef11d3b7894ab1f0ebcb5316bafeeed23535822fd9c SHA512 752a122646261461da9238feeacc61ab787bea9999f066b056226387ce718da57592e536eb1c6aa28b949f0a7ad1fa97cc97204fdc3e8f3939d9b0d3b9517d03 WHIRLPOOL 7116ea73c7951a985129f177002cf8257e2f31eff717a2eb8dd084e3fe79c3ee2e06eb7b036a8f93ba56e16e74be8af0499887e8e80c2dac4404a4c69a862eff
+DIST patch-3.8.3.xz 114028 SHA256 02b70097dcfbce05ccbfbd5fae6449a811b26a776f89d3c2fdd155b7d086ea82 SHA512 14c4ffe8da8024ec77b16b21e959453c84b3693027a1746533c03dac74e4f8f8d1b385d9e697207cbb701a7a60aa1950d44e02dde9f3a964d4b49467cb07f0be WHIRLPOOL 5390f9f0e39ba14faaf77dc4e4aa1479626757d1b9efbfeec38c6be148b30bd19bb04143c7036e851f9532188ffdf3befde836ff6ee03d9830838201ffe32923
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.69.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.69.ebuild
new file mode 100644
index 000000000000..5f516f838932
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.0.69.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.69.ebuild,v 1.1 2013/03/14 20:04:02 mpagano 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.36.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.36.ebuild
new file mode 100644
index 000000000000..04a3a1f5c7e9
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.4.36.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.36.ebuild,v 1.1 2013/03/14 20:04:02 mpagano 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.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.8.3.ebuild
new file mode 100644
index 000000000000..e4492b76d9bc
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.8.3.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.3.ebuild,v 1.1 2013/03/14 20:04:02 mpagano 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/www-apps/389-dsgw/389-dsgw-1.1.6.ebuild b/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
similarity index 78%
rename from www-apps/389-dsgw/389-dsgw-1.1.6.ebuild
rename to www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
index b3d9c93cfa86..d113a4f14214 100644
--- a/www-apps/389-dsgw/389-dsgw-1.1.6.ebuild
+++ b/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
@@ -1,8 +1,8 @@
-# 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/www-apps/389-dsgw/389-dsgw-1.1.6.ebuild,v 1.1 2011/01/11 23:38:34 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild,v 1.1 2013/03/14 17:50:00 lxnay Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit autotools eutils
 
@@ -19,9 +19,9 @@ DEPEND="adminserver? ( net-nds/389-admin )
 	dev-libs/nspr
 	dev-libs/nss
 	dev-libs/cyrus-sasl
-	dev-libs/mozldap
 	dev-libs/icu
-	dev-libs/389-adminutil"
+	dev-libs/389-adminutil
+	net-nds/openldap"
 
 RDEPEND="${DEPEND}
 	dev-perl/perl-mozldap
@@ -36,7 +36,9 @@ src_prepare() {
 src_configure() {
 	econf $(use_enable debug) \
 		$(use_with adminserver) \
-		--with-fhs || die "econf failed"
+		--with-adminutil=/usr \
+		--with-fhs \
+		--with-openldap || die "econf failed"
 }
 
 src_install() {
diff --git a/www-apps/389-dsgw/389-dsgw-1.1.5.ebuild b/www-apps/389-dsgw/389-dsgw-1.1.5.ebuild
deleted file mode 100644
index d743f8a8a6de..000000000000
--- a/www-apps/389-dsgw/389-dsgw-1.1.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/389-dsgw-1.1.5.ebuild,v 1.2 2010/07/11 16:47:49 lxnay Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="389 Directory Server Gateway Web Application"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +adminserver"
-
-DEPEND="adminserver? ( net-nds/389-admin )
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/cyrus-sasl
-	dev-libs/mozldap
-	dev-libs/icu
-	dev-libs/389-adminutil"
-
-RDEPEND="${DEPEND}
-	dev-perl/perl-mozldap
-	virtual/perl-CGI"
-
-src_prepare() {
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with adminserver) \
-		--with-fhs || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/www-apps/389-dsgw/389-dsgw-1.1.7.ebuild b/www-apps/389-dsgw/389-dsgw-1.1.7.ebuild
deleted file mode 100644
index 583a90cb37e0..000000000000
--- a/www-apps/389-dsgw/389-dsgw-1.1.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/389-dsgw/389-dsgw-1.1.7.ebuild,v 1.1 2011/08/14 09:33:10 lxnay Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="389 Directory Server Gateway Web Application"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +adminserver"
-
-DEPEND="adminserver? ( net-nds/389-admin )
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/cyrus-sasl
-	dev-libs/mozldap
-	dev-libs/icu
-	dev-libs/389-adminutil"
-
-RDEPEND="${DEPEND}
-	dev-perl/perl-mozldap
-	virtual/perl-CGI"
-
-src_prepare() {
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with adminserver) \
-		--with-fhs || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/www-apps/389-dsgw/Manifest b/www-apps/389-dsgw/Manifest
index 62cd88f9f526..4c94ffd733f0 100644
--- a/www-apps/389-dsgw/Manifest
+++ b/www-apps/389-dsgw/Manifest
@@ -1,3 +1 @@
-DIST 389-dsgw-1.1.5.tar.bz2 748496 SHA256 318bb12e17e45abb4a3993c366526a2a6a26774a9668e5201752549727122ddc
-DIST 389-dsgw-1.1.6.tar.bz2 794686 SHA256 799a08d5dc2cd7e664c3ead7e3e99c84ddd007f9ab07ed7e05f2ca09c10992ba
-DIST 389-dsgw-1.1.7.tar.bz2 725917 SHA256 609706c59a5768a2fd96367668e77f66a994e877e668e4f1cccf0bfd64f1ca8b
+DIST 389-dsgw-1.1.10.tar.bz2 726295 SHA256 07aa0d9a432b8d9d63b2c64b7c17021b3fe2ac2ec62e4d596723253f3c0e4e3f SHA512 52c73867d6801c3f3bff424c9b302298e67f0b07bc5746f83aa83367b5fbff605ffcced968eaf6ab4863a17c703ec529644a4227aa2925aea65943a72ff4e2e8 WHIRLPOOL 34c7fcc8bce7f6bfcbb429b0bd26b1d8836cb8d94a4403e8be89ee9cbd3041f9f057fe1ecaf607e1630d1ae8fbc6018cfa9de794de83aa7890b4f18a158940a5
diff --git a/www-client/firefox/firefox-17.0.4.ebuild b/www-client/firefox/firefox-17.0.4.ebuild
index 3b3b99808a0b..2a3c0daabf6b 100644
--- a/www-client/firefox/firefox-17.0.4.ebuild
+++ b/www-client/firefox/firefox-17.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/www-client/firefox/firefox-17.0.4.ebuild,v 1.4 2013/03/14 07:16:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.4.ebuild,v 1.6 2013/03/14 15:12:34 ago Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -35,7 +35,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 9dbeaa0ebb71..bedcc2d18a11 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,5 @@
-DIST adobe-flash-10.3.183.67.i386.tar.gz 5464534 SHA256 59aa433851b3ab1f1ce4271874c02d4b9f17754f35b892f5ba49158762d18e43 SHA512 04f5831b2957524faf6b939f4502a6a3b4bd1af6cac3b8f080f3a1dc9966ff80c6b8e5a2a89dca97c269b3ca7d36dd4fe5565c44f447d7d7691d83b4e6d82957 WHIRLPOOL ba40b3a44dba32392deef114c6b03ed7a8514d325c4c5e6d0274460914c39cd931fa51b04448cff2147c55b919513ef80e85ca5d44e29bd5b359bf6d45ca2e0c
+DIST adobe-flash-10.3.183.68.i386.tar.gz 5466787 SHA256 8286af48046d566180b2dc79361e529ddfdd73d8634404337455138fbcbb651c SHA512 d8047f5ad78e5dbae6f5a9cf58be60526a56f461c9a7eeffba963b9c3e7b4753bca831cd6b59af80aec06525cef1ed44605e2143efc1a3928680bf1ce3fcea34 WHIRLPOOL 2f89df392fedf570d66ec337f8d42816840781f054b765a720784afdca2d511e677908c631ef387ea3d88176d3f19550708b77d7cb118c3d2ec2b192005d0687
 DIST adobe-flash-11.2.202.273.i386.tar.gz 6922290 SHA256 ad6e5e8ca4f76b834f86856252deacaf1bae7cb6b976181e3e05af77762761bd SHA512 5700e8de5296a2b75275b901e7ed81e26d1cdd56659d6961805ef1de8a270492a06ccc62a176d928f2d64506f585e2b8da29ed138307060d6c787b4ec0d238bc WHIRLPOOL f576f3a36fb3c9a4473d9fdb9c80eb7c5aa8286eca2e9aa5ce74c803ebfe382017aaa2e172713dcf39d7540c19f8346f850b111b5637818694aa22d74c18f945
 DIST adobe-flash-11.2.202.273.x86_64.tar.gz 7233885 SHA256 69af9941ae86f4022d5570fb652272be42e47e51b0636101d8fa9ff7beb62530 SHA512 1dcb245aa88b2ef083566bb823ad65bd3961a78b0d2b73744aa35ce39c7078eee1e7891ea3153c405a92605fa55b837cfb83938eaf2aae651442eb6bd8dc332e WHIRLPOOL bf5a43348c3505fc309516d2f650669acd0a17837e4d5f52b03983443a107e58143b4685e6f4037045d952c39d9e06eff79f6ceef1773e0a5c04c7691d6d20e9
+DIST adobe-flash-11.2.202.275.i386.tar.gz 6924007 SHA256 d58b597d69dcf1b61c062624f982cdb035631ed37d0bbda4f8fe8bdd6712b1ef SHA512 aa92f8b9ec9164e82ca30e23035109bc8b5231d771ce12b49266d26e3cc2152132dfbddfebd6a78a06be70f8cde972c6528a55ff4a1f27b6752d9637a20be901 WHIRLPOOL 19684d7a3edcaf7c507cc709cfc03f315c26a2af7e9b6ecfb0d351a1318f107a178b4a62fd4bdd50fd393779b77997ba136b9834597105fded378f02e6b543fc
+DIST adobe-flash-11.2.202.275.x86_64.tar.gz 7234388 SHA256 13ba2dba78027ad73c9ab300afff3e47ce8ceb0e9a1541f5b2d7517e57a77c5c SHA512 afca7cde79bada81c9c3dbc24f0c4b03773a3549e349af7d01854190b729f45400ec78bc56d50f6b36c86a2336a7d6ccf39779b687b5e83245b3cfe00164b24a WHIRLPOOL b53ee914e434ace878313c2a4d7cdb5ca1fa9235f6ae8c9c6760becf13ea996614fd709c51a2b9dd00c6e16c8eedf780067eb4bfd0721fd34f3135df8c89c9ec
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.68.ebuild
similarity index 98%
rename from www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild
rename to www-plugins/adobe-flash/adobe-flash-10.3.183.68.ebuild
index 81e85328624c..118d596af6e9 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.68.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-plugins/adobe-flash/adobe-flash-10.3.183.67.ebuild,v 1.1 2013/02/27 05:09:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.68.ebuild,v 1.1 2013/03/14 15:37:42 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild
new file mode 100644
index 000000000000..63d7ea0df1a6
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.275.ebuild,v 1.3 2013/03/15 11:57:03 ago Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+IUSE="multilib -32bit +64bit selinux vdpau kde +sse2check"
+SLOT="0"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+	selinux? ( sec-policy/selinux-flash )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_pretend() {
+	if any_cpu_missing_flag 'sse2'; then
+		eerror "This version of adobe-flash requires a CPU that supports the"
+		eerror "SSE2 instruction set, and at least one of your CPUs does not"
+		eerror "support this feature."
+		eerror ""
+		if use sse2check; then
+			eerror "You should mask this version and use adobe-flash-10.3.* instead."
+			eerror "To do so, add the following line to your package.mask file:"
+			eerror "  =${CATEGORY}/${P}"
+			eerror ""
+			eerror "Or if you are trying to build a binary package for another host"
+			eerror "that does support SSE2 instructions, you may override this"
+			eerror "check by setting USE=\"-sse2check\""
+			eerror ""
+			die "${P} requires CPU with SSE2"
+		else
+			eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
+			eerror "will not function unless all of the CPUs on the system where it"
+			eerror "is installed support the SSE2 instruction set."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if use multilib && use 32bit; then
+			export amd64_32bit=1
+		else
+			unset amd64_32bit
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		unset need_lahf_wrapper
+		if [[ $native_install ]]; then
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			if any_cpu_missing_flag 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			unpack $my_64b_src
+		fi
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_src_unpack
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		if use x86; then
+			local PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		dosym /${BASE}/bin/flash-player-properties \
+			usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+		doins usr/share/applications/flash-player-properties.desktop
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		if [[ $need_lahf_wrapper ]]; then
+			ewarn "Your processor does not support the 'lahf' instruction which is used"
+			ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
+			ewarn "should allow this plugin to run.  If you encounter problems, please"
+			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+			ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
+			elog
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index a3542ce65d76..2c7935d866c2 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1,2 @@
-DIST varnish-2.0.4.tar.gz 786945 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
+DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243 SHA512 a0942ff5dbdabac55f94240077d61905bc7ad4dff4ae9af80c937458554e7530d008f30e26a3f8533a38d927b8734da9a7e313977a2828c9f67e8ca1af16edfd WHIRLPOOL 20e8812336344a5c140382b4c24a04501cb7a11525e0cda71c6755c2a6d6f8c7e727a52fdd44e5066c9563f2196363864343e10b2a921673d802aa396a237562
 DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
diff --git a/www-servers/varnish/files/varnish-2.0.4-link-order.patch b/www-servers/varnish/files/varnish-2.0.4-link-order.patch
deleted file mode 100644
index e3eca384b5b0..000000000000
--- a/www-servers/varnish/files/varnish-2.0.4-link-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-patch by bangert to fix build with --as-needed.
-sent upstream at http://varnish.projects.linpro.no/ticket/486
-
-diff -Naur varnish-2.0.4/lib/libvarnish/Makefile.am varnish-2.0.4.new/lib/libvarnish/Makefile.am
---- varnish-2.0.4/lib/libvarnish/Makefile.am	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4.new/lib/libvarnish/Makefile.am	2009-04-07 21:55:06.000000000 +0200
-@@ -29,7 +29,7 @@
- 	vss.c \
- 	vtmpfile.c
- 
--libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
-+libvarnish_la_LIBADD = $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la ${RT_LIBS} ${NET_LIBS} ${LIBM}
- 
- 
- if ENABLE_TESTS
-diff -Naur varnish-2.0.4/lib/Makefile.am varnish-2.0.4.new/lib/Makefile.am
---- varnish-2.0.4/lib/Makefile.am	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4.new/lib/Makefile.am	2009-04-07 21:57:40.000000000 +0200
-@@ -1,15 +1,15 @@
- # $Id: varnish-2.0.4-link-order.patch,v 1.1 2009/04/13 09:54:47 bangert Exp $
- 
- SUBDIRS = \
-+	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
--	libvarnishcompat \
- 	libvcl \
- 	@JEMALLOC_SUBDIR@
- 
- DIST_SUBDIRS = 	\
-+	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
--	libvarnishcompat \
- 	libvcl \
- 	libjemalloc
diff --git a/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
deleted file mode 100644
index 7626bcad9ded..000000000000
--- a/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -NurpP varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.0.4/bin/varnishncsa/varnishncsa.c
---- varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c	2009-04-01 15:35:14.000000000 +0200
-+++ varnish-2.0.4/bin/varnishncsa/varnishncsa.c	2009-06-11 11:45:44.084537099 +0200
-@@ -102,6 +102,7 @@ static struct logline {
- 
- static size_t nll;
- static int prefer_x_forwarded_for = 0;
-+static int virtual_host_style_logging = 0;
- 
- static int
- isprefix(const char *str, const char *prefix, const char *end,
-@@ -399,6 +400,11 @@ h_ncsa(void *priv, enum shmlogtag tag, u
- 	if (!lp->bogus) {
- 		fo = priv;
- 
-+		/* the -v option */
-+		if (virtual_host_style_logging) {
-+			fprintf(fo, "%s ", lp->df_Host);
-+		}
-+
- 		/* %h */
- 		if (!lp->df_h && spec & VSL_S_BACKEND)
- 			fprintf(fo, "127.0.0.1 ");
-@@ -438,7 +444,7 @@ h_ncsa(void *priv, enum shmlogtag tag, u
- 		 * normalized the request URL.
- 		 */
- 		fprintf(fo, "\"%s ", lp->df_m);
--		if (lp->df_Host) {
-+		if (!virtual_host_style_logging && lp->df_Host) {
- 			if (strncmp(lp->df_Host, "http://", 7) != 0)
- 				fprintf(fo, "http://");
- 			fprintf(fo, "%s", lp->df_Host);
-@@ -512,7 +518,7 @@ usage(void)
- {
- 
- 	fprintf(stderr,
--	    "usage: varnishncsa %s [-aDV] [-n varnish_name] "
-+	    "usage: varnishncsa %s [-avDV] [-n varnish_name] "
- 	    "[-P file] [-w file]\n", VSL_USAGE);
- 	exit(1);
- }
-@@ -531,11 +537,14 @@ main(int argc, char *argv[])
- 
- 	vd = VSL_New();
- 
--	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
-+	while ((c = getopt(argc, argv, VSL_ARGS "avDn:P:Vw:f")) != -1) {
- 		switch (c) {
- 		case 'a':
- 			a_flag = 1;
- 			break;
-+		case 'v':
-+			virtual_host_style_logging = 1;
-+			break;
- 		case 'f':
- 			prefer_x_forwarded_for = 1;
- 			break;
diff --git a/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch b/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
deleted file mode 100644
index 190432f68065..000000000000
--- a/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur varnish-2.1.4.orig/configure.ac varnish-2.1.4/configure.ac
---- varnish-2.1.4.orig/configure.ac	2010-10-21 17:45:41.000000000 +0200
-+++ varnish-2.1.4/configure.ac	2010-10-21 23:05:35.000000000 +0200
-@@ -30,7 +30,7 @@
-    AC_MSG_WARN([xsltproc not found – not building documentation])
- fi
- AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
--AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
-+AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
- if test "x$RST2MAN" = "xno"; then
-    AC_MSG_WARN([rst2man not found – not building man pages])
- fi
diff --git a/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
deleted file mode 100644
index 4c5bb25b1f4b..000000000000
--- a/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.1.4/bin/varnishncsa/varnishncsa.c
---- varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c	2010-10-21 17:45:41.000000000 +0200
-+++ varnish-2.1.4/bin/varnishncsa/varnishncsa.c	2010-10-21 22:42:50.000000000 +0200
-@@ -102,6 +102,7 @@
- 
- static size_t nll;
- static int prefer_x_forwarded_for = 0;
-+static int virtual_host_style_logging = 0;
- 
- static int
- isprefix(const char *str, const char *prefix, const char *end,
-@@ -469,6 +470,11 @@
- 
- 	fo = priv;
- 
-+	/* the -v option */
-+	if (virtual_host_style_logging) {
-+		fprintf(fo, "%s ", lp->df_Host);
-+	}
-+
- 	/* %h */
- 	if (!lp->df_h && spec & VSL_S_BACKEND)
- 		fprintf(fo, "127.0.0.1 ");
-@@ -508,7 +514,7 @@
- 	 * normalized the request URL.
- 	 */
- 	fprintf(fo, "\"%s ", lp->df_m);
--	if (lp->df_Host) {
-+	if (!virtual_host_style_logging && lp->df_Host) {
- 		if (strncmp(lp->df_Host, "http://", 7) != 0)
- 			fprintf(fo, "http://");
- 		fprintf(fo, "%s", lp->df_Host);
-@@ -568,7 +574,7 @@
- {
- 
- 	fprintf(stderr,
--	    "usage: varnishncsa %s [-aDV] [-n varnish_name] "
-+	    "usage: varnishncsa %s [-avDV] [-n varnish_name] "
- 	    "[-P file] [-w file]\n", VSL_USAGE);
- 	exit(1);
- }
-@@ -587,11 +593,14 @@
- 
- 	vd = VSL_New();
- 
--	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
-+	while ((c = getopt(argc, argv, VSL_ARGS "avDn:P:Vw:f")) != -1) {
- 		switch (c) {
- 		case 'a':
- 			a_flag = 1;
- 			break;
-+		case 'v':
-+			virtual_host_style_logging = 1;
-+			break;
- 		case 'f':
- 			prefer_x_forwarded_for = 1;
- 			break;
diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
index b492e3c080b6..70ca9f8cb2ee 100644
--- a/www-servers/varnish/files/varnish-3.0.3-automagic.patch
+++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
@@ -1,6 +1,6 @@
-diff -Naur varnish-3.0.3.orig//configure.ac varnish-3.0.3/configure.ac
---- varnish-3.0.3.orig//configure.ac	2012-08-20 05:20:40.000000000 -0400
-+++ varnish-3.0.3/configure.ac	2012-08-23 15:58:15.000000000 -0400
+diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac
+--- varnish-3.0.3.orig/configure.ac	2012-08-20 05:20:40.000000000 -0400
++++ varnish-3.0.3/configure.ac	2013-03-14 10:57:55.000000000 -0400
 @@ -87,15 +87,20 @@
  
  save_LIBS="${LIBS}"
@@ -56,3 +56,64 @@ diff -Naur varnish-3.0.3.orig//configure.ac varnish-3.0.3/configure.ac
  
  # Checks for header files.
  AC_HEADER_STDC
+@@ -271,7 +272,6 @@
+ CFLAGS="${save_CFLAGS}" 
+ 
+ # Use jemalloc on Linux
+-JEMALLOC_SUBDIR=
+ JEMALLOC_LDADD=
+ AC_ARG_WITH([jemalloc],
+             [AS_HELP_STRING([--with-jemalloc],
+@@ -279,18 +279,11 @@
+             [],
+             [with_jemalloc=check])
+ 
+-case $target in
+-    *-*-linux*)
+-        if test "x$with_jemalloc" != xno; then
+-            AC_CHECK_LIB([jemalloc], [malloc_conf],
+-                  [JEMALLOC_LDADD="-ljemalloc"],
+-                  [AC_MSG_NOTICE([No system jemalloc found, using bundled version])
+-                   JEMALLOC_SUBDIR=libjemalloc
+-                   JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la'])
+-	fi
+-	;;
+-esac
+-AC_SUBST(JEMALLOC_SUBDIR)
++if test "x$with_jemalloc" != xno; then
++      AC_CHECK_LIB([jemalloc], [jmalloc_conf],
++            [JEMALLOC_LDADD="-ljemalloc"],
++            [AC_MSG_ERROR([No system jemalloc found])])
++fi
+ AC_SUBST(JEMALLOC_LDADD)
+ 
+ # Userland slab allocator, available only on Solaris
+@@ -582,7 +575,6 @@
+     lib/libvcl/Makefile
+     lib/libvgz/Makefile
+     lib/libvmod_std/Makefile
+-    lib/libjemalloc/Makefile
+     man/Makefile
+     redhat/Makefile
+     varnishapi.pc
+diff -Naur varnish-3.0.3.orig/lib/Makefile.am varnish-3.0.3/lib/Makefile.am
+--- varnish-3.0.3.orig/lib/Makefile.am	2012-08-20 05:20:40.000000000 -0400
++++ varnish-3.0.3/lib/Makefile.am	2013-03-14 10:58:39.000000000 -0400
+@@ -6,14 +6,12 @@
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	@JEMALLOC_SUBDIR@
++	libvmod_std
+ 
+-DIST_SUBDIRS = 	\
++DIST_SUBDIRS = \
+ 	libvarnishcompat \
+ 	libvarnish \
+ 	libvarnishapi \
+ 	libvcl \
+ 	libvgz \
+-	libvmod_std \
+-	libjemalloc
++	libvmod_std
diff --git a/www-servers/varnish/files/varnishd.confd b/www-servers/varnish/files/varnishd.confd
index c2eb140db768..a0d49ac5b366 100644
--- a/www-servers/varnish/files/varnishd.confd
+++ b/www-servers/varnish/files/varnishd.confd
@@ -7,3 +7,8 @@ VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"
 # arguments passed to varnishncsa
 # please see the varnishncsa man page for more options
 VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"
+
+# We need to increase the number of open files (-n)
+# and the maximum amount off locked memory (-l)
+# See bug #459142
+rc_ulimit="-n 32786 -l 82000"
diff --git a/www-servers/varnish/files/varnishd.initd b/www-servers/varnish/files/varnishd.initd
index f65cce7122f8..33f5d74b75bf 100755
--- a/www-servers/varnish/files/varnishd.initd
+++ b/www-servers/varnish/files/varnishd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.7 2009/08/30 06:28:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.8 2013/03/14 12:18:17 blueness Exp $
 
 depend() {
 	need net
@@ -9,8 +9,6 @@ depend() {
 
 start() {
 	ebegin "Starting varnish"
-	#allow varnishd to lock logfile to memory
-	ulimit -l 82000
 	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/varnishd -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
 	eend $?
 
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 8e1583de7e20..dbe2f20cdba1 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 	<use>
 		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
 	</use>
 	<longdescription lang="en">
 	Varnish is an HTTP accelerator. An HTTP accelerator (often called Reverse Proxy)
diff --git a/www-servers/varnish/varnish-2.0.4-r1.ebuild b/www-servers/varnish/varnish-2.0.4-r1.ebuild
deleted file mode 100644
index d7d9eec65277..000000000000
--- a/www-servers/varnish/varnish-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.7 2012/07/11 23:27:45 blueness Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
-HOMEPAGE="http://varnish.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-#varnish compiles stuff at run time
-RDEPEND="sys-devel/gcc"
-
-RESTRICT="test" #315725
-HTTP_HDR_MAX_VAL=${HTTP_HDR_MAX_VAL:-32}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-link-order.patch
-	epatch "${FILESDIR}"/${P}-virtual-ncsa.patch
-	sed -e "s/#define HTTP_HDR_MAX_VAL .*/#define HTTP_HDR_MAX_VAL ${HTTP_HDR_MAX_VAL}/" \
-		-i bin/varnishd/cache.h
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
-	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-	echo
-}
diff --git a/www-servers/varnish/varnish-3.0.3.ebuild b/www-servers/varnish/varnish-3.0.3-r1.ebuild
similarity index 77%
rename from www-servers/varnish/varnish-3.0.3.ebuild
rename to www-servers/varnish/varnish-3.0.3-r1.ebuild
index 59861be943fb..3b9536163827 100644
--- a/www-servers/varnish/varnish-3.0.3.ebuild
+++ b/www-servers/varnish/varnish-3.0.3-r1.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/www-servers/varnish/varnish-3.0.3.ebuild,v 1.2 2012/11/22 20:54:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.3-r1.ebuild,v 1.1 2013/03/14 15:49:37 blueness Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools-utils eutils
 
@@ -13,15 +13,21 @@ SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="doc libedit static-libs +tools"
+IUSE="doc jemalloc libedit static-libs +tools"
 
-CDEPEND="dev-libs/libpcre
+CDEPEND="
+	dev-libs/libpcre
+	jemalloc? ( dev-libs/jemalloc )
 	libedit? ( dev-libs/libedit )
 	tools? ( sys-libs/ncurses )"
+
 #varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	sys-devel/gcc"
-DEPEND="${CDEPEND}
+
+DEPEND="
+	${CDEPEND}
 	dev-python/docutils
 	virtual/pkgconfig"
 
@@ -34,13 +40,19 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
 )
 
+AUTOTOOLS_AUTORECONF="yes"
+
 src_prepare() {
+	# Remove bundled libjemalloc. We also fix
+	# automagic dep in our patches, bug #461638
+	rm -rf lib/libjemalloc
+
 	autotools-utils_src_prepare
-	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		$(use_with jemalloc)
 		$(use_with libedit)
 		$(use_with tools)
 	)
diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia
deleted file mode 100644
index 1fcbef41fc7c..000000000000
--- a/x11-drivers/nvidia-drivers/files/09nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has to precede X11's own libraries!
-LDPATH=/opt/nvidia/lib
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c0785c..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop b/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
deleted file mode 100644
index f6d05644e4d7..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=sh -c "/opt/bin/nvidia-settings --load-config-only"
-Terminal=false
-Icon=nvidia-settings
-Categories=System;Settings;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff b/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
deleted file mode 100644
index 9cfde6a3b440..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur kernel/nv.h kernel/nv.h
---- kernel/nv.h	2012-08-02 18:19:37.000000000 -0700
-+++ kernel/nv.h 2012-08-02 18:19:37.000000000 -0700
-@@ -448,7 +448,20 @@
- 
- #define IS_BLACKLISTED_REG_OFFSET(nv, offset, length)                          \
-              ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\
--             (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x84000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x85000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x86000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x87000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x89000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0xa0000, 0x20000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x104000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x105000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x10a000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c2000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c3000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x618000, 0x2000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x627000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
- 
- /* duplicated from nvos.h for external builds */
- #ifndef NVOS_AGP_CONFIG_DISABLE_AGP
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
deleted file mode 100644
index 75daad33ec6a..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh	
-+++ usr/src/nv/conftest.sh	2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,14 @@
-     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
-     # the kernel as a stand-alone kernel.
-     #
--    FILE="linux/autoconf.h"
-+    FILE="generated/autoconf.h"
- 
-     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-         #
-         # We are looking at a configured source tree; verify
-         # that it's not a Xen kernel.
-         #
--        echo "#include <linux/autoconf.h>
-+        echo "#include <generated/autoconf.h>
-         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
-         #error CONFIG_XEN defined!
-         #endif
-@@ -111,7 +111,12 @@
-     fi
- }
- 
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+    #include <generated/autoconf.h>
-+    #else
-+    #include <linux/autoconf.h>
-+    #endif
-     #if defined(CONFIG_XEN) && \
-         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
-     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
-                 echo "";
-             fi
-         fi
--        exit $RET
-+#        exit $RET
-     ;;
- 
-     get_uname)
-@@ -1316,11 +1321,11 @@
-             # tree or at headers shipped for a specific kernel.
-             # Determine the kernel version using a compile check.
-             #
--            FILE="linux/utsrelease.h"
-+            FILE="generated/utsrelease.h"
- 
-             if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-                 echo "$CONFTEST_PREAMBLE
--                #include <linux/utsrelease.h>
-+                #include <generated/utsrelease.h>
-                 int main() {
-                     printf(\"%s\", UTS_RELEASE);
-                     return 0;
-@@ -1375,7 +1380,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-@@ -1429,7 +1434,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c	
-+++ usr/src/nv/nvacpi.c	2010-01-06 12:10:56.000000000 +0530
-@@ -49,6 +49,10 @@
- };
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle  = NULL;
-
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild
index 5de5c86f058e..0c855cd3b71c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.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/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild,v 1.3 2013/03/07 16:14:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild,v 1.4 2013/03/14 12:50:41 pinkbyte Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKA
 
 LICENSE="GPL-2 NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-310.40.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-310.40.ebuild
index ba65c95d82be..0582ba792b43 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-310.40.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-310.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/x11-drivers/nvidia-drivers/nvidia-drivers-310.40.ebuild,v 1.1 2013/03/09 16:10:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.40.ebuild,v 1.2 2013/03/14 12:50:41 pinkbyte Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKA
 
 LICENSE="GPL-2 NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.ebuild
index bf20fbc2ebda..3700dda9f3ee 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.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/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.ebuild,v 1.3 2013/03/07 16:14:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.26.ebuild,v 1.4 2013/03/14 12:50:41 pinkbyte Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKA
 
 LICENSE="GPL-2 NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
diff --git a/x11-misc/i3status/i3status-2.6.ebuild b/x11-misc/i3status/i3status-2.6.ebuild
index 425e920daa27..ac924e26260e 100644
--- a/x11-misc/i3status/i3status-2.6.ebuild
+++ b/x11-misc/i3status/i3status-2.6.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/x11-misc/i3status/i3status-2.6.ebuild,v 1.4 2013/01/27 18:31:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.6.ebuild,v 1.5 2013/03/14 20:03:21 xarthisius Exp $
 
 EAPI=4
 
@@ -32,6 +32,9 @@ src_prepare() {
 
 pkg_postinst() {
 	fcaps cap_net_admin usr/bin/${PN}
-	elog "You need to install x11-misc/xmobar or x11-misc/dzen to use ${PN}."
-	elog "Please refer to manual: man ${PN}"
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
 }
diff --git a/x11-misc/i3status/i3status-2.7.ebuild b/x11-misc/i3status/i3status-2.7.ebuild
index 4e90a6e0def6..216eeab23638 100644
--- a/x11-misc/i3status/i3status-2.7.ebuild
+++ b/x11-misc/i3status/i3status-2.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/x11-misc/i3status/i3status-2.7.ebuild,v 1.1 2013/02/27 10:56:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.7.ebuild,v 1.2 2013/03/14 20:03:21 xarthisius Exp $
 
 EAPI=5
 
@@ -32,6 +32,9 @@ src_compile() {
 
 pkg_postinst() {
 	fcaps cap_net_admin usr/bin/${PN}
-	elog "You need to install x11-misc/xmobar or x11-misc/dzen to use ${PN}."
-	elog "Please refer to manual: man ${PN}"
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
 }
diff --git a/x11-misc/magneto-gtk/Manifest b/x11-misc/magneto-gtk/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/x11-misc/magneto-gtk/Manifest
+++ b/x11-misc/magneto-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/x11-misc/magneto-gtk/magneto-gtk-183.ebuild b/x11-misc/magneto-gtk/magneto-gtk-183.ebuild
new file mode 100644
index 000000000000..0e61ae0b93b1
--- /dev/null
+++ b/x11-misc/magneto-gtk/magneto-gtk-183.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/magneto-gtk/magneto-gtk-183.ebuild,v 1.1 2013/03/14 18:27:39 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+DESCRIPTION="Entropy Package Manager notification applet GTK2 frontend"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+RDEPEND="~app-misc/magneto-loader-${PV}
+	dev-python/notify-python
+	dev-python/pygtk:2
+"
+DEPEND=""
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/entropy/magneto/magneto/gtk"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/magneto/magneto/gtk"
+}
diff --git a/x11-misc/magneto-gtk3/Manifest b/x11-misc/magneto-gtk3/Manifest
index 83dc7c948187..09bbd0619e62 100644
--- a/x11-misc/magneto-gtk3/Manifest
+++ b/x11-misc/magneto-gtk3/Manifest
@@ -1,2 +1,3 @@
 DIST entropy-136.tar.bz2 1612759 SHA256 4384b251f259c868f8ee3480701beecb466ca8c5727915e6b437291d03f4c63b SHA512 3b2725de557efa76ee65f368f486ab952f49a63474b5226e7b9ce137bee1c9c1ef73074c4d255e3d8695666556923d827c9cb1e232b307c4893d76e6cc6fb948 WHIRLPOOL 222d2c292c4a7c0d465be31898c4b2bf1469b7c769b4099106ded24334f4d16dde1f95ea532cbb2a167e2b7fcc30e6f59974839c3a8019c02c962fc634556e1b
 DIST entropy-144.tar.bz2 1616075 SHA256 173825d13f4b5c5aecf4d82b4e593921baf2209496be56190babbb142ad9b75d SHA512 30ca32fdf0747530c656ec9c96aed5dad00e8fb4181bd4c2e4a4aed3c5b06427e5b07baa41db13ff03d6730f13607e86f557aad84cb6e85af5d9c49029a911c7 WHIRLPOOL a14b76a2c247e2d4db12e2c78735c64ca183a474758f8b8ab9748cd93378300cd737377888beb03cc64e0ddeff0cb201fd790489ddfee48b8cf82032429509ac
+DIST entropy-183.tar.bz2 1685003 SHA256 5b2d99ef61a68497c228c392d607faa7fef9b5debe7628f381e4facbef290f38 SHA512 95b83797fc519c5cfd12a985ee3221ffe83fe19289681ca1b0f022a7b9491bdf9b74a06fe4f010536a22db78bac4f3325fc5eab0c11243240fdee5789690e2aa WHIRLPOOL bbd6c44e5bce24e602f89075e126b5e914900aad8bd3b1ff301c733d8838f4cd1aac279a707f81c0873c24259078e5fdc9dacbf1f30d0fd5eef3aa9f9376f7c5
diff --git a/x11-misc/magneto-gtk3/magneto-gtk3-183.ebuild b/x11-misc/magneto-gtk3/magneto-gtk3-183.ebuild
new file mode 100644
index 000000000000..3fd1204d8acf
--- /dev/null
+++ b/x11-misc/magneto-gtk3/magneto-gtk3-183.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/x11-misc/magneto-gtk3/magneto-gtk3-183.ebuild,v 1.1 2013/03/14 18:28:13 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+DESCRIPTION="Entropy Package Manager notification applet GTK3 frontend"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+RDEPEND="~app-misc/magneto-loader-${PV}
+	dev-libs/gobject-introspection
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+"
+DEPEND=""
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk3-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/lib/entropy/magneto/magneto/gtk3"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/lib/entropy/magneto/magneto/gtk3"
+}