Sync with portage [Tue Mar 5 11:57:28 MSK 2013].

2013-03-05 11:57:30 +04:00 · 2013-03-05 11:57:30 +04:00 · 280b6dc453
commit 280b6dc453
parent 2a16427083
805 changed files with 6223 additions and 2215 deletions
--- a/app-cdr/backlite/backlite-1.0.3-r1.ebuild
+++ b/app-cdr/backlite/backlite-1.0.3-r1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.5 2013/03/02 19:12:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.6 2013/03/04 19:01:05 billie Exp $

-EAPI=4
+EAPI=5

 inherit qt4-r2 eutils

--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@ -1,3 +1,2 @@
 DIST cdrtools-3.00.tar.bz2 1978563 SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d SHA512 93887afd6c244814b7f6a623f0ac5b551934626163065a6f32aefe82aa7438450fd7a42737ef3cdaad3f18841c066d25e72e37891531dd0be5be328692712cec WHIRLPOOL a02750131e4ec55df10387a01dab3881afee669cd8b8ea65eaed4fdd82e6bd11040c6d79fc64ccc9377e787f5903ec92ea3ae81db1945554b65a8636737cc931
-DIST cdrtools-3.01a12.tar.bz2 2050364 SHA256 6b2bc91b4dd3bb5dc0ff10a3a858f68edff5a230500f40496ffbce406e7dfff8 SHA512 7906521fc94d8488cf3b2c476e4603106f9c6d4af120ced4f409beecf6bd1bf0b1e6b45685672f481ac4de9eb9ea58a579ef0296b86346d974809a90d2129730 WHIRLPOOL a0d41a2fc55c6d383ed9373a0426155a889fbc28f5658d43004fd437555b4f65e87aada4b21a588aea785ec689842ac7d94a459d87f8075e558a7fcc2ddce3a9
 DIST cdrtools-3.01a13.tar.bz2 2053012 SHA256 43d0a271f398851b1692b0a3f481c7238649090b4497752024a6d090816e09f5 SHA512 f5a33375be0002f6ec8d5fc77af8a1e5de65b67218139cd1064dbf2c7a8b3d0d0012c5e062e9976581b4684946a08ee0d4d980e83a38eadb8992003b7f343892 WHIRLPOOL 5ea0f786d839c7050b1820252ca8f638c65d322e35a04765dabb91c0a395de879f2fab1f60e0c7a1568eb5b8a63b7b890525333f17448fa428ad0f5f7bcc7e40
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha12.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha12.ebuild
@ -1,145 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha12.ebuild,v 1.1 2013/02/14 19:02:40 billie Exp $
-
-EAPI=5
-
-inherit multilib eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-src_prepare() {
-	# Remove profiled make files.
-	rm -f $(find . -name '*_p.mk') || die "rm profiled"
-
-	# Adjusting hardcoded paths.
-	sed -i -e 's:opt/schily:usr:' \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
-		$(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e 's:include\t\t.*rules.lib::' \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
-		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s/-O//" \
-		-e 's/$(GCCOPTOPT)//' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Create additional symlinks needed for some archs (armv4l already created)
-	local t
-	for t in armv4tl armv5l armv5tel armv6l armv7l ppc64 s390x; do
-		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
-		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
-	done
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-
-	sed -i \
-		-e "s:/opt/schily:/usr:g" \
-		-e "s:/usr/src/linux/include::g" \
-		-e "s:bin:root:g" \
-		Defaults.${os} || die "sed Schily make setup"
-}
-
-# skip obsolete configure script
-src_configure() { : ; }
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	if ! use acl; then
-		CFLAGS="${CFLAGS} -DNO_ACL"
-	fi
-
-	# LIB_ACL_TEST removed to support x86-fbsd
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
-		RUNPATH="" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
-		RUNPATH="" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@ -1,3 +1,3 @@
 DIST libsecret-0.11.tar.xz 474716 SHA256 e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689 SHA512 a4fa9e8e661f8165dacfc15fbe41a8429070c036ce64a7bfbd79ffc0c18ddf16d31518d25298de8e640f3b581e7d8915537ecca85a182b9bad8c03fe1d287122 WHIRLPOOL 02eef41a600597f3348b859895a62e200277e23a752071e222e87ff8229b4bc71f8ecd201b4ae118ceebd0179db3c1593c812d7c4b9f6bf6040af72b3205d419
 DIST libsecret-0.12.tar.xz 476552 SHA256 323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01 SHA512 920da07b8674816b9f139dc71e79721d1767025e799e99dea7458c3c3b54c81ae2f4aa55ad55194e0c151fa23d13eae12928c9bbfac1c67d9ae6eed3d8a1efa4 WHIRLPOOL 1bcc96a175519f2d24ec8c5f8ee61ae0ca851511c540d69230ab05a67d7192ac5827d407c06aa054820ee1ea714efee7ee15927b4fcc152fae73ef66bb768f24
-DIST libsecret-0.13.tar.xz 480260 SHA256 bb5d8825f045a635444cb52233e0674f7dac89b7700568cf7ef4cc6dc5cbfbc9 SHA512 17916036c184ae6fe2c019141a9cb205c910e2352f3eba53a55503a3e8a31b90fd203f8f129039b4b157ba0a715bc7bc38fd213d1f9ffdf87cfcf19e563cc703 WHIRLPOOL 0f67a16efccdd11bf974d24dcf0ea255d0d5e6a8e8b2d67bca2769e84815690c7d96ebe595c6b6da67fcdb65185f2c2527f6d7bbd8bbddcbdaae6ead3169ab25
+DIST libsecret-0.14.tar.xz 483620 SHA256 58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5 SHA512 63b8fd947d63f178f48a79aa195f4b6a9eb1e802134779436981ab8aa00b268a449709139704843656f8b4616cc13a2dbc79a4ba4460b09cf250cef3478fd172 WHIRLPOOL 301d88c4fcf35038456800748b349c303edf96323d96cf7b80324d85fe97ca3be22ce4b79ef07dc6d42a7fb6050dedf51d3d409f9e514eac7685d0139e407c63
--- a/app-crypt/libsecret/files/libsecret-0.13-fix-secretvalue-get.patch
+++ b/app-crypt/libsecret/files/libsecret-0.13-fix-secretvalue-get.patch
@ -1,94 +0,0 @@
-From ddd9bdd2e9fcc6009e54a17751d1002a039d180a Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 25 Feb 2013 13:56:32 +0100
-Subject: [PATCH] Fix introspection for secret_value_get() to return a uint8
-
-This works around a crash in pygobject.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=694448
---
- libsecret/secret-value.c         |  4 ++--
- libsecret/tests/test-unstable.py | 34 +++++++++++++++++++++++++++++++---
- 2 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/libsecret/secret-value.c b/libsecret/secret-value.c
-index 7bd7bc2..a6fc5b8 100644
--- a/libsecret/secret-value.c
-+++ b/libsecret/secret-value.c
-@@ -151,13 +151,13 @@ secret_value_new_full (gchar *secret,
- /**
-  * secret_value_get:
-  * @value: the value
- * @length: (out): the length of the secret
-+ * @length: the length of the secret
-  *
-  * Get the secret data in the #SecretValue. The value is not necessarily
-  * null-terminated unless it was created with secret_value_new() or a
-  * null-terminated string was passed to secret_value_new_full().
-  *
- * Returns: (array length=length): the secret data
-+ * Returns: (array length=length) (element-type guint8): the secret data
-  */
- const gchar *
- secret_value_get (SecretValue *value,
-diff --git a/libsecret/tests/test-unstable.py b/libsecret/tests/test-unstable.py
-index 7f611e7..2aa6d2b 100644
--- a/libsecret/tests/test-unstable.py
-+++ b/libsecret/tests/test-unstable.py
-@@ -14,22 +14,50 @@
- import unittest
- 
- from gi.repository import MockService as Mock
-from gi.repository import SecretUnstable as Secret, GLib
-+from gi.repository import SecretUnstable, Secret, GLib
-+
-+EXAMPLE_SCHEMA = Secret.Schema.new('org.mock.type.Store',
-+	Secret.SchemaFlags.NONE,
-+	{
-+		'number': Secret.SchemaAttributeType.INTEGER,
-+		'string': Secret.SchemaAttributeType.STRING,
-+		'even': Secret.SchemaAttributeType.BOOLEAN,
-+	}
-+)
-+
-+attributes = {
-+	'number': '8',
-+	'string': 'eight',
-+	'even': 'true'
-+}
- 
- class TestStore(unittest.TestCase):
- 	def setUp(self):
- 		Mock.start("mock-service-normal.py")
- 
- 	def tearDown(self):
-		Secret.Service.disconnect()
-+		SecretUnstable.Service.disconnect()
- 		Mock.stop()
- 
- 	def testSynchronous(self):
-		service = Secret.Service.get_sync(Secret.ServiceFlags.NONE, None);
-+		service = SecretUnstable.Service.get_sync(SecretUnstable.ServiceFlags.NONE, None);
- 		path = service.read_alias_dbus_path_sync("default", None);
- 
- 		# Just running this without error is good enough for us to test the unstable gir
- 		self.assertNotEqual(path, None);
- 
-+	def testValueGet(self):
-+		Secret.password_store_sync(EXAMPLE_SCHEMA, attributes, Secret.COLLECTION_DEFAULT,
-+		                           'the label', 'the password', None)
-+
-+		service = SecretUnstable.Service.get_sync(SecretUnstable.ServiceFlags.NONE, None)
-+		items = service.search_sync(EXAMPLE_SCHEMA, { 'even': 'true' },
-+		                                   SecretUnstable.SearchFlags.ALL | SecretUnstable.SearchFlags.LOAD_SECRETS,
-+		                                   None)
-+
-+		item = items[0]
-+		item_secret = item.get_secret()
-+		self.assertEqual(item_secret.get(), "the password")
-+
- if __name__ == '__main__':
- 		unittest.main()
-- 
-1.7.12.4
-
--- a/app-crypt/libsecret/libsecret-0.14.ebuild
+++ b/app-crypt/libsecret/libsecret-0.14.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-crypt/libsecret/libsecret-0.13.ebuild,v 1.1 2013/03/02 08:51:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.14.ebuild,v 1.1 2013/03/05 01:26:14 nirbheek Exp $

 EAPI="5"
 VALA_MIN_API_VERSION=0.18
@ -64,9 +64,6 @@ src_prepare() {
 		-e '/test_get_async);/d' \
 		-i libsecret/tests/test-service.c || die

-	# https://bugzilla.gnome.org/show_bug.cgi?id=694448
-	epatch "${FILESDIR}/${P}-fix-secretvalue-get.patch"
-
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
--- a/app-forensics/openscap/Manifest
+++ b/app-forensics/openscap/Manifest
@ -1,2 +1,3 @@
 DIST openscap-0.9.1.tar.gz 10744598 SHA256 4601ffd6c1b5d0e9025e49db194f2e7f7d7fef1826981bb212ef543c28e94fe6 SHA512 0ead581b8801b3cd1a0af20d746a766d8c56f58013be49c390df152001bb721a81445d5e683fac50c19071340ab78ff068161bff7d76d67e15e62dfdc50d88aa WHIRLPOOL 966c6604591dfb3d10eaad793c2348b5a4ae0a813fdcdfdf8ebf22f9cb471181bfcd3e0455acda16fe6d358c704067e92584a054fe88b1a8fd2743614af8428a
 DIST openscap-0.9.3.tar.gz 11928497 SHA256 0aa482fa4a22493ec3d5987fd8c86d5124a94675f5cbdd6aac1cb86f14402acd SHA512 75f5d958d04c290a3a8458a4a21956da6f5d337c85ab6da1b246bb13cfbcf376e811f55f16b70c7a3d3c73ae27cb7ab01242bc472556218a116c562c162464fd WHIRLPOOL f46c317c95d5d33f995f4498707d315cf7f38f3be7960efcc9e460b94979290cb783907c6f8b26c436a6152b7d3ca58059b0e2e4382d2be75352dc17232665b2
+DIST openscap-0.9.4.1.tar.gz 12012752 SHA256 9f80ba69482eb9a5ec0f08491fde3d5963c84441576fa5ede4fcc707d6166059 SHA512 8a91e5249c52a7174e03faa8bf347b6e39cb7330ec9aec5c6413d22b654a964c2f6861bc781e1e358bd62eafbd56562bbe980b18bf472b9645003f17fdc39c99 WHIRLPOOL b4b6beae40d60e8852b9a68ab2421a837d3139c6ea598c7e5b6355690178f1f85d88bece9cfd81d2a09fe177361ddd529d83ba1aced67bc87ad4e19d08cbae98
--- a/app-forensics/openscap/openscap-0.9.4.1.ebuild
+++ b/app-forensics/openscap/openscap-0.9.4.1.ebuild
@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.9.4.1.ebuild,v 1.1 2013/03/04 19:09:51 hwoarang Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python bash-completion-r1
+
+DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
+HOMEPAGE="http://www.open-scap.org/"
+SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc ldap nss perl python rpm selinux sql test"
+#RESTRICT="test"
+
+RDEPEND="!nss? ( dev-libs/libgcrypt )
+	nss? ( dev-libs/nss )
+	ldap? ( net-nds/openldap )
+	rpm? ( >=app-arch/rpm-4.9 )
+	sql? ( dev-db/opendbx )
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	test? (
+		app-arch/unzip
+		dev-perl/XML-XPath
+		net-misc/ipcalc
+		sys-apps/grep )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
+
+	#probe runlevel for non-centos/redhat/fedora is not implemented
+	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
+	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
+
+	#According to comment of theses tests, we must modify it. For the moment disable it
+	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
+
+	# theses tests are hardcoded for checking hald process...,
+	# but no good solution for the moment, disabling them with a fake echo
+	# because encased in a if then
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
+	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
+
+	#This test fail
+	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
+
+	if ! use rpm ; then
+		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
+		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
+	fi
+	if ! use selinux ; then
+		einfo "Disabling SELinux probes"
+		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
+		#process58 need selinux
+		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
+	fi
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	if use python ; then
+		myconf+=" --enable-python"
+	else
+		myconf+=" --enable-python=no"
+	fi
+	if use perl ; then
+		myconf+=" --enable-perl"
+	fi
+	if use nss ; then
+		myconf+=" --with-crypto=nss3"
+	else
+		myconf+=" --with-crypto=gcrypt"
+	fi
+	econf ${myconf}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}" -name '*.la' -delete || die
+	if use doc ; then
+		dohtml -r docs/html/* || die
+		dodoc docs/examples/* || die
+	fi
+	if use bash-completion ; then
+		dobashcomp "${D}"/etc/bash_completion.d/oscap
+	fi
+	rm -rf "${D}"/etc/bash_completion.d || die
+}
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@ -1,3 +1,2 @@
-DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
-DIST tracker-0.14.3.tar.xz 6120108 SHA256 7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4 SHA512 c4c30ffc7879069c5487773e7a905b2b4bff811160318f0c46550ef27fa70b23d481234e62059900f8101e2ce19b3c52ee08f65020d98168c0ec31ca263c8663 WHIRLPOOL e8bf48887c0a6cb43accf399b14d6b6e8221bf261c035572791ef56ff8782d57f675e18b60bc9411f201c0311ab58503f5154fe296235cd262e63b9d338580ad
 DIST tracker-0.14.4.tar.xz 5946796 SHA256 b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 SHA512 e9d6d28276dc7f9930f0e8801fa3b3ea2a30ced0979309418ff5a36d7417ab85fb4d2c246032cad88ea63a4716b301db95a0046bd17eb1849e8a9a7edc464103 WHIRLPOOL 82aebbd0596c931867c65612672af52a510da202c881b2e1fdaa9a07136f8bef2840c2d0a6546ba0e6a53c9e61c973925dbc917ba5d8ec3b385f0656a34b926a
+DIST tracker-0.14.5.tar.xz 6065728 SHA256 cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8 SHA512 ab65d5618ef51d23b65e3d6972834e573415dba52e7bb9f20f8f9d4d4aab467b667301e6540083401d91c9e36cb63fdb2259f6dd9e975e9ff60bf1f83245b777 WHIRLPOOL 4c2c5ad9ff0d7a35c5e9c6bc42b354b9967a436cb1a8b2b640ca09e102a428e268bd011e0405a2b331f80df5a69dcd7e0afc693ae4969604ee41088e5da0c25b
--- a/app-misc/tracker/files/tracker-0.12.3-strigi.patch
+++ b/app-misc/tracker/files/tracker-0.12.3-strigi.patch
@ -1,26 +0,0 @@
-diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
-index cff290a..aed4dc9 100644
--- a/src/tracker-extract/tracker-extract.c
-+++ b/src/tracker-extract/tracker-extract.c
-@@ -298,7 +298,7 @@ get_file_metadata (TrackerExtractTask  *task,
- 	info = tracker_extract_info_new (file, task->mimetype, task->graph);
- 	g_object_unref (file);
- 
-#ifdef HAVE_LIBSTREAMANALYZER
-+#if 0 /* disabling entirely, see comment below */
- 	/* FIXME: This entire section is completely broken,
- 	 * it doesn't even build these days. It should be removed or fixed.
- 	 * -mr (05/09/11)
-diff --git a/src/tracker-extract/tracker-topanalyzer.cpp b/src/tracker-extract/tracker-topanalyzer.cpp
-index 86dbda7..f749c00 100644
--- a/src/tracker-extract/tracker-topanalyzer.cpp
-+++ b/src/tracker-extract/tracker-topanalyzer.cpp
-@@ -39,7 +39,7 @@
- 
- #include <libtracker-common/tracker-type-utils.h>
- #include <libtracker-common/tracker-os-dependant.h>
-#include <libtracker-common/tracker-sparql-builder.h>
-+#include <libtracker-client/tracker-sparql-builder.h>
- #include <libtracker-common/tracker-ontologies.h>
- 
- #include <libtracker-extract/tracker-utils.h>
--- a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
+++ b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
@ -1,34 +0,0 @@
-From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Jul 2012 10:46:33 -0400
-Subject: [PATCH] libtracker-fts: ICU cannot handle complex locale
- descriptions
-
-ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
-not the full definition of your various locale variables and their
-values as returned by glibc's setlocale(LC_ALL, NULL).
-
-Instead, limit ourselves to LC_CTYPE, since after all, that's all we
-need to determine word boundaries.
-
-Fixes GB#675660.
---
- src/libtracker-fts/tracker-parser-libicu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
-index 7388f69..69f75ed 100644
--- a/src/libtracker-fts/tracker-parser-libicu.c
-+++ b/src/libtracker-fts/tracker-parser-libicu.c
-@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
- 
- 		/* Open word-break iterator */
- 		parser->bi = ubrk_open(UBRK_WORD,
-		                       setlocale (LC_ALL, NULL),
-+		                       setlocale (LC_CTYPE, NULL),
- 		                       parser->utxt,
- 		                       parser->utxt_size,
- 		                       &error);
-- 
-1.7.12
-
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@ -1,269 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.5 2013/03/02 19:33:02 hwoarang Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info multilib python versionator
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91.6
-		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
-	eds? (
-		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 ) )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=dev-qt/qtgui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.12:0.12 )
-	gtk? (
-		>=dev-lang/vala-0.12:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-#	strigi? ( >=dev-lang/vala-0.12:0.12 )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.12.7 )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	inotify_enabled
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
-	# is not being generated
-	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--disable-libcue
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable firefox-bookmarks miner-firefox)
-		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
-		FIREFOX=${S}/firefox-version.sh
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable thunderbird miner-thunderbird)
-		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
-		THUNDERBIRD=${S}/thunderbird-version.sh
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.12.3-strigi.patch"
-
-	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
-	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
--- a/app-misc/tracker/tracker-0.14.5.ebuild
+++ b/app-misc/tracker/tracker-0.14.5.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.3.ebuild,v 1.4 2013/03/02 19:33:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.5.ebuild,v 1.2 2013/03/04 23:13:09 eva Exp $

-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"

 [[ ${PV} = 9999 ]] && inherit autotools git-2
-inherit gnome2 linux-info multilib python vala versionator virtualx
+inherit gnome2 linux-info multilib python-any-r1 vala versionator virtualx

 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
@ -18,35 +18,37 @@ EGIT_REPO_URI="git://git.gnome.org/${PN}
 [[ ${PV} = 9999 ]] && SRC_URI=""

 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/14"
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
+gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
+	IUSE="${IUSE} doc"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	IUSE="${IUSE} nautilus"
 fi
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp" # qt4 strigi
-[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
-REQUIRED_USE="cue? ( gstreamer )"

-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
+REQUIRED_USE="
+	^^ ( gstreamer xine )
+	cue? ( gstreamer )
+	upnp-av? ( gstreamer )
+	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
+"

 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.14[threadsafe]
+	>=dev-db/sqlite-3.7.14:=[threadsafe]
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
+	>=dev-libs/icu-4:=
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
+	>=media-libs/libpng-1.2:=
+	>=x11-libs/pango-1:=
 	sys-apps/util-linux

 	applet? (
@ -55,8 +57,8 @@ RDEPEND="
 		>=x11-libs/gtk+-3:3 )
 	cue? ( media-libs/libcue )
 	eds? (
-		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5
+		>=mail-client/evolution-3.3.5:=
+		>=gnome-extra/evolution-data-server-3.3.5:=
 		<mail-client/evolution-3.5.3
 		<gnome-extra/evolution-data-server-3.5.3 )
 	elibc_glibc? ( >=sys-libs/glibc-2.12 )
@ -71,14 +73,12 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.31:0.10
-		upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp-av? ( >=media-libs/gst-plugins-base-0.10.31:0.10 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+		>=media-libs/gst-plugins-base-0.10.31:0.10 )
 	gtk? (
-		>=dev-libs/libgee-0.3:0
+		>=dev-libs/libgee-0.3:0.8
 		>=x11-libs/gtk+-3:3 )
 	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.0.2 )
+	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? ( >=sys-power/upower-0.9 )
 	mp3? (
@ -86,8 +86,8 @@ RDEPEND="
 		gtk? ( x11-libs/gdk-pixbuf:2 ) )
 	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	pdf? (
-		>=x11-libs/cairo-1
-		>=app-text/poppler-0.16[cairo,utils]
+		>=x11-libs/cairo-1:=
+		>=app-text/poppler-0.16:=[cairo,utils]
 		>=x11-libs/gtk+-2.12:2 )
 	playlist? ( dev-libs/totem-pl-parser )
 	rss? ( net-libs/libgrss )
@ -95,27 +95,29 @@ RDEPEND="
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
 	tiff? ( media-libs/tiff )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.5 )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xine? ( >=media-libs/xine-lib-1 )
 	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
+	xmp? ( >=media-libs/exempi-2.1 )
+	xps? ( app-text/libgxps )
+	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+"
 #	strigi? ( >=app-misc/strigi-0.7 )
 #	mp3? ( qt4? (  >=dev-qt/qtgui-4.7.1:4 ) )
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.8
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gtk? ( >=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
 	test? (
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
 [[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	dev-util/gtk-doc-am
+	doc? ( media-gfx/graphviz )
 	>=dev-util/gtk-doc-1.8
 	$(vala_depend)
 "
@ -138,8 +140,7 @@ pkg_setup() {
 	linux-info_pkg_setup
 	inotify_enabled

-	python_set_active_version 2
-	python_pkg_setup
+	python-any-r1_pkg_setup
 }

 src_unpack() {
@ -151,23 +152,61 @@ src_unpack() {
 }

 src_prepare() {
+	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
+	# access violations on some setups (bug #385347, #385495).
+	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
+	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
+
+	# FIXME: report broken tests
+	sed -e '\%"/libtracker-common/tracker-dbus/request"%,+1 d' \
+		-i tests/libtracker-common/tracker-dbus-test.c || die
+	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
+		-i tests/libtracker-common/tracker-file-utils-test.c || die
+	sed -e '\%/libtracker-miner/tracker-password-provider/setting%,+1 d' \
+		-e '\%/libtracker-miner/tracker-password-provider/getting%,+1 d' \
+		-i tests/libtracker-miner/tracker-password-provider-test.c || die
+	sed -e '\%"datetime/functions-localtime-1"%,\%"datetime/functions-timezone-1"% d' \
+		-i tests/libtracker-data/tracker-sparql-test.c || die
+	sed -e '/#if HAVE_TRACKER_FTS/,/#endif/ d' \
+		-i tests/libtracker-sparql/tracker-test.c || die
+	sed -e 's/\({ "本州最主流的风味",.*TRUE,  \) 8/\1 5/' \
+		-e 's/\({ "ホモ・サピエンス.*TRUE, \) 13/\1 10/' \
+		-i tests/libtracker-fts/tracker-parser-test.c || die
+	# Fails inside portage, not outside
+	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+1 d' \
+		-i tests/tracker-steroids/tracker-test.c || die
+
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
 	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
+		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
 		if use upnp-av; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
+			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
 		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
+			myconf="${myconf} --with-gstreamer-backend=discoverer"
 		fi
 	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
+		myconf="${myconf} --enable-generic-media-extractor=xine"
 	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
+		myconf="${myconf} --enable-generic-media-extractor=external"
 	fi

 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
+		#myconf="${myconf} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+		myconf="${myconf} --enable-gdkpixbuf"
+	fi
+
+	if [[ ${PV} = 9999 ]]; then
+		myconf="${myconf} $(use_enable doc gtk-doc)"
 	fi

 	# unicode-support: libunistring, libicu or glib ?
@ -176,72 +215,52 @@ src_prepare() {
 	# is not being generated
 	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
 	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(use_enable cue libcue)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable firefox-bookmarks miner-firefox)
-		$(use_with firefox-bookmarks firefox-plugin-dir ${EPREFIX}/usr/$(get_libdir)/firefox/extensions)
-		FIREFOX=${S}/firefox-version.sh
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable iso libosinfo)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable miner-fs)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable thunderbird miner-thunderbird)
-		$(use_with thunderbird thunderbird-plugin-dir ${EPREFIX}/usr/$(get_libdir)/thunderbird/extensions)
-		THUNDERBIRD=${S}/thunderbird-version.sh
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
+	gnome2_src_configure \
+		--disable-hal \
+		--disable-libstreamanalyzer \
+		--disable-nautilus-extension \
+		--disable-qt \
+		--enable-guarantee-metadata \
+		--enable-introspection \
+		--enable-tracker-fts \
+		--with-enca \
+		--with-unicode-support=libicu \
+		$(use_enable applet tracker-search-bar) \
+		$(use_enable cue libcue) \
+		$(use_enable eds miner-evolution) \
+		$(use_enable exif libexif) \
+		$(use_enable firefox-bookmarks miner-firefox) \
+		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
+		FIREFOX="${S}"/firefox-version.sh \
+		$(use_enable flac libflac) \
+		$(use_enable flickr miner-flickr) \
+		$(use_enable gnome-keyring) \
+		$(use_enable gsf libgsf) \
+		$(use_enable gtk tracker-explorer) \
+		$(use_enable gtk tracker-needle) \
+		$(use_enable gtk tracker-preferences) \
+		$(use_enable iptc libiptcdata) \
+		$(use_enable iso libosinfo) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable laptop upower) \
+		$(use_enable miner-fs) \
+		$(use_enable mp3 taglib) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable pdf poppler) \
+		$(use_enable playlist) \
+		$(use_enable rss miner-rss) \
+		$(use_enable test functional-tests) \
+		$(use_enable test unit-tests) \
+		$(use_enable thunderbird miner-thunderbird) \
+		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
+		THUNDERBIRD="${S}"/thunderbird-version.sh \
+		$(use_enable tiff libtiff) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable xml libxml2) \
+		$(use_enable xmp exempi) \
+		$(use_enable xps libgxps) \
+		${myconf}
 	#	$(use_enable strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
-	gnome2_src_prepare
 }

 src_test() {
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.57 2013/03/02 19:33:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.58 2013/03/04 23:10:42 eva Exp $

 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"

 [[ ${PV} = 9999 ]] && inherit autotools git-2
-inherit gnome2 linux-info multilib python vala versionator virtualx
+inherit gnome2 linux-info multilib python-any-r1 vala versionator virtualx

 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
@ -18,16 +18,16 @@ EGIT_REPO_URI="git://git.gnome.org/${PN}
 [[ ${PV} = 9999 ]] && SRC_URI=""

 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-# USE="doc" is managed by eclass.
+SLOT="0/14"
 IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
 gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
-[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+	IUSE="${IUSE} doc"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	IUSE="${IUSE} nautilus"
+fi

 REQUIRED_USE="
 	^^ ( gstreamer xine )
@ -36,10 +36,6 @@ REQUIRED_USE="
 	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 "

-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
@ -79,7 +75,7 @@ RDEPEND="
 		>=media-libs/gstreamer-0.10.31:0.10
 		>=media-libs/gst-plugins-base-0.10.31:0.10 )
 	gtk? (
-		>=dev-libs/libgee-0.3:0
+		>=dev-libs/libgee-0.3:0.8
 		>=x11-libs/gtk+-3:3 )
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.0.2:= )
@ -110,19 +106,18 @@ RDEPEND="
 #	strigi? ( >=app-misc/strigi-0.7 )
 #	mp3? ( qt4? (  >=dev-qt/qtgui-4.7.1:4 ) )
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	>=dev-util/gtk-doc-am-1.8
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	gtk? ( >=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		media-gfx/graphviz )
 	test? (
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
 [[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	doc? ( media-gfx/graphviz )
 	>=dev-util/gtk-doc-1.8
 	$(vala_depend)
 "
@ -145,8 +140,7 @@ pkg_setup() {
 	linux-info_pkg_setup
 	inotify_enabled

-	python_set_active_version 2
-	python_pkg_setup
+	python-any-r1_pkg_setup
 }

 src_unpack() {
@ -158,10 +152,6 @@ src_unpack() {
 }

 src_prepare() {
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
 	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
 	# access violations on some setups (bug #385347, #385495).
 	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
@ -196,6 +186,10 @@ src_configure() {
 		myconf="${myconf} --enable-gdkpixbuf"
 	fi

+	if [[ ${PV} = 9999 ]]; then
+		myconf="${myconf} $(use_enable doc gtk-doc)"
+	fi
+
 	# unicode-support: libunistring, libicu or glib ?
 	# According to NEWS, introspection is required
 	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@ -1,3 +1,4 @@
 DIST akonadi-1.8.0.tar.bz2 213413 SHA256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d SHA512 9f995d90d84c8fa7bf51691b4bdabda69e64578dc7a2f0ee0b20979ef3da9e2128625c34b4ce84e5feb79c61615df7299905b2eeded9abcbe8deb22817e1821e WHIRLPOOL 492d184fa20a09e1f68438da8519e176731b1c2d66e01b8a2dfc940da24f167ae33bd00a51900444a18a6203a2165e4e70ef4a1c2db34ac4cc0660744f7a9230
 DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b0c58e28f215ffdc941b48c347 SHA512 8b33d9b2ee845e6ab8e01879f36b5a33c3ef1901490718859646f5b8a7ceffd6def1e788a218741023408991fef4c6cbb4769f125927801951515171ddbc6a7c WHIRLPOOL f20493ff6f1e3ae024dc47dfe7cb8f386fb4ce812cd30bd8132e09b75dc09fc884f41b9545ec46f6828b4582b7ee84f64c9586763eb5f221d3eb02da9e5e86f4
 DIST akonadi-1.9.0.tar.bz2 220255 SHA256 6ff5c23e426efc02784d4ab1a6e6dff24c8efe81fd34ec78bb52bb4d7733e013 SHA512 e982f98263ae7cce3af90a7282ead72802ab3c611c3d664ed995e630b036548cbcbacf290fd591e00cbc3584e989bbb9e563ff7736c785609ebd84d011750779 WHIRLPOOL 8df1b77e3725c68e8ecd6f1c937da4124127132980cb58deec937a4dd11032f02f2cf8d5bc775f40e402d2925ae2f0c1d2135330182140838c825bb4451594bc
+DIST akonadi-1.9.1.tar.bz2 220354 SHA256 53ae49a2039cc0454795f14f6c7c08780f39990652c45843f4266654c99a20f0 SHA512 dacb8015a1a9a1988f45f1ad91503d7aebf8afc9c1c5e1182b8fd6fcf0aa8e6317e7d302a0f7de5f5569dbb36006c5d37cb6d581b543685cde023dc71e7d54ef WHIRLPOOL 7a0f8202c00c07834f2c627462f8f45ac8b85230d2ade381888c6b77316cea8b743b9b634924ff09d6e1a6965177f81753c0315169f250e060ea00ce6e4e2b1e
--- a/app-office/akonadi-server/akonadi-server-1.9.1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.1.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.1.ebuild,v 1.2 2013/03/04 19:14:29 mschiff Exp $
+
+EAPI=4
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=dev-qt/qtgui-4.5.0:4[dbus]
+	>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+	>=dev-qt/qttest-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${PN}-1.9.0-qt5.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use sqlite && has_version "<=${CATEGORY}/${PN}-1.9.0[sqlite]"; then
+		ewarn
+		ewarn "The default storage drive has changed from SQLite to MySQL."
+		ewarn "If you want to stay with SQLite, enable the sqlite USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise, select a different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DWITH_QT5=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.159 2013/01/31 15:36:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.160 2013/03/04 20:53:22 scarabeus Exp $

 EAPI=5

@ -227,7 +227,6 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
 )

 REQUIRED_USE="
@ -313,8 +312,6 @@ src_unpack() {

 src_prepare() {
 	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 	export GMAKE_OPTIONS="${MAKEOPTS}"

 	# patchset
@ -338,6 +335,13 @@ src_prepare() {
 		-e "s:%libdir%:$(get_libdir):g" \
 		-i pyuno/source/module/uno.py \
 		-i scripting/source/pyprov/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		Makefile.in || die
 }

 src_configure() {
@ -376,7 +380,6 @@ src_configure() {
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
 			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
 			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 		"

@ -420,7 +423,6 @@ src_configure() {
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
 	#   promote it
-	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
 	# --disable-ext-report-builder: too much java packages pulled in
@ -453,7 +455,6 @@ src_configure() {
 		--disable-online-update \
 		--disable-rpath \
 		--disable-systray \
-		--disable-zenity \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
 		--with-build-version="Gentoo official package" \
 		--enable-extension-integration \
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@ -2,3 +2,4 @@ DIST mysql++-2.2.2.tar.gz 1709697 SHA256 a13b798c4082d663610c6457ee41a2e949ec474
 DIST mysql++-2.3.2.tar.gz 1627115 SHA256 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9 SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7 WHIRLPOOL 2bfc961193baad0053ff9909075db9f5ccfc7c00334483842bc25a94044a1331392f3dc0283bf5f33e69f67c20505bf5b12a01635a0f92716a0c341af5fe637e
 DIST mysql++-3.0.5.tar.gz 2564391 SHA256 304555ddddfdf572cc7fb81d0e259a1e367e5bd6412be67401881e31924ebd3b SHA512 92b0f314ae10cbe57603126d3b6a9b34057f7dedeb98deed6e90583e58defa1645e94b5e2ea9db45a3617de34a7116c43233158515d235f005538033595f555f WHIRLPOOL a83888e17b765495916cce8923f6b2f2c736c08135a50b77d57dd4368c555e6f1389117472eb72310b07e64bc5319ef34a635075311e686b783263c8cf65bea4
 DIST mysql++-3.0.9.tar.gz 2761079 SHA256 7c407bfbeae1c6ba64a16c18d1b3348f1cb32ef30f1d89663958611ed06f208d SHA512 41ce63c42133cc240b7908c3677f26cbb5c66a4a51e4ddf6053a5e547ff8ff92d4b80cdac3621a8fcd385f81a5bc05f37f9a4a1ffda10ec7c66cfe653af80244 WHIRLPOOL 4e92c5120961d4d82d88188f5abeaacff6958f2970a28b50502ae686534d8386dd77b5bed712e99f6976e57815ec8c2284edff1342eb75b6f1c591aed74a9696
+DIST mysql++-3.1.0.tar.gz 1944101 SHA256 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90 WHIRLPOOL 0b5274e0fbc1b2cb40ade9699ddc46d5837e66f3a506502f4dae5f5de4689ac2ccf3989a674db073a36075c541046b174e80bbac3d7df393bd61ef3bfc99fd32
--- a/dev-db/mysql++/files/mysql++-3.0-gcc-as-needed.patch
+++ b/dev-db/mysql++/files/mysql++-3.0-gcc-as-needed.patch
@ -0,0 +1,130 @@
+=== modified file 'lib/refcounted.h'
+--- a/lib/refcounted.h	2012-10-18 11:37:55.322732178 -0300
+++ b/lib/refcounted.h	2012-10-18 11:40:10.303349659 -0300
+@@ -29,6 +29,7 @@
+ #define MYSQLPP_REFCOUNTED_H
+ 
+ #include <memory>
+#include <cstddef>
+ 
+ namespace mysqlpp {
+ 
+=== modified file 'ssx/genv2.cpp'
+--- a/ssx/genv2.cpp	2013-02-14 12:29:16.523261203 -0500
+++ b/ssx/genv2.cpp	2013-02-14 12:29:29.983070930 -0500
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <typeinfo>
+#include <cstring>
+ 
+ using namespace std;
+ 
+== modified file 'Makefile.in'
+--- a/Makefile.in	2013-02-14 13:14:10.954718894 -0500
+++ b/Makefile.in	2013-02-14 13:15:23.463679996 -0500
+@@ -471,87 +471,87 @@
+ 	$(RANLIB) $@
+ 
+ ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
+-	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
+	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__ssqlsxlat___mac_setfilecmd)
+ 
+ test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_array_index___mac_setfilecmd)
+ 
+ test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_cpool___mac_setfilecmd)
+ 
+ test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_datetime___mac_setfilecmd)
+ 
+ test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_inttypes___mac_setfilecmd)
+ 
+ test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_insertpolicy___mac_setfilecmd)
+ 
+ test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_manip___mac_setfilecmd)
+ 
+ test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_null_comparison___mac_setfilecmd)
+ 
+ test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_query_copy___mac_setfilecmd)
+ 
+ test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_qssqls___mac_setfilecmd)
+ 
+ test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_qstream___mac_setfilecmd)
+ 
+ test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_sqlstream___mac_setfilecmd)
+ 
+ test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
+-	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
+	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp -lmysqlpp_ssqls2parse $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_ssqls2___mac_setfilecmd)
+ 
+ test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_string___mac_setfilecmd)
+ 
+ test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_tcp___mac_setfilecmd)
+ 
+ test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_uds___mac_setfilecmd)
+ 
+ test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
+	$(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ -lmysqlpp $(LDFLAGS) $(LIBS)
+ 	
+ 	$(__test_wnp___mac_setfilecmd)
+ 
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-3.1.0.ebuild,v 1.1 2013/03/04 20:23:30 robbat2 Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="C++ API interface to the MySQL database"
+HOMEPAGE="http://tangentsoft.net/mysql++/"
+SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/mysql-4.0"
+DEPEND="${RDEPEND}
+		|| ( >=sys-devel/gcc-3 >=sys-devel/gcc-apple-4 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-gcc-as-needed.patch
+
+	for i in "${S}"/lib/*.h ; do
+		sed -i \
+			-e '/#include </s,mysql.h,mysql/mysql.h,g' \
+			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
+			"${i}"
+	done
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use prefix || local EPREFIX=
+	myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr"
+
+	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# install the docs and HTML pages
+	dodoc README* CREDITS* ChangeLog HACKERS.txt Wishlist doc/ssqls-pretty
+	dodoc -r doc/pdf/ doc/refman/ doc/userman/
+	dohtml -r doc/html/
+}
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@ -1,6 +1,7 @@
 DIST R-2.10.1.tar.gz 19705604 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d SHA512 aeedc0190c90b09fc2969f680ec0b8b8174ca224288d0d0c5536e19c63e28d92604ec2936015298b839cdbce349e5d4e9f759ef30d31fc3dccd2a67448e3b7d4 WHIRLPOOL 2252ad97059b6e7fbe4473280f681af1b57ff1a3c1c3151c499f71cc6b7f4d4fce0c5312389e79e61272f7b635cf31dcd1dd320525e627c08b97367c17ec3d58
 DIST R-2.15.2.tar.bz2 22374116 SHA256 57f929f0e3925d1ae9ae32010fb9a7cb02eed47ee998c0fdc8284cb8f167ffbc SHA512 2506654259fa72599c150ea6e43f5d57f57a5d2ed2771067a96bb2a232df9aa05213f327001c78a82beec88048cc102263b41e897392181d044db675818bfbff WHIRLPOOL 07e86aaac4362088bdf869a9bc25dadb3aaa3cab39b0ebc45d67c2deda0bbd46280cf70525e51ae2f433fa558a4098e5feff4fc34ca298f79f40dd9d4eb79674
 DIST R-2.15.2.tar.gz 24338934 SHA256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d SHA512 86b07630cf9b69e9889a753297fd672a8fe89000c8b084908d6f1c90118cdb8b478681db37deefd5a5ddb3128169f60671201550bcd34689658b1f189398adac WHIRLPOOL 88fe31ce28115b0ca6961ad372c054618b199836131ca067f06139a0f6e4f23ff849f52d8653828e4245156d5377f4fbd08b866de44ea33b18b39c5694d08694
+DIST R-2.15.3.tar.gz 25409925 SHA256 c583a38f8dad3bc012c08116f4ba1eb2182cadfad4b0f8d7bd3cdba24bc255d6 SHA512 83389e792aecb52fcd129321c896558dd3bfaf0f6ac775b662d67bbea8a4ec86f22fab625cc20587a17f991ea39764a89fbea34c9f638e3134a095a4e3b2fa12 WHIRLPOOL 3c240f24c82db09fe2c9b4b33cb9ddbc57688940d6f6e3b76f67e0a440910f1aef23617f25219fd62ba83f730a4a8bae3ff32b9c27faad08fd8b95fce847ed6d
 DIST R-20120306.bash_completion.bz2 4325 SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f SHA512 1bf874c58efb648aa96ac22b7c6c66444cb8f72b33cefa9eb28461043659476548873ec6dbd5a15bf893d6f87a7a7d18e4deb045759a1e74774d03cbb8f1f082 WHIRLPOOL 231742e9a886174b3f6bd62102d5b7cea1b050e786420f4e0cd4d9cec31ccb93fcc5a3115364776fbd00020d4e26398400e80cec126a41c5bd70677fd675c966
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
 DIST R.bash_completion.bz2 4019 SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 SHA512 b11efb99a5dae1f434d2f8c70154a09dd3826126a034a102f905144650c3d77851ddeb206c247dd9365baca13cf95897708a62bd6f8bddc079e3b679a8470fe2 WHIRLPOOL eb8fb8bff43873b75b61bf92af817be7d2bc4eddb2bf51c13e51dc1bdcc0cb5b0bd3623cf73fe20867c8b734732c6c89523916bc8ed4fba2931e55c5a0f837b8
--- a/dev-lang/R/R-2.15.3.ebuild
+++ b/dev-lang/R/R-2.15.3.ebuild
@ -0,0 +1,204 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.3.ebuild,v 1.1 2013/03/04 22:56:38 bicatali Exp $
+
+EAPI=5
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+
+BCP=${PN}-20130129.bash_completion
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz
+	bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos"
+IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
+REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
+
+CDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre
+	virtual/blas
+	cairo? ( x11-libs/cairo[X] x11-libs/pango )
+	icu? ( dev-libs/icu )
+	jpeg? ( virtual/jpeg )
+	lapack? ( virtual/lapack )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )
+	tk? ( dev-lang/tk )
+	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
+		 )"
+
+RDEPEND="${CDEPEND}
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	app-arch/xz-utils
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+	if use openmp; then
+		FORTRAN_NEED_OPENMP=1
+		tc-has-openmp || die "Please enable openmp support in your compiler"
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+	# Temporary fix for bug #419761
+	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+		append-flags -fno-ipa-cp-clone
+	fi
+}
+
+src_prepare() {
+	# gentoo bug #322965 (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
+	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
+
+	# respect ldflags (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
+	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+
+	# gentoo bug #383431
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
+	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
+
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
+	epatch "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -i \
+		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -i \
+		-e 's:\.\./manual/:manual/:g' \
+		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -i \
+				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-e "/SHLIB_EXT/s/\.so/.dylib/" \
+				configure.ac || die
+			# sort of "undo" 2.14.1-rmath-shared.patch
+			sed -i \
+				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+				src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+	AT_M4DIR=m4 eaclocal
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--with-system-pcre \
+		--with-system-xz \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${R_DIR}/lib
+		R_HOME=${R_DIR}
+	EOF
+	doenvd 99R
+	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
+	# The buildsystem has a different understanding of install_names than what
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/lib/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
--- a/dev-lang/cilk/cilk-5.4.6-r1.ebuild
+++ b/dev-lang/cilk/cilk-5.4.6-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/dev-lang/cilk/cilk-5.4.6-r1.ebuild,v 1.2 2012/11/13 05:33:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cilk/cilk-5.4.6-r1.ebuild,v 1.3 2013/03/04 19:58:28 bicatali Exp $

-EAPI=4
+EAPI=5
 inherit flag-o-matic autotools eutils

 DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
@ -20,7 +20,8 @@ src_prepare() {
 }

 src_configure() {
-	append-cppflags -D_XOPEN_SOURCE=500
+	append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L
+	replace-flags -O[2-9] -O1
 	econf --with-perfctr=no $(use_enable static-libs static)
 }

--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@ -4,6 +4,8 @@ DIST perl-5.12.3-4.tar.bz2 8908 SHA256 6e97770b5db0dc82630451ea87f2d6654591110ac
 DIST perl-5.12.3.tar.bz2 12041247 SHA256 7e3ce3f19f2290c2a2a43a98bcf8cb0ccb69b652d67ddc629544339edc6c7343 SHA512 8a25cb9bd72b197467af7bee55d0c7c834c8e679bc01b82c0f0847d7c7416a02fd89b7cf6304ec74eb38404c78b91e3029d183b6c52831d19082d305c9ef0f76 WHIRLPOOL 9a9dcb9f0b5156415eeb325569f3d6a40df558a86717db7a8f6162531ba30170d3aaa81a15487fd3d7c2c07e5fee81ee075e1a07d401576fa64989105eeecc63
 DIST perl-5.12.4-1.tar.bz2 8045 SHA256 a5b0a7385773da5e716d74c5f9a46c63d93de96e9e7e60899f40363bd9fe6823 SHA512 73ca51e54f4273dc72c0c891643bd842d2f69b20a7cecf409e9eb790bd82cb0c9b61279555fe9f1930f914218c3055470a9d97e1f94e45d7f148a3100a426579 WHIRLPOOL 1e28cded49c92f29908ac6ba5bbbc4e5579cc373ae3b13a009cc503bfa0b0305cf439fdb722e5ebab2c971163163f50f808baf1bbce76cb4a7c0b49de70fbc96
 DIST perl-5.12.4.tar.bz2 12350353 SHA256 c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e SHA512 3dc0250496a2fd6adc639a63d777079d6fa5ba4a1d1c730350fd51752be2c7459ab65d622e99b853a3eea7ccecaf1f5f0b5a0f013efcb6554d6952f47aebf8d0 WHIRLPOOL 40677a8b690a6253609fe1b88bc95d9f8018d167ca4ab6753cba60cc5f5078a4953585a6face4f7e94222cacaca0348093cad6201e1e8c00c4f5a94cce065e49
+DIST perl-5.12.5-1.tar.bz2 8045 SHA256 a5b0a7385773da5e716d74c5f9a46c63d93de96e9e7e60899f40363bd9fe6823 SHA512 73ca51e54f4273dc72c0c891643bd842d2f69b20a7cecf409e9eb790bd82cb0c9b61279555fe9f1930f914218c3055470a9d97e1f94e45d7f148a3100a426579 WHIRLPOOL 1e28cded49c92f29908ac6ba5bbbc4e5579cc373ae3b13a009cc503bfa0b0305cf439fdb722e5ebab2c971163163f50f808baf1bbce76cb4a7c0b49de70fbc96
+DIST perl-5.12.5.tar.bz2 12252744 SHA256 10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c SHA512 1c8957da1d25bbfc67a6521ba02791326f8040e3e59e4e4d760648598ac3153d9fae942a431ba506811ee95cbf87149071f7afcb3fb35eb59329d5424b0c3af7 WHIRLPOOL ccafe115fd6f7de6992beac0bfba4273e6f72949957a1b828bd9e787b4b663164d6edb091cfabdee1269b944d96467026f4fcfb8b5521bf0b307fd7178a1cb52
 DIST perl-5.14.1-1.tar.bz2 5074 SHA256 5fa81bde2e8ca4f8a9c60203d4c2d5f7d388fda648a669ae474881317cd2baee SHA512 68917dff11c9a947ec30f9de13c6192a1dc1fd40eb89e52675c2b8aea457f7ad26d7133ded41f15a8887ce81463005ff8baad12312f3fb98aa041284a32a8c4e WHIRLPOOL 27994a12db146ad0a86f07b44c88d2ba25efc42e1906018b425d0aee0b494e085c528edee1bb3400153e60e09162f5a7cf7661a299193c2f0cc57a4fe0dd92fd
 DIST perl-5.14.1.tar.bz2 13266293 SHA256 29b4a7e7c22d4a980ab9eb1ea486c5c4ee9ec533192a1ce8f3fe9ae32fb1f862 SHA512 86037dded859d1f1ef6f8d5b0255fd22a8a6d0a223b69d10eab80556305fd10955fd1021c755c7fc17345b8f1bb489d2a07cc1987e1a0d83fb983f832051c8f3 WHIRLPOOL 08de8654715409495a041242d8806ff56c91a8d8b706ab5e5ef779b5216530bb3f171959990620d9f4a0464c92ba0f8bc688ba33a3fec2342991b6800357b11b
 DIST perl-5.14.2-1.tar.bz2 5103 SHA256 0f553de072f80670880b96ef8ca0a79e4e1505f9bf1df55f6de55b95ac0862e7 SHA512 31196af4a32bd8b57b74d122d390261b129dc135ae54f35e45fe125bcab17bd6f837a094ad8d880992006304d287a3ceb74bc1168928b480a3573e80f01b52c3 WHIRLPOOL 567dd87156b56bd587210664dc537d9c964c5dba1ae54cae7d4754b0e4aa6149453650a0a97d971a771b14d50eaef624e0fa22e7428a321c78f44a85eac40dba
@ -13,5 +15,6 @@ DIST perl-5.16.0.tar.bz2 13568573 SHA256 8c1d25e92a5760e84f77baa57fde5606fd6e95e
 DIST perl-5.16.1-1.tar.bz2 13843 SHA256 829fb8facfcd527ee10e490d105049b9138a7b9367bcd9ba7677330e0c326751 SHA512 0dc6cfc9f948a523127fd36fbe8dcc5af581937ad491a7e91cc2f5cf7d4f4fdeb6b7a24346ebfa4e78f839895b4cbd6da9a6a183d816d58792060c5d73d1d6b6 WHIRLPOOL ead851b1b8ecd64165f7af152b1aec8a46e76f0caa6842b7725aea7f0ef8c5516fa9461bcedd11565c60179c0acad5b1682129277a670129bc19dd2a8706025b
 DIST perl-5.16.1.tar.bz2 13550613 SHA256 0704b1421fe50015becd32c8b7ed05843e8b6c188a8c16cb0c11d76986375fd0 SHA512 df221f3d0bf3877e4fdf724bc8c10d6d3dd6cd7d762cc164d4fe67636806831ba14d2c52d30d927b87091a1004af68f730ed6f32cd06c29af5fa42d35212415c WHIRLPOOL c46a015916d00516e458e4c4c20a31f8c4c2d983d1a74fa73ce6721d6bce9321c2c2f4b5ac3e4caeda4db07d629e55d06c6bdb26233e8e95d3e95a5643d1d198
 DIST perl-5.16.2-2.tar.bz2 16830 SHA256 ee5131e8d3671ad03a39f9e729efea7750a3342aba950f9555efdd5ba8d81d40 SHA512 799e8c8b3cffbad9a2fd606ab610d23da8ca4d83e4f5d782596d5c86a127da54d2506564f7fac7479542802dfc835c8a0d6a5576e8a6fff3a44f9fc0706ed4b3 WHIRLPOOL cabd3be774144870fff0e37f78070d64f00e311c05be85386396cfa53a8964abf017560d87833fa223d87fad700dfc4831f9a4210d5e2ccc6c3462689c9dd0a9
+DIST perl-5.16.2-3.tar.bz2 18740 SHA256 830a6f444c2977c9dd8a0a4baa5be470b0019158e6c64448416afd10f2b73ca7 SHA512 d0da32a7ea8950d58aa50a74b5369df621885f4d5c26b65cee9070529f4679c63e19c8fcc880b31d913cfb1859ec8032ce6c80e21938fa621afeda571c116d44 WHIRLPOOL 55b4823423b4d88b9fba0fc9e9cc50bbce7c31c06563ebf97f6a44ee99f6e0d33ad7d6a400152e7e31e377dd5efb210f9d1906e234efe43477bf954f63182f38
 DIST perl-5.16.2.tar.bz2 13725101 SHA256 5ba91d9aa40220c615b644bb48fa5df7fbca4afb1c9e911bdc0ce2a93f072d7d SHA512 b2a0eac73ce57ca9b83622eaee64cdbfc69011ff4dc54d5e6193e9a218117f33963ac56a30fc2baa7a76504868bfa5f00dd5ba25ece1ac70fe3a7a454898764b WHIRLPOOL e634c29edb00676023e906d65a9ace8cbee6aed43c6551d119a0b59f4f1be15f2f9d8b1417cc22b3bae5a0f3706d1aecccd2815edc7f341a4301be969e024203
 DIST perl-5.8.8.tar.bz2 10123359 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9 SHA512 45d8d6ffe5f28b71bd279e17e82eb60a97e2372e896ad5c1233a88d3cf092dc37ba74a450413a689600f8a17f53969600fc6e45a6e2a051471f9fde86bd635f7 WHIRLPOOL 0f50fa3b0785932ce30df64881c57b15ef098fb7cb8f6ad2a850e3642e7be589b3dc61e7ae9e07b44eacbfec262e0f869b26dbf6f704d302eb700fb2e158d380
--- a/dev-lang/perl/files/perl-5.12.5-rehash-5.12.5.patch
+++ b/dev-lang/perl/files/perl-5.12.5-rehash-5.12.5.patch
@ -0,0 +1,164 @@
+From f2a571dae7d70f7e3b59022834d8003ecd2df884 Mon Sep 17 00:00:00 2001
+From: Yves Orton <demerphq@gmail.com>
+Date: Tue, 12 Feb 2013 10:53:05 +0100
+Subject: [PATCH] Prevent premature hsplit() calls, and only trigger REHASH
+ after hsplit()
+
+Triggering a hsplit due to long chain length allows an attacker
+to create a carefully chosen set of keys which can cause the hash
+to use 2 * (2**32) * sizeof(void *) bytes ram. AKA a DOS via memory
+exhaustion. Doing so also takes non trivial time.
+
+Eliminating this check, and only inspecting chain length after a
+normal hsplit() (triggered when keys>buckets) prevents the attack
+entirely, and makes such attacks relatively benign.
+
+(cherry picked from commit f1220d61455253b170e81427c9d0357831ca0fac)
+---
+ ext/Hash-Util-FieldHash/t/10_hash.t | 18 ++++++++++++++++--
+ hv.c                                | 26 ++++++--------------------
+ t/op/hash.t                         | 20 +++++++++++++++++---
+ 3 files changed, 39 insertions(+), 25 deletions(-)
+
+diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
+index 2cfb4e8..d58f053 100644
+--- a/ext/Hash-Util-FieldHash/t/10_hash.t
+++ b/ext/Hash-Util-FieldHash/t/10_hash.t
+@@ -38,15 +38,29 @@ use constant START     => "a";
+ 
+ # some initial hash data
+ fieldhash my %h2;
+-%h2 = map {$_ => 1} 'a'..'cc';
+my $counter= "a";
+$h2{$counter++}++ while $counter ne 'cd';
+ 
+ ok (!Internals::HvREHASH(%h2), 
+     "starting with pre-populated non-pathological hash (rehash flag if off)");
+ 
+ my @keys = get_keys(\%h2);
+my $buckets= buckets(\%h2);
+ $h2{$_}++ for @keys;
+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
+ ok (Internals::HvREHASH(%h2), 
+-    scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
+    scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
+
+# returns the number of buckets in a hash
+sub buckets {
+    my $hr = shift;
+    my $keys_buckets= scalar(%$hr);
+    if ($keys_buckets=~m!/([0-9]+)\z!) {
+        return 0+$1;
+    } else {
+        return 8;
+    }
+}
+ 
+ sub get_keys {
+     my $hr = shift;
+diff --git a/hv.c b/hv.c
+index 89c6456..8659678 100644
+--- a/hv.c
+++ b/hv.c
+@@ -35,7 +35,8 @@ holds the key and hash value.
+ #define PERL_HASH_INTERNAL_ACCESS
+ #include "perl.h"
+ 
+-#define HV_MAX_LENGTH_BEFORE_SPLIT 14
+#define HV_MAX_LENGTH_BEFORE_REHASH 14
+#define SHOULD_DO_HSPLIT(xhv) ((xhv)->xhv_keys > (xhv)->xhv_max) /* HvTOTALKEYS(hv) > HvMAX(hv) */
+ 
+ static const char S_strtab_error[]
+     = "Cannot modify shared string table in hv_%s";
+@@ -818,23 +819,8 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
+ 	xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
+ 	if (!counter) {				/* initial entry? */
+ 	    xhv->xhv_fill++; /* HvFILL(hv)++ */
+-	} else if (xhv->xhv_keys > (IV)xhv->xhv_max) {
+	} else if ( SHOULD_DO_HSPLIT(xhv) ) {
+ 	    hsplit(hv);
+-	} else if(!HvREHASH(hv)) {
+-	    U32 n_links = 1;
+-
+-	    while ((counter = HeNEXT(counter)))
+-		n_links++;
+-
+-	    if (n_links > HV_MAX_LENGTH_BEFORE_SPLIT) {
+-		/* Use only the old HvKEYS(hv) > HvMAX(hv) condition to limit
+-		   bucket splits on a rehashed hash, as we're not going to
+-		   split it again, and if someone is lucky (evil) enough to
+-		   get all the keys in one list they could exhaust our memory
+-		   as we repeatedly double the number of buckets on every
+-		   entry. Linear search feels a less worse thing to do.  */
+-		hsplit(hv);
+-	    }
+ 	}
+     }
+ 
+@@ -1180,7 +1166,7 @@ S_hsplit(pTHX_ HV *hv)
+ 
+ 
+     /* Pick your policy for "hashing isn't working" here:  */
+-    if (longest_chain <= HV_MAX_LENGTH_BEFORE_SPLIT /* split worked?  */
+    if (longest_chain <= HV_MAX_LENGTH_BEFORE_REHASH /* split worked?  */
+ 	|| HvREHASH(hv)) {
+ 	return;
+     }
+@@ -2551,8 +2537,8 @@ S_share_hek_flags(pTHX_ const char *str, I32 len, register U32 hash, int flags)
+ 	xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
+ 	if (!next) {			/* initial entry? */
+ 	    xhv->xhv_fill++; /* HvFILL(hv)++ */
+-	} else if (xhv->xhv_keys > (IV)xhv->xhv_max /* HvKEYS(hv) > HvMAX(hv) */) {
+-		hsplit(PL_strtab);
+	} else if ( SHOULD_DO_HSPLIT(xhv) ) {
+            hsplit(PL_strtab);
+ 	}
+     }
+ 
+diff --git a/t/op/hash.t b/t/op/hash.t
+index 9bde518..45eb782 100644
+--- a/t/op/hash.t
+++ b/t/op/hash.t
+@@ -39,22 +39,36 @@ use constant THRESHOLD => 14;
+ use constant START     => "a";
+ 
+ # some initial hash data
+-my %h2 = map {$_ => 1} 'a'..'cc';
+my %h2;
+my $counter= "a";
+$h2{$counter++}++ while $counter ne 'cd';
+ 
+ ok (!Internals::HvREHASH(%h2), 
+     "starting with pre-populated non-pathological hash (rehash flag if off)");
+ 
+ my @keys = get_keys(\%h2);
+my $buckets= buckets(\%h2);
+ $h2{$_}++ for @keys;
+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
+ ok (Internals::HvREHASH(%h2), 
+-    scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
+    scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
+
+# returns the number of buckets in a hash
+sub buckets {
+    my $hr = shift;
+    my $keys_buckets= scalar(%$hr);
+    if ($keys_buckets=~m!/([0-9]+)\z!) {
+        return 0+$1;
+    } else {
+        return 8;
+    }
+}
+ 
+ sub get_keys {
+     my $hr = shift;
+ 
+     # the minimum of bits required to mount the attack on a hash
+     my $min_bits = log(THRESHOLD)/log(2);
+-
+     # if the hash has already been populated with a significant amount
+     # of entries the number of mask bits can be higher
+     my $keys = scalar keys %$hr;
+-- 
+1.8.1.3
+
--- a/dev-lang/perl/perl-5.12.5.ebuild
+++ b/dev-lang/perl/perl-5.12.5.ebuild
@ -0,0 +1,689 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.5.ebuild,v 1.1 2013/03/04 19:51:15 tove Exp $
+
+EAPI=5
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib
+
+PATCH_VER=1
+
+PERL_OLDVERSEN="5.12.4 5.12.3 5.12.2 5.12.1 5.12.0"
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/${MY_P}.tar.bz2
+	mirror://cpan/authors/id/L/LB/LBROCARD/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2"
+#	mirror://cpan/src/${MY_P}.tar.bz2
+#	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0/${SHORT_PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb build debug doc gdbm ithreads"
+
+COMMON_DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-devel/libperl-5.10.1
+	!!<sys-devel/libperl-5.10.1
+	app-arch/bzip2
+	sys-libs/zlib"
+DEPEND="${COMMON_DEPEND}
+	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )"
+RDEPEND="${COMMON_DEPEND}"
+PDEPEND=">=app-admin/perl-cleaner-2.5"
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual_scripts perl-core/Archive-Tar        1.54      ptar ptardiff
+	src_remove_dual_scripts perl-core/Digest-SHA         5.47      shasum
+	src_remove_dual_scripts perl-core/CPAN               1.945.600 cpan
+	src_remove_dual_scripts perl-core/CPANPLUS           0.900.0   cpanp cpan2dist cpanp-run-perl
+	src_remove_dual_scripts perl-core/Encode             2.39      enc2xs piconv
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56      instmodsh
+	src_remove_dual_scripts perl-core/ExtUtils-ParseXS   2.210.0   xsubpp
+	src_remove_dual_scripts perl-core/Module-Build       0.3603    config_data
+	src_remove_dual_scripts perl-core/Module-CoreList    2.770.0   corelist
+	src_remove_dual_scripts perl-core/PodParser          1.370.0   pod2usage podchecker podselect
+	src_remove_dual_scripts perl-core/Test-Harness       3.17      prove
+	src_remove_dual_scripts perl-core/podlators          2.3.1     pod2man pod2text
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-interix*)   osname="interix" ;;
+		*)            osname="linux" ;;
+	esac
+
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch="${CHOST%%-*}-${osname}-thread"
+	else
+		myarch="${CHOST%%-*}-${osname}"
+	fi
+	if use debug ; then
+		myarch="${myarch}-debug"
+	fi
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
+	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}"
+	SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
+	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
+
+	if use ithreads ; then
+		echo ""
+		ewarn "THREADS WARNING:"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+	fi
+	if has_version "<dev-lang/perl-${SHORT_PV}" ; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl you must reinstall"
+		ewarn "the installed perl modules."
+		ewarn "Use: perl-cleaner --all"
+	elif has_version dev-lang/perl ; then
+		# doesnot work
+		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
+		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
+		if (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		   (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		   ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+			echo ""
+			ewarn "TOGGLED USE-FLAGS WARNING:"
+			ewarn "You changed one of the use-flags ithreads or debug."
+			ewarn "You must rebuild all perl-modules installed."
+			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+		fi
+	fi
+	dual_scripts
+}
+
+src_prepare_update_patchlevel_h() {
+	[[ -f ${WORKDIR}/perl-patch/series ]] || return 0
+
+	while read patch level ; do
+		sed -i -e "s/^\t,NULL$/	,\"${patch//__/_}\"\n&/" "${S}"/patchlevel.h || die
+	done < "${WORKDIR}"/perl-patch/series
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/perl-patch" \
+	EPATCH_SUFFIX="diff" \
+	EPATCH_FORCE="yes" \
+	EPATCH_OPTS="-p1" \
+	epatch
+
+	src_prepare_update_patchlevel_h
+
+	# pod/perltoc.pod fails
+	# lib/ExtUtils/t/Embed.t fails
+	if ! tc-is-static-only ; then
+		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV})
+		ln -s ${LIBPERL} libperl$(get_libname )
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.12.3-aix-soname.patch \
+		"${FILESDIR}"/${PN}-5.8.8-solaris-relocation.patch \
+		"${FILESDIR}"/${PN}-5.8.8-solaris11.patch \
+		"${FILESDIR}"/${PN}-5.10.1-cleanup-paths.patch \
+		"${FILESDIR}"/${PN}-5.8.8-usr-local.patch \
+		"${FILESDIR}"/${PN}-5.10.1-hpux.patch \
+		"${FILESDIR}"/${PN}-5.8.8-darwin-cc-ld.patch \
+		"${FILESDIR}"/${PN}-5.12.3-mint.patch \
+		"${FILESDIR}"/${PN}-5.12.3-interix.patch \
+		"${FILESDIR}"/${PN}-5.12.5-rehash-5.12.5.patch
+
+
+	# Fix build on OSX Lion (10.7)
+	sed -i -e '/^usenm=/s/true/false/' hints/darwin.sh
+
+	# rest of usr-local patch
+	sed -i \
+		-e '/^locincpth=/c\locincpth=""' \
+		-e '/^loclibpth=/c\loclibpth=""' \
+		-e '/^glibpth=.*\/local\//s: /usr/local/lib.*":":' \
+		Configure || die
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	use sparc && myconf -Ud_longdbl
+
+	# 266337
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EPREFIX}/usr/include
+	export BZIP2_LIB=${EPREFIX}/usr/$(get_libdir)
+	cat <<-EOF > "${S}/cpan/Compress-Raw-Zlib/config.in"
+		BUILD_ZLIB = False
+		INCLUDE = ${EPREFIX}/usr/include
+		LIB = ${EPREFIX}/usr/$(get_libdir)
+
+		OLD_ZLIB = False
+		GZIP_OS_CODE = AUTO_DETECT
+	EOF
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm ; then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	if [[ -n ${PERL_OLDVERSEN} ]] ; then
+		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
+		myconf -Dinc_version_list="$inclist"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		local ldir
+		local llib
+		local paths=""
+		echo "int main() {}" > "${T}"/t.c
+		# need to ensure dirs contain compatible libs, bug #358875
+		for ldir in /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib ; do
+			[[ -d ${ldir} ]] || continue
+			# look for libc, which should be somewhere
+			llib=${ldir}/libc$(get_libname)
+			[[ -e ${llib} ]] || continue
+			if $(tc-getCC) -o "${T}"/t "${T}"/t.c ${llib} >& /dev/null ; then
+				ldir=${ldir#/usr}
+				paths="${ldir} /usr${ldir}"
+				break
+			fi
+		done
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths:-/lib /usr/lib}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	myconf -Dnoextensions=ODBM_File
+
+	sh Configure \
+		-des \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dinstallprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Dinstallusrbinperl='n' \
+		-Ud_csh \
+		-Uusenm \
+		"${myconf[@]}" || die "Unable to configure"
+}
+
+src_compile() {
+	# bug 331113
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
+		make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+#	# Fix for "stupid" modules and programs
+#	dodir ${SITE_ARCH} ${SITE_LIB}
+#	keepdir "${VENDOR_ARCH}" #338802 for enc2xs
+
+	local installtarget=install
+	if use build ; then
+		installtarget=install.perl
+	fi
+	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
+
+	rm -f "${ED}"/usr/bin/perl
+	ln -s perl${MY_PV} "${ED}"/usr/bin/perl
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"/${coredir}/${LIBPERL} || die
+		dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
+		rm -f "${ED}"/${coredir}/${LIBPERL}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+#	# A poor fix for the miniperl issues
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+#	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+#	fperms 0755 /usr/bin/xsubpp
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	find "${ED}" -type f -name .packlist -delete || die
+
+	# Note: find out from psm why we would need/want this.
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
+	#	find "${ED}" -name "*NDBM*" | xargs rm -f
+
+	dodoc Changes* README AUTHORS || die
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+
+	if use build ; then
+		src_remove_extra_files
+	fi
+
+	dual_scripts
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+		if ! use build ; then
+			ebegin "Generating ConfigLocal.pm (ignore any error)"
+			enc2xs -C
+		fi
+
+		einfo "Converting C header files to the corresponding Perl format (ignore any error)"
+		# Prefix note: unprefixed as this is all kernel/libc stuff that we never provide
+		pushd /usr/include >/dev/null
+			h2ph -Q -a -d "${EPREFIX}"${ARCH_LIB} \
+				asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
+				sys/socket.h sys/time.h wait.h sysexits.h
+		popd >/dev/null
+
+# This has been moved into a function because rumor has it that a future release
+# of portage will allow us to check what version was just removed - which means
+# we will be able to invoke this only as needed :)
+		# Tried doing this via  -z, but $INC is too big...
+		#if [[ "${INC}x" != "x" ]]; then
+		#	cleaner_msg
+		#fi
+	fi
+}
+
+pkg_postrm(){
+	dual_scripts
+
+#	if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
+#		ebegin "Removing ConfigLocal.pm"
+#		rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
+#	fi
+}
+
+cleaner_msg() {
+	eerror "You have had multiple versions of perl. It is recommended"
+	eerror "that you run perl-cleaner now. perl-cleaner will"
+	eerror "assist with this transition. This script is capable"
+	eerror "of cleaning out old .ph files, rebuilding modules for "
+	eerror "your new version of perl, as well as re-emerging"
+	eerror "applications that compiled against your old libperl$(get_libname)"
+	eerror
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run perl-cleaner and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+}
+
+src_remove_dual_scripts() {
+
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
+		for i in "$@" ; do
+			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+			if [[ ${i} != cpanp-run-perl ]] ; then
+				ff=`echo ${EROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
+				ff=${ff##*.1}
+				alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+			fi
+		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f ${EROOT}/usr/bin/${i} && ! -h ${EROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
+	else
+		for i in "$@" ; do
+			if ! [[ -f "${ED}"/usr/bin/${i} ]] ; then
+				use build || ewarn "/usr/bin/${i} does not exist!"
+				continue
+			fi
+			mv "${ED}"/usr/bin/${i}{,-${ver}-${P}} || die
+			if [[ -f ${ED}/usr/share/man/man1/${i}.1 ]] ; then
+				mv "${ED}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die
+			else
+				echo "/usr/share/man/man1/${i}.1 does not exist!"
+			fi
+		done
+	fi
+}
+
+src_remove_extra_files() {
+	local prefix="./usr" # ./ is important
+	local bindir="${prefix}/bin"
+	local libdir="${prefix}/$(get_libdir)"
+
+	# I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
+	# Then, I added several files to get GNU autotools running
+	# FIXME: should this be in a separated file to be sourced?
+	local MINIMAL_PERL_INSTALL="
+	${bindir}/h2ph
+	${bindir}/perl
+	${bindir}/perl${MY_PV}
+	${bindir}/pod2man
+	${libdir}/${LIBPERL}
+	${libdir}/libperl$(get_libname)
+	${libdir}/libperl$(get_libname ${SHORT_PV})
+	.${PRIV_LIB}/AutoLoader.pm
+	.${PRIV_LIB}/B/Deparse.pm
+	.${PRIV_LIB}/Carp.pm
+	.${PRIV_LIB}/Carp/Heavy.pm
+	.${PRIV_LIB}/Class/Struct.pm
+	.${PRIV_LIB}/DirHandle.pm
+	.${PRIV_LIB}/Exporter.pm
+	.${PRIV_LIB}/Exporter/Heavy.pm
+	.${PRIV_LIB}/ExtUtils/Command.pm
+	.${PRIV_LIB}/ExtUtils/Command/MM.pm
+	.${PRIV_LIB}/ExtUtils/Constant.pm
+	.${PRIV_LIB}/ExtUtils/Constant/Base.pm
+	.${PRIV_LIB}/ExtUtils/Constant/Utils.pm
+	.${PRIV_LIB}/ExtUtils/Constant/XS.pm
+	.${PRIV_LIB}/ExtUtils/Embed.pm
+	.${PRIV_LIB}/ExtUtils/Install.pm
+	.${PRIV_LIB}/ExtUtils/Installed.pm
+	.${PRIV_LIB}/ExtUtils/Liblist.pm
+	.${PRIV_LIB}/ExtUtils/Liblist/Kid.pm
+	.${PRIV_LIB}/ExtUtils/MM.pm
+	.${PRIV_LIB}/ExtUtils/MM_Any.pm
+	.${PRIV_LIB}/ExtUtils/MM_MacOS.pm
+	.${PRIV_LIB}/ExtUtils/MM_Unix.pm
+	.${PRIV_LIB}/ExtUtils/MY.pm
+	.${PRIV_LIB}/ExtUtils/MakeMaker.pm
+	.${PRIV_LIB}/ExtUtils/Manifest.pm
+	.${PRIV_LIB}/ExtUtils/Miniperl.pm
+	.${PRIV_LIB}/ExtUtils/Mkbootstrap.pm
+	.${PRIV_LIB}/ExtUtils/Mksymlists.pm
+	.${PRIV_LIB}/ExtUtils/Packlist.pm
+	.${PRIV_LIB}/ExtUtils/testlib.pm
+	.${PRIV_LIB}/File/Basename.pm
+	.${PRIV_LIB}/File/Compare.pm
+	.${PRIV_LIB}/File/Copy.pm
+	.${PRIV_LIB}/File/Find.pm
+	.${PRIV_LIB}/File/Path.pm
+	.${PRIV_LIB}/File/stat.pm
+	.${PRIV_LIB}/FileHandle.pm
+	.${PRIV_LIB}/Getopt/Long.pm
+	.${PRIV_LIB}/Getopt/Std.pm
+	.${PRIV_LIB}/IPC/Open2.pm
+	.${PRIV_LIB}/IPC/Open3.pm
+	.${PRIV_LIB}/PerlIO.pm
+	.${PRIV_LIB}/Pod/InputObjects.pm
+	.${PRIV_LIB}/Pod/Man.pm
+	.${PRIV_LIB}/Pod/ParseLink.pm
+	.${PRIV_LIB}/Pod/Parser.pm
+	.${PRIV_LIB}/Pod/Select.pm
+	.${PRIV_LIB}/Pod/Text.pm
+	.${PRIV_LIB}/Pod/Usage.pm
+	.${PRIV_LIB}/SelectSaver.pm
+	.${PRIV_LIB}/Symbol.pm
+	.${PRIV_LIB}/Text/ParseWords.pm
+	.${PRIV_LIB}/Text/Tabs.pm
+	.${PRIV_LIB}/Text/Wrap.pm
+	.${PRIV_LIB}/Tie/Hash.pm
+	.${PRIV_LIB}/Time/Local.pm
+	.${PRIV_LIB}/XSLoader.pm
+	.${PRIV_LIB}/autouse.pm
+	.${PRIV_LIB}/base.pm
+	.${PRIV_LIB}/bigint.pm
+	.${PRIV_LIB}/bignum.pm
+	.${PRIV_LIB}/bigrat.pm
+	.${PRIV_LIB}/blib.pm
+	.${PRIV_LIB}/bytes.pm
+	.${PRIV_LIB}/bytes_heavy.pl
+	.${PRIV_LIB}/charnames.pm
+	.${PRIV_LIB}/constant.pm
+	.${PRIV_LIB}/diagnostics.pm
+	.${PRIV_LIB}/fields.pm
+	.${PRIV_LIB}/filetest.pm
+	.${PRIV_LIB}/if.pm
+	.${PRIV_LIB}/integer.pm
+	.${PRIV_LIB}/less.pm
+	.${PRIV_LIB}/locale.pm
+	.${PRIV_LIB}/open.pm
+	.${PRIV_LIB}/overload.pm
+	.${PRIV_LIB}/sigtrap.pm
+	.${PRIV_LIB}/sort.pm
+	.${PRIV_LIB}/stat.pl
+	.${PRIV_LIB}/strict.pm
+	.${PRIV_LIB}/subs.pm
+	.${PRIV_LIB}/unicore/To/Fold.pl
+	.${PRIV_LIB}/unicore/To/Lower.pl
+	.${PRIV_LIB}/unicore/To/Upper.pl
+	.${PRIV_LIB}/utf8.pm
+	.${PRIV_LIB}/utf8_heavy.pl
+	.${PRIV_LIB}/vars.pm
+	.${PRIV_LIB}/vmsish.pm
+	.${PRIV_LIB}/warnings
+	.${PRIV_LIB}/warnings.pm
+	.${PRIV_LIB}/warnings/register.pm
+	.${ARCH_LIB}/B.pm
+	.${ARCH_LIB}/CORE/libperl$(get_libname)
+	.${ARCH_LIB}/Config.pm
+	.${ARCH_LIB}/Config_heavy.pl
+	.${ARCH_LIB}/Cwd.pm
+	.${ARCH_LIB}/Data/Dumper.pm
+	.${ARCH_LIB}/DynaLoader.pm
+	.${ARCH_LIB}/Errno.pm
+	.${ARCH_LIB}/Fcntl.pm
+	.${ARCH_LIB}/File/Glob.pm
+	.${ARCH_LIB}/File/Spec.pm
+	.${ARCH_LIB}/File/Spec/Unix.pm
+	.${ARCH_LIB}/IO.pm
+	.${ARCH_LIB}/IO/File.pm
+	.${ARCH_LIB}/IO/Handle.pm
+	.${ARCH_LIB}/IO/Pipe.pm
+	.${ARCH_LIB}/IO/Seekable.pm
+	.${ARCH_LIB}/IO/Select.pm
+	.${ARCH_LIB}/IO/Socket.pm
+	.${ARCH_LIB}/IO/Socket/INET.pm
+	.${ARCH_LIB}/IO/Socket/UNIX.pm
+	.${ARCH_LIB}/List/Util.pm
+	.${ARCH_LIB}/NDBM_File.pm
+	.${ARCH_LIB}/POSIX.pm
+	.${ARCH_LIB}/Scalar/Util.pm
+	.${ARCH_LIB}/Socket.pm
+	.${ARCH_LIB}/Storable.pm
+	.${ARCH_LIB}/attributes.pm
+	.${ARCH_LIB}/auto/Cwd/Cwd$(get_libname)
+	.${ARCH_LIB}/auto/Data/Dumper/Dumper$(get_libname)
+	.${ARCH_LIB}/auto/DynaLoader/dl_findfile.al
+	.${ARCH_LIB}/auto/Fcntl/Fcntl$(get_libname)
+	.${ARCH_LIB}/auto/File/Glob/Glob$(get_libname)
+	.${ARCH_LIB}/auto/IO/IO$(get_libname)
+	.${ARCH_LIB}/auto/POSIX/POSIX$(get_libname)
+	.${ARCH_LIB}/auto/POSIX/autosplit.ix
+	.${ARCH_LIB}/auto/POSIX/fstat.al
+	.${ARCH_LIB}/auto/POSIX/load_imports.al
+	.${ARCH_LIB}/auto/POSIX/stat.al
+	.${ARCH_LIB}/auto/POSIX/tmpfile.al
+	.${ARCH_LIB}/auto/Socket/Socket$(get_libname)
+	.${ARCH_LIB}/auto/Storable/Storable$(get_libname)
+	.${ARCH_LIB}/auto/Storable/_retrieve.al
+	.${ARCH_LIB}/auto/Storable/_store.al
+	.${ARCH_LIB}/auto/Storable/autosplit.ix
+	.${ARCH_LIB}/auto/Storable/retrieve.al
+	.${ARCH_LIB}/auto/Storable/store.al
+	.${ARCH_LIB}/auto/re/re$(get_libname)
+	.${ARCH_LIB}/encoding.pm
+	.${ARCH_LIB}/lib.pm
+	.${ARCH_LIB}/ops.pm
+	.${ARCH_LIB}/re.pm
+	.${ARCH_LIB}/threads.pm
+"
+
+	pushd "${ED}" > /dev/null
+	# Remove cruft
+	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_INSTALL}"
+	for f in $(find . -type f ) ; do
+		has "${f}" ${MINIMAL_PERL_INSTALL} || rm -f "${f}"
+	done
+	# Remove empty directories
+	find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+	#for f in ${MINIMAL_PERL_INSTALL} ; do
+	#	[[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL"
+	#done
+	popd > /dev/null
+}
--- a/dev-lang/perl/perl-5.16.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.16.2-r1.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.16.2-r1.ebuild,v 1.1 2013/03/04 19:51:15 tove Exp $
+
+EAPI=5
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=3
+
+PERL_OLDVERSEN="5.16.1 5.16.0"
+MODULE_AUTHOR=RJBS
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/${MY_P}.tar.bz2
+	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2
+"
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SHORT_PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb build debug doc gdbm ithreads"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+"
+PDEPEND=">=app-admin/perl-cleaner-2.5"
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        1.820.0      ptar ptardiff ptargrep
+	src_remove_dual      perl-core/Digest-SHA         5.710.0      shasum
+	src_remove_dual      perl-core/CPAN               1.980.0      cpan
+	src_remove_dual      perl-core/CPANPLUS           0.912.100    cpanp cpan2dist
+	src_remove_dual_file perl-core/CPANPLUS           0.912.100    /usr/bin/cpanp-run-perl
+	src_remove_dual      perl-core/Encode             2.440.0      enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 6.630.200_rc instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.160.0      xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.48.0       zipdetails
+	src_remove_dual      perl-core/JSON-PP            2.272.0      json_pp
+	src_remove_dual      perl-core/Module-Build       0.390.100_rc config_data
+	src_remove_dual      perl-core/Module-CoreList    2.760.0      corelist
+	src_remove_dual      perl-core/PodParser          1.510.0      pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        1.170.0      perldoc
+	src_remove_dual      perl-core/Test-Harness       3.230.0      prove
+	src_remove_dual      perl-core/podlators          2.4.0        pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          2.4.0        /usr/share/man/man1/perlpodstyle.1
+}
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+#src_unpack()	{ eblit-run src_unpack    v50160001 ; }
+src_prepare()	{ eblit-run src_prepare   v50160001 ; }
+src_configure()	{ eblit-run src_configure v50160001 ; }
+#src_compile()	{ eblit-run src_compile   v50160001 ; }
+src_test()		{ eblit-run src_test      v50160001 ; }
+src_install()	{ eblit-run src_install   v50160001 ; }
+
+# FILESDIR might not be available during binpkg install
+# FIXME: version passing
+for x in setup {pre,post}{inst,rm} ; do
+	e="${FILESDIR}/eblits/pkg_${x}-v50160001.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} v50160001 ; }"
+	fi
+done
--- a/dev-lang/v8/v8-3.17.5.ebuild
+++ b/dev-lang/v8/v8-3.17.5.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/v8/v8-3.17.5.ebuild,v 1.1 2013/03/01 18:34:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.17.5.ebuild,v 1.2 2013/03/05 01:11:50 phajdan.jr Exp $

 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@ -15,9 +15,11 @@ LICENSE="BSD"
 soname_version="$(get_version_component_range 1-3)"
 SLOT="0/${soname_version}"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE=""
+IUSE="readline"

-DEPEND="${PYTHON_DEPS}"
+RDEPEND="readline? ( sys-libs/readline:0 )"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"

 src_configure() {
 	tc-export AR CC CXX RANLIB
@ -42,8 +44,11 @@ src_configure() {
 	esac
 	mytarget=${myarch}.release

-	# TODO: Add console=readline option once implemented upstream
-	# http://code.google.com/p/v8/issues/detail?id=1781
+	if use readline; then
+		console=readline
+	else
+		console=dumb
+	fi

 	# Generate the real Makefile.
 	emake V=1 \
@ -52,6 +57,7 @@ src_configure() {
 		soname_version=${soname_version} \
 		snapshot=on \
 		hardfp=${hardfp} \
+		console=${console} \
 		out/Makefile.${myarch} || die
 }

--- a/dev-lang/v8/v8-9999.ebuild
+++ b/dev-lang/v8/v8-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.36 2013/02/18 16:59:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.37 2013/03/05 01:11:50 phajdan.jr Exp $

 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@ -14,9 +14,11 @@ LICENSE="BSD"

 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="readline"

-DEPEND="${PYTHON_DEPS}"
+RDEPEND="readline? ( sys-libs/readline:0 )"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"

 src_unpack() {
 	subversion_src_unpack
@ -50,8 +52,11 @@ src_configure() {
 	subversion_wc_info
 	soname_version="${PV}.${ESVN_WC_REVISION}"

-	# TODO: Add console=readline option once implemented upstream
-	# http://code.google.com/p/v8/issues/detail?id=1781
+	if use readline; then
+		console=readline
+	else
+		console=dumb
+	fi

 	# Generate the real Makefile.
 	emake V=1 \
@ -60,6 +65,7 @@ src_configure() {
 		soname_version=${soname_version} \
 		snapshot=on \
 		hardfp=${hardfp} \
+		console=${console} \
 		out/Makefile.${myarch} || die
 }

--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/metadata.xml
@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>bugs@bergstroem.nu</email>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
-    </maintainer>
-    <maintainer>
-        <email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
-    </maintainer>
+	</maintainer>
 </pkgmetadata>
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@ -1,2 +1,3 @@
 DIST protobuf-2.4.0a.tar.bz2 1508837 SHA256 cef863023fb051b0f7e8f47b53fe57f7277a7743d644eae9563fb14db5bd7e4e SHA512 c099f75983a79a4fdc2c3bf44e748074000903fe89e65a74caebe191dbb46da01b3b023b5f4f1fec86f35f15c16d5863cad102ebc0c975f4c4662ab64694d9db WHIRLPOOL 5fe8b4aadefceadfcf42aee54d4133ada2c52a9f4e90e0cbe8ba1a92c887bc12c4e9eec6b2df68ab252dbe9358a85a789804c0d1f5612d62e6c03ebf380c5100
 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e
+DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
--- a/dev-libs/protobuf/protobuf-2.5.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.1 2013/03/05 05:21:45 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="source"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools eutils distutils-r1 java-pkg-opt-2 elisp-common
+
+DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
+HOMEPAGE="http://code.google.com/p/protobuf/"
+SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0/8" # subslot = soname major version
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x64-macos ~x86-linux"
+IUSE="emacs examples java python static-libs vim-syntax"
+
+DEPEND="java? ( >=virtual/jdk-1.5 )
+	emacs? ( virtual/emacs )"
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	emacs? ( virtual/emacs )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
+	eautoreconf
+
+	if use python; then
+		cd python && distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		einfo "Compiling Python library ..."
+		pushd python >/dev/null
+		distutils-r1_src_compile
+		popd >/dev/null
+	fi
+
+	if use java; then
+		einfo "Compiling Java library ..."
+		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
+		mkdir java/build
+		pushd java/src/main/java >/dev/null
+		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
+		popd >/dev/null
+		jar cf ${PN}.jar -C java/build . || die "jar failed"
+	fi
+
+	if use emacs; then
+		elisp-compile "${S}"/editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	emake check
+
+	if use python; then
+		pushd python >/dev/null
+		distutils-r1_src_test
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
+	prune_libtool_files
+
+	if use python; then
+		pushd python >/dev/null
+		distutils-r1_src_install
+		popd >/dev/null
+	fi
+
+	if use java; then
+		java-pkg_dojar ${PN}.jar
+		use source && java-pkg_dosrc java/src/main/java/*
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins editors/proto.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/proto.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
@ -0,0 +1 @@
+DIST os_diskconfig_python_novaclient_ext-0.1.1.tar.gz 2013 SHA256 1edcb7b39070b773f5d3cef015906dfd257e80e7116bf613770e748ed469f1ca SHA512 0b71de275c1909455909c3e1c4b2a09f69ddfa3970e79ef0e77783b61737997e470038970dd1e1eea22d2a7f3ee1cbf899dcdc0672f8d0f220ce68c4a6e629b2 WHIRLPOOL a573e9949e49ef6fec509e8e75f366b5ec1a502b98437b4464784ad017153499731e930468011aecdc61104c966c5c226bee7d42ef9910e3638b2fb9f09d8c5c
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Disk Config extension for python-novaclient
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.1.ebuild
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.1.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.1.ebuild,v 1.1 2013/03/04 20:03:45 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_diskconfig_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_diskconfig_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild,v 1.1 2013/03/04 20:03:46 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/os_diskconfig_python_novaclient_ext.git
+	https://github.com/rackspace/os_diskconfig_python_novaclient_ext.git"
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_diskconfig_python_novaclient_ext"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}/os_diskconfig_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/os-networksv2-python-novaclient-ext/Manifest
+++ b/dev-python/os-networksv2-python-novaclient-ext/Manifest
@ -0,0 +1 @@
+DIST os_networksv2_python_novaclient_ext-0.21.tar.gz 2171 SHA256 2598aaaf19a6897be8427a402bb10b772178ed3c8922d9d955fa411ed8ec11a8 SHA512 077549d05addcdaedf9ea07f3fd15cc35f0282602cd46406666ce3a395ce5ca00f48fe70ac64269998bcf661f3e220115ed497abf0d78688f0d9d8a78297db0c WHIRLPOOL fee01e4c71ef57e02efe0ba216b00cf22be3b637515eccf87e7fbccc84a1622926cb2445c520d6faaafe83dfc0955bac6bd13edef7c091d1b19762c8738e0c83
--- a/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
+++ b/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds network extension support to python-novaclient
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.21.ebuild
+++ b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.21.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.21.ebuild,v 1.1 2013/03/04 20:23:54 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds network extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_networksv2_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_networksv2_python_novaclient_ext/os_networksv2_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_networksv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-9999.ebuild
+++ b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-9999.ebuild,v 1.1 2013/03/04 20:23:54 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/os_networksv2_python_novaclient_ext.git
+	https://github.com/rackspace/os_networksv2_python_novaclient_ext.git"
+
+DESCRIPTION="Adds network extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_networksv2_python_novaclient_ext"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}/os_networksv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/pyrax/Manifest
+++ b/dev-python/pyrax/Manifest
@ -0,0 +1,2 @@
+DIST pyrax-1.3.0.tar.gz 147798 SHA256 9ecbc4a3a6303cc590e2ffb97582b6f4dbd75f00a16e1e15cfd4c727d2772119 SHA512 eb499c76d1537559128b6a6515e8b49d5330dc4d9125b992d876cd1960cde9fa24c247809926b39e67e4362c2dbda72e38eb67abd8f8d456fc1be730e305577b WHIRLPOOL c741d4e59aff9833a8ac23ee8bc6623bca1d0f4dd006f9fd6e8881b4fe6284bc726b3f6674fd201122cd66ff3ce79caa2d2c0c526b83ded948620d289801a6d1
+DIST pyrax-1.3.1.tar.gz 147880 SHA256 9718d1086738aaa69fae94d6cfcedf488bd83f632f5a0c1fd86209e2ec570ad6 SHA512 5dbece21640e6145b5232b7415096614c8fcf65fc864588115b46d3c531df0dc495c3d0dcc22894ecdc0971b82b92a244795da6a78a70a16d0103eefcc4b3012 WHIRLPOOL e7715e300abe026a2d32ffab2184ad7342f8c6ad50e38f5fbe09bec662842e8b44e971ee9267c6c9d34f6fc047c89d7e1740f4d4cd5b60a83bab83928a0651f2
--- a/dev-python/pyrax/metadata.xml
+++ b/dev-python/pyrax/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python SDK for OpenStack/Rackspace APIs
+	pyrax should work with most OpenStack-based cloud deployments,
+	though it specifically targets the Rackspace public cloud.
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/pyrax/pyrax-1.3.0.ebuild
+++ b/dev-python/pyrax/pyrax-1.3.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/dev-python/pyrax/pyrax-1.3.0.ebuild,v 1.1 2013/03/04 20:37:29 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SDK for OpenStack/Rackspace APIs"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (	dev-python/mock
+				>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+				dev-python/python-swiftclient[${PYTHON_USEDEP}]
+				virtual/python-unittest2[${PYTHON_USEDEP}] )"
+RDEPEND="
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/prettytable
+		>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" setup.py nosetests || die
+}
--- a/dev-python/pyrax/pyrax-1.3.1.ebuild
+++ b/dev-python/pyrax/pyrax-1.3.1.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-python/pyrax/pyrax-1.3.1.ebuild,v 1.1 2013/03/04 20:42:51 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SDK for OpenStack/Rackspace APIs"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (	dev-python/mock
+				>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+				dev-python/python-swiftclient[${PYTHON_USEDEP}]
+				virtual/python-unittest2[${PYTHON_USEDEP}] )"
+RDEPEND="
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/prettytable
+		>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" setup.py nosetests || die
+}
--- a/dev-python/pyrax/pyrax-9999.ebuild
+++ b/dev-python/pyrax/pyrax-9999.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrax/pyrax-9999.ebuild,v 1.1 2013/03/04 20:37:29 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/${PN}.git
+	https://github.com/rackspace/${PN}.git"
+
+DESCRIPTION="Python SDK for OpenStack/Rackspace APIs"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? (	dev-python/mock
+				>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+				dev-python/python-swiftclient[${PYTHON_USEDEP}]
+				virtual/python-unittest2[${PYTHON_USEDEP}] )"
+RDEPEND="
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/prettytable
+		>=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" setup.py nosetests || die
+}
--- a/dev-python/rackspace-auth-openstack/Manifest
+++ b/dev-python/rackspace-auth-openstack/Manifest
@ -0,0 +1 @@
+DIST rackspace-auth-openstack-1.0.tar.gz 6583 SHA256 3ab3de4e3d25a5b5f6014a9c74763f65859d4425cb96c46e5916e7e9718a0791 SHA512 47ef81a4f14e8bed8823a04d1a894e380a86d24b176d49f7d9f076d21f00f489f7851ed390ce4e62399e74e1f39a0c4d242b3f6f4e6c8da54ad7516778c03f1b WHIRLPOOL 8782b023d7ae20686a6f75bd77db2763b6055a33628374c71757f5d97916b0f3d09f688b8407f14909b6d3627133ef31275a9fdbf578c3aa9c4688b153935c33
--- a/dev-python/rackspace-auth-openstack/metadata.xml
+++ b/dev-python/rackspace-auth-openstack/metadata.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a plugin for OpenStack Clients which provides client support for
+	Rackspace authentication extensions to OpenStack.
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.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-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild,v 1.1 2013/03/04 19:38:25 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rackspace Auth Plugin for OpenStack Clients"
+HOMEPAGE="https://github.com/emonty/rackspace-auth-openstack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild,v 1.1 2013/03/04 19:38:25 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/emonty/${PN}.git
+	https://github.com/emonty/${PN}.git"
+
+DESCRIPTION="Rackspace Auth Plugin for OpenStack Clients"
+HOMEPAGE="https://github.com/emonty/rackspace-auth-openstack"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
--- a/dev-python/rackspace-novaclient/Manifest
+++ b/dev-python/rackspace-novaclient/Manifest
@ -0,0 +1 @@
+DIST rackspace-novaclient-1.2.tar.gz 1462 SHA256 c7d99bf26f89e6b7c827ba8a0253a3a06c53c2d31558968b85959bf9b5925cd5 SHA512 4a83e5beb685e3bfd3a7f85ca0a93e9112b2572bbeff8a3c8f1a417256071b894dbf8525a0ba054ad7b89c79708c5b18c9b32464f725edf73b5cb2756c1fbb28 WHIRLPOOL ec4b5b821ac16be8a44dd439209138505aae2530a743d4222afc20c7b5dc76e53f1a436e163ba08b153a17b56fc1af475663f82e5e7db6a35c87e6c984b94e2b
--- a/dev-python/rackspace-novaclient/metadata.xml
+++ b/dev-python/rackspace-novaclient/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Metapackage to install python-novaclient and Rackspace extensions
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/rackspace-novaclient/rackspace-novaclient-1.2.ebuild
+++ b/dev-python/rackspace-novaclient/rackspace-novaclient-1.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-novaclient/rackspace-novaclient-1.2.ebuild,v 1.1 2013/03/04 20:33:07 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/rackspace/rackspace-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-novaclient[${PYTHON_USEDEP}]
+		dev-python/rackspace-auth-openstack[${PYTHON_USEDEP}]
+		dev-python/os-diskconfig-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/rax-backup-schedule-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/os-networksv2-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/rax-default-network-flags-python-novaclient-ext[${PYTHON_USEDEP}]"
--- a/dev-python/rackspace-novaclient/rackspace-novaclient-9999.ebuild
+++ b/dev-python/rackspace-novaclient/rackspace-novaclient-9999.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-novaclient/rackspace-novaclient-9999.ebuild,v 1.1 2013/03/04 20:33:07 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/${PN}.git
+	https://github.com/rackspace/${PN}.git"
+
+DESCRIPTION="This is a client for the OpenStack Nova API."
+HOMEPAGE="https://github.com/rackspace/rackspace-novaclient"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-novaclient[${PYTHON_USEDEP}]
+		dev-python/rackspace-auth-openstack[${PYTHON_USEDEP}]
+		dev-python/os-diskconfig-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/rax-backup-schedule-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/os-networksv2-python-novaclient-ext[${PYTHON_USEDEP}]
+		dev-python/rax-default-network-flags-python-novaclient-ext[${PYTHON_USEDEP}]"
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/Manifest
+++ b/dev-python/rax-backup-schedule-python-novaclient-ext/Manifest
@ -0,0 +1 @@
+DIST rax_backup_schedule_python_novaclient_ext-0.1.2.tar.gz 3090 SHA256 90714932d20928e89f03a1e40c8bbe0ebf911cdf5faae9072b98eb14648363c0 SHA512 fd363e55ad4fe55962a14b29c8daebde81a564d816dc6f55a0044e47aae32a621ddf7968941a29e69256e4bbc9ca02bb44e6045aaf602bed5b87cc4a71316703 WHIRLPOOL 1405818cdae150b7b846d9e722250d8a1e08bd739764adc91680404f485e6d0182b148b1de317a3a8027a5bd50cb886ccbd95b1d45824d405f1c53c8c194a482
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/metadata.xml
+++ b/dev-python/rax-backup-schedule-python-novaclient-ext/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds backup-schedule extension support to python-novaclient.
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild
+++ b/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild,v 1.1 2013/03/04 20:14:43 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/rax_backup_schedule_python_novaclient_ext/rax_backup_schedule_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rax_backup_schedule_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild
+++ b/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild,v 1.1 2013/03/04 20:14:42 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/rax_backup_schedule_python_novaclient_ext.git
+	https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext.git"
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}/rax_backup_schedule_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
@ -0,0 +1 @@
+DIST rax_default_network_flags_python_novaclient_ext-0.1.3.tar.gz 2399 SHA256 7241364afc39f88a29996d5d6aceb0b2ba2f85ba24496d433e245db32f6905aa SHA512 d3142f7c0a6cba84e07c1dd85c26425d8f21c6f170765a175f0dec914416a72127488c7d448643a0bec37eb6cd5237d2037a390d7c4df7e5f696519f05a9d017 WHIRLPOOL 995e545ebbe9493a699b33d42b6cdc20f3da0d451007c960e97f7a58fe0305f23a0f63fff48d4bb5831334cb175678f223a47ad6474092259de08b0c479f5c00
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds instance default networks extension support to python-novaclient
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.1.3.ebuild
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.1.3.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.1.3.ebuild,v 1.1 2013/03/04 20:30:29 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_default_network_flags_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/rax_default_network_flags_python_novaclient_ext/rax_default_network_flags_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rax_default_network_flags_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-9999.ebuild
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-9999.ebuild,v 1.1 2013/03/04 20:30:29 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="git://github.com/rackspace/rax_default_network_flags_python_novaclient_ext.git
+	https://github.com/rackspace/rax_default_network_flags_python_novaclient_ext.git"
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_default_network_flags_python_novaclient_ext"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}/rax_default_network_flags_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@ -1,2 +1,3 @@
 DIST facter-1.6.0.gem 90624 SHA256 f28b45c5b05ce203c8a75fa7e39e513335244c930ee51ddd154a932e1f34d6a6 SHA512 67c027149ddd6ef56903393495d8acd04c29279e57fa70a51abc36ab0627bf5bf8bd69984e232386d709b7bc84b0af3fe5da641fbcc637e5844b7da9cf35b303 WHIRLPOOL 4c0dd067f549583075ef6dcda66c980d1e1adae2ff8b1266294b7b26534d98e8072eba2705bc5bda92f432c67a33e01d6973da96e0e23c51bf018482b042751c
 DIST facter-1.6.16.gem 138752 SHA256 0c7f23e89aa7641dc36e8ca005fe10a709745701c944e579effa50009c877689 SHA512 f3f1c7b464817fd062f2c72c901db376b80aa38a71fb9fd9e32451547e4fca1ba314b868c6b6146367f9ae5ca2e39fa89f83adca64c05fd2d59e7789c8d72ad3 WHIRLPOOL 2a74a1fed144bc1e6df6f085f944de93a8c4b58495223d7b376efc58d546d6815350fccbf33a02da3f4867cd9babf856ef74c3115aa11affcb7b1829ea7f8c77
+DIST facter-1.6.17.gem 144896 SHA256 22a41d2e4470ff261bf64027c5045e669d3970bd7d469f30e3a236b52cc330a8 SHA512 1c8c5c4a872e069af61019c8d69bc309292eaebcd33cf69a30fa09620b312764d24c31ad651b0d5529e7c47acf78bd26eb378fab9cec5ec7c9c6bc76c8077f63 WHIRLPOOL 51eed37258a15b3328bdd6a909865c649e58b3325c088b9dfb7b540f86ffac90e38b1b28bfdf705031d0439edd0e03398cfd8f87d58032c0600e71f6fa54ec8a
--- a/dev-ruby/facter/facter-1.6.17.ebuild
+++ b/dev-ruby/facter/facter-1.6.17.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/dev-ruby/facter/facter-1.6.17.ebuild,v 1.1 2013/03/04 21:13:13 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="facter"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+dmi"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	>=sys-apps/net-tools-1.60_p20120127084908
+	dmi? ( sys-apps/dmidecode )
+	sys-apps/lsb-release
+	sys-apps/pciutils"
+
+RDEPEND+=" ${CDEPEND}"
+DEPEND+=" test? ( ${CDEPEND} )"
+
+RUBY_PATCHES=( ${P}-ifconfig-path.patch )
+
+ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10.5 )"
+
+ruby_all_prepare() {
+	# Provide explicit path since /sbin is not in the default PATH on
+	# Gentoo.
+	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb || die
+}
--- a/dev-ruby/facter/files/facter-1.6.17-ifconfig-path.patch
+++ b/dev-ruby/facter/files/facter-1.6.17-ifconfig-path.patch
@ -0,0 +1,109 @@
+diff -ru ruby19/facter-1.6.16/lib/facter/ipaddress6.rb all/facter-1.6.16/lib/facter/ipaddress6.rb
+--- ruby19/facter-1.6.16/lib/facter/ipaddress6.rb	2012-12-02 20:01:43.841753654 +0100
+++ all/facter-1.6.16/lib/facter/ipaddress6.rb	2012-12-02 20:07:19.076607117 +0100
+@@ -38,7 +38,7 @@
+ Facter.add(:ipaddress6) do
+   confine :kernel => :linux
+   setcode do
+-    output = Facter::Util::Resolution.exec('/sbin/ifconfig 2>/dev/null')
+    output = Facter::Util::Resolution.exec('/bin/ifconfig 2>/dev/null')
+ 
+     get_address_after_token(output, 'inet6 addr:')
+   end
+diff -ru ruby19/facter-1.6.16/lib/facter/macaddress.rb all/facter-1.6.16/lib/facter/macaddress.rb
+--- ruby19/facter-1.6.16/lib/facter/macaddress.rb	2012-12-02 20:01:43.845753542 +0100
+++ all/facter-1.6.16/lib/facter/macaddress.rb	2012-12-02 20:06:44.049562697 +0100
+@@ -26,7 +26,7 @@
+   confine :kernel => 'Linux'
+   setcode do
+     ether = []
+-    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a 2>/dev/null")
+    output = Facter::Util::Resolution.exec("/bin/ifconfig -a 2>/dev/null")
+     output.each_line do |s|
+       ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
+     end
+diff -ru ruby19/facter-1.6.16/lib/facter/util/ip.rb all/facter-1.6.16/lib/facter/util/ip.rb
+--- ruby19/facter-1.6.16/lib/facter/util/ip.rb	2012-12-02 20:01:43.845753542 +0100
+++ all/facter-1.6.16/lib/facter/util/ip.rb	2012-12-02 20:05:58.594802786 +0100
+@@ -76,7 +76,9 @@
+ 
+   def self.get_all_interface_output
+     case Facter.value(:kernel)
+-    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+    when 'Linux'
+      output = %x{/bin/ifconfig -a 2>/dev/null}
+    when 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+       output = %x{/sbin/ifconfig -a 2>/dev/null}
+     when 'SunOS'
+       output = %x{/usr/sbin/ifconfig -a}
+@@ -103,7 +103,7 @@
+   #
+   # @return [String] the output of `/sbin/ifconfig 2>/dev/null` or nil
+   def self.get_ifconfig
+-    Facter::Util::Resolution.exec("/sbin/ifconfig 2>/dev/null")
+    Facter::Util::Resolution.exec("/bin/ifconfig 2>/dev/null")
+   end
+ 
+   ##
+@@ -127,7 +127,7 @@
+   end
+ 
+   def self.ifconfig_interface(interface)
+-    %x{/sbin/ifconfig #{interface} 2>/dev/null}
+    %x{/bin/ifconfig #{interface} 2>/dev/null}
+   end
+ 
+   def self.get_single_interface_output(interface)
+diff -ru ruby19/facter-1.6.16/lib/facter/util/netmask.rb all/facter-1.6.16/lib/facter/util/netmask.rb
+--- ruby19/facter-1.6.16/lib/facter/util/netmask.rb	2012-12-02 20:01:43.845753542 +0100
+++ all/facter-1.6.16/lib/facter/util/netmask.rb	2012-12-02 20:04:39.664956233 +0100
+@@ -7,7 +7,7 @@
+     case Facter.value(:kernel)
+     when 'Linux'
+       ops = {
+-        :ifconfig => '/sbin/ifconfig 2>/dev/null',
+        :ifconfig => '/bin/ifconfig 2>/dev/null',
+         :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
+         :munge => nil,
+       }
+diff -ru ruby19/facter-1.6.16/spec/unit/ipaddress6_spec.rb all/facter-1.6.16/spec/unit/ipaddress6_spec.rb
+--- ruby19/facter-1.6.16/spec/unit/ipaddress6_spec.rb	2012-12-02 20:01:43.857753215 +0100
+++ all/facter-1.6.16/spec/unit/ipaddress6_spec.rb	2012-12-02 20:10:38.379170335 +0100
+@@ -25,7 +25,7 @@
+ 
+   it "should return ipaddress6 information for Linux" do
+     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Linux')
+-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig 2>/dev/null').
+    Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig 2>/dev/null').
+       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+ 
+     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
+diff -ru ruby19/facter-1.6.16/spec/unit/macaddress_spec.rb all/facter-1.6.16/spec/unit/macaddress_spec.rb
+--- ruby19/facter-1.6.16/spec/unit/macaddress_spec.rb	2012-12-02 20:01:43.857753215 +0100
+++ all/facter-1.6.16/spec/unit/macaddress_spec.rb	2012-12-02 20:10:01.604173469 +0100
+@@ -22,14 +22,14 @@
+     end
+ 
+     it "should return the macaddress of the first interface" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
+      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+ 
+       Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+     end
+ 
+     it "should return nil when no macaddress can be found" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
+      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_no_mac'))
+ 
+       proc { Facter.value(:macaddress) }.should_not raise_error
+@@ -38,7 +38,7 @@
+ 
+     # some interfaces dont have a real mac addresses (like venet inside a container)
+     it "should return nil when no interface has a real macaddress" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
+      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_venet'))
+ 
+       proc { Facter.value(:macaddress) }.should_not raise_error
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@ -1,2 +1,3 @@
 DIST byacc-20120526.tgz 241153 SHA256 be05856b039bc9eb95a93cf89ac381de4fc6bb91d236c6b130e8b1daeb6075d6 SHA512 a5dc6d57e91f3155cbaa2d64ef12843055db8a4eab441eb1b5834f67214b6a11d89d48c4afb691dddbd7ab104ed0e5a545a145900193160ad57ddebe746d4745 WHIRLPOOL 02e368d9fb5f99d96229a6c2fe1e0c42a23f3c9626cd60d3000b1435d19071e8cfa2ef1f098871b46b3c077d385994d1dc946c9fba5836a4a5b7587a84f3620c
 DIST byacc-20121003.tgz 241422 SHA256 5afa4863550a7fc528e976cc33cc383bc0a9637ab95a6a594d2d5f6bf08dd1c5 SHA512 9ca77d3634882e648d9a10c70c6109f9cb0c3766ced44357c0caa891b5603269be15311c1c803b23d9f89595c6624e55602a3f49ed36637e364fe13fd4449ee0 WHIRLPOOL 7f451c93878a93510b3a436dd6eaaec543bc534db436c9573852646c7845ab4c3c12efbddd8982d4a55348858c69b3b07599d92860f83e49a8e7d407b17605f1
+DIST byacc-20130304.tgz 242146 SHA256 dd8397174e088baf57cf4d344023a34b0758b7bbb8a1dfcdafdc234b8eb57924 SHA512 26aec574cb88b33f15f0730d913564b3c87cc314515fa5e09b07a1fe32c92fb7c4ff81b33403e16fb94d5700141981885cc325dd3123111bbb6bf34c7d802571 WHIRLPOOL c3e7dd48da9ba63bc75b0aee988d6dbd3e55b276b934be72ff55450f8b276482e449b8dd61805d69ef998dd4e7d57a38a927d2b4ba71514050003fd505fe4ab4
--- a/dev-util/byacc/byacc-20130304.ebuild
+++ b/dev-util/byacc/byacc-20130304.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/byacc/byacc-20130304.ebuild,v 1.1 2013/03/05 04:13:51 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@ -5,4 +5,5 @@ DIST global-6.2.1.tar.gz 1223137 SHA256 db744411a6e0e0391239673a8436cb22f1834dbe
 DIST global-6.2.2.tar.gz 1223342 SHA256 f216bc8362b2450b0aaf4dce063989da5a25440efdfe12b12bc009c1f8688128 SHA512 3c7cc7a6595fab4464c417aeb45dc38074a4a8a949b5f6e8fde6a13ee4ec249a2c6e9541dfbe1a0920ec3a55e73e114843257d8a178ac79afbb9025805a79b52 WHIRLPOOL 95c53fe918b7e80cc22111fe1d236bdc73c33dd4ad18e319cb0502d5421d8b6b01ef6fdb3ae3f9ec64dea102d1bca4de87b70f32751ab6973ac778fdb140ef7e
 DIST global-6.2.4.tar.gz 1224019 SHA256 e193aa1969038084de54dc2ce3f708c273007a4774feccf5c04b08e8d3bbc4e7 SHA512 ba0490300665f2c52e53f64b272fac7b5e1289e371eebe0735898fc1fb16e1c76f9a3572b00d34ba2051523bba718942fc56513ff650a4c880dcf1d57d679663 WHIRLPOOL 63562a653ec8910469c332760d5c05491823b785965416c223b438747f301f6ecf71a28cb0d6c4a9a5f1536790b0346a146516cf0e6b33cbe45ccc1987ee1380
 DIST global-6.2.7.tar.gz 1312364 SHA256 91840808d2609135fbeed8bfae62bd75d75f4f411f52a2ebba9817f3272822b7 SHA512 bbe69e0016823628d0d41c11592396bc69ad1b2224c25f675e69b3c73fab0381fd4931b0e8a501e3bf8087835d8c7903dcb25bb9777785502b9b2d69004f32a5 WHIRLPOOL 5016b439c85ccd239207d33d558724cb2d7829245994e927e07daa59a5fe8f0062a75632386d8071332fc658cd62fe8c3900fc193dc6bf38ff3d78d58cf8e30d
+DIST global-6.2.8.tar.gz 1313627 SHA256 c1ed3b2500e00d3fb5dbf23d7e7e6b4feb1af45c12015ef9030114e76628cfd0 SHA512 c84401dd2d492db9eefbf80957db07e5d8e1ce5e174950cda58a0ad6873a9e504fd745ea63ba7f0f688f8eb5f9aa86c4839aec62ec3c7f420168d73b5d47e44f WHIRLPOOL 34e19dff43fa365fb56600a0df9b8f7a22f09f387d2ae72fbf9a3ceb749d0a21c8dd90fdb2fa542b5c4566f1676a3a121693d3352722fefcb6aa3d8d1661f45f
 DIST global-6.2.tar.gz 1225652 SHA256 5fe9be5ed0651f7da26597786ff51a5d99381d4ea8636c44b814bc5fd52d2634 SHA512 de72caf7732a0be9fbd7e22639c5f2ceea65b65c9df1de1029019ea84315c3f61d81d6b7196604a0a005503f931a6e23ad6aab38d9783f9f46ed0cc2e218e179 WHIRLPOOL d4ae7759d2d11ecc3358be748ec529381aeb10c5cb947fe3266158c2164727aa1e877ac711a9cc8ba4ffad58c250b6df9c210dbd488d5ee28f8b5a4e62a1dd19
--- a/dev-util/global/global-6.2.8.ebuild
+++ b/dev-util/global/global-6.2.8.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-6.2.8.ebuild,v 1.1 2013/03/05 02:38:24 floppym Exp $
+
+EAPI="5"
+
+inherit elisp-common eutils
+
+DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources."
+HOMEPAGE="http://www.gnu.org/software/global/global.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc emacs vim"
+
+RDEPEND="sys-devel/libtool
+	sys-libs/ncurses
+	emacs? ( virtual/emacs )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${DEPEND}
+	doc? ( app-text/texi2html sys-apps/texinfo )"
+
+SITEFILE="50gtags-gentoo.el"
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}/${PN}")"
+}
+
+src_compile() {
+	if use doc; then
+		texi2pdf -q -o doc/global.pdf doc/global.texi
+		texi2html -o doc/global.html doc/global.texi
+	fi
+
+	if use emacs; then
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use doc; then
+		dohtml doc/global.html
+		[[ -f doc/global.pdf ]] && dodoc doc/global.pdf
+	fi
+
+	dodoc AUTHORS FAQ NEWS README THANKS
+
+	insinto /etc
+	doins gtags.conf
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins gtags.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-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/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild,v 1.3 2013/02/21 15:40:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild,v 1.5 2013/03/05 03:44:16 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@ -63,11 +63,11 @@ python_compile_all() {

 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
 		dohtml -r doc/build/html/
 	fi
-	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
 	domenu contrib/${PN}.desktop
 }

--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.17 2013/02/21 15:40:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.19 2013/03/05 03:44:16 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@ -63,11 +63,11 @@ python_compile_all() {

 python_install_all() {
 	distutils-r1_python_install_all
-	dodoc doc/ReadMe*.txt doc/TODO
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
 	if use doc ; then
 		dohtml -r doc/build/html/
 	fi
-	newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_logo.svg
+	newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg
 	domenu contrib/${PN}.desktop
 }

--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@ -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/eclass/distutils-r1.eclass,v 1.60 2013/03/02 07:17:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.62 2013/03/04 19:29:43 mgorny Exp $

 # @ECLASS: distutils-r1
 # @MAINTAINER:
@ -100,14 +100,6 @@ if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
 	DEPEND=${PYTHON_DEPS}
 fi

-# @ECLASS-VARIABLE: DISTUTILS_JOBS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The number of parallel jobs to run for distutils-r1 parallel builds.
-# If unset, the job-count in ${MAKEOPTS} will be used.
-#
-# This variable is intended to be set in make.conf.
-
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@ -551,26 +543,12 @@ distutils-r1_run_phase() {

 	mkdir -p "${TMPDIR}" || die

-	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
-	else
-		(
-			multijob_child_init
-			"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
-		) &
-		multijob_post_fork
-	fi
+	"${@}"

 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
 	then
 		popd >/dev/null || die
 	fi
-
-	# Store them for reuse.
-	_DISTUTILS_BEST_IMPL=(
-		"${EPYTHON}" "${PYTHON}" "${BUILD_DIR}" "${PYTHONPATH}"
-	)
 }

 # @FUNCTION: _distutils-r1_run_common_phase
@ -584,56 +562,11 @@ distutils-r1_run_phase() {
 _distutils-r1_run_common_phase() {
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}

-	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
-	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
-	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
-	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
+	local MULTIBUILD_VARIANTS
+	_python_obtain_impls

-	export EPYTHON PYTHON PYTHONPATH
-
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		pushd "${BUILD_DIR}"/.. >/dev/null || die
-	fi
-
-	einfo "common: running ${1}"
-	"${@}"
-
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		popd >/dev/null || die
-	fi
-}
-
-# @FUNCTION: _distutils-r1_multijob_init
-# @INTERNAL
-# @DESCRIPTION:
-# Init multijob, taking the job-count from ${DISTUTILS_JOBS}.
-_distutils-r1_multijob_init() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		local opts
-		if [[ ${DISTUTILS_JOBS} ]]; then
-			opts=-j${DISTUTILS_JOBS}
-		else
-			opts=${MAKEOPTS}
-		fi
-
-		multijob_init "${opts}"
-	fi
-}
-
-# @FUNCTION: _distutils-r1_multijob_finish
-# @INTERNAL
-# @DESCRIPTION:
-# Finish multijob if used.
-_distutils-r1_multijob_finish() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		multijob_finish
-	fi
+	multibuild_for_best_variant _python_multibuild_wrapper \
+		distutils-r1_run_phase "${@}"
 }

 # @FUNCTION: _distutils-r1_run_foreach_impl
@ -647,9 +580,12 @@ _distutils-r1_run_foreach_impl() {
 	set -- distutils-r1_run_phase "${@}"

 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		_distutils-r1_multijob_init
-		python_foreach_impl "${@}"
-		_distutils-r1_multijob_finish
+		if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
+		then
+			python_foreach_impl "${@}"
+		else
+			python_parallel_foreach_impl "${@}"
+		fi
 	else
 		if [[ ! ${EPYTHON} ]]; then
 			die "EPYTHON unset, python-single-r1_pkg_setup not called?!"
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@ -0,0 +1,228 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.4 2013/03/04 19:27:24 mgorny Exp $
+
+# @ECLASS: multibuild
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @AUTHOR:
+# Author: Michał Górny <mgorny@gentoo.org>
+# @BLURB: A generic eclass for building multiple variants of packages.
+# @DESCRIPTION:
+# The multibuild eclass aims to provide a generic framework for building
+# multiple 'variants' of a package (e.g. multilib, Python
+# implementations).
+
+case "${EAPI:-0}" in
+	0|1|2|3|4)
+		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+		;;
+	5)
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+if [[ ! ${_MULTIBUILD} ]]; then
+
+inherit multiprocessing
+
+# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
+# @DESCRIPTION:
+# An array specifying all enabled variants which multibuild_foreach*
+# can execute the process for.
+#
+# In ebuild, it can be set in global scope. Eclasses should set it
+# locally in function scope to support nesting properly.
+#
+# Example:
+# @CODE
+# python_foreach_impl() {
+#	local MULTIBUILD_VARIANTS=( python{2_5,2_6,2_7} ... )
+#	multibuild_foreach_variant python_compile
+# }
+# @CODE
+
+# @ECLASS-VARIABLE: MULTIBUILD_VARIANT
+# @DESCRIPTION:
+# The current variant which the function was executed for.
+#
+# Example value:
+# @CODE
+# python2_6
+# @CODE
+
+# @ECLASS-VARIABLE: MULTIBUILD_ID
+# @DESCRIPTION:
+# The unique identifier for a multibuild run. In a simple run, it is
+# equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it
+# contains the complete selection tree.
+#
+# It can be used to create variant-unique directories and files.
+#
+# Example value:
+# @CODE
+# amd64-double
+# @CODE
+
+# @ECLASS-VARIABLE: BUILD_DIR
+# @DESCRIPTION:
+# The current build directory. In global scope, it is supposed
+# to contain an 'initial' build directory. If unset, ${S} is used.
+#
+# multibuild_foreach_variant() sets BUILD_DIR locally
+# to variant-specific build directories based on the initial value
+# of BUILD_DIR.
+#
+# Example value:
+# @CODE
+# ${WORKDIR}/foo-1.3-python2_6
+# @CODE
+
+# @FUNCTION: multibuild_foreach_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command repeatedly for each of the enabled package
+# variants.
+#
+# Each of the runs will have variant-specific BUILD_DIR set, and output
+# teed to a separate log in ${T}.
+#
+# The function returns 0 if all commands return 0, or the first non-zero
+# exit status otherwise. However, it performs all the invocations
+# nevertheless. It is preferred to call 'die' inside of the passed
+# function.
+multibuild_foreach_variant() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${MULTIBUILD_VARIANTS} ]] \
+		|| die "MULTIBUILD_VARIANTS need to be set"
+
+	local bdir=${BUILD_DIR:-${S}}
+
+	# Avoid writing outside WORKDIR if S=${WORKDIR}.
+	[[ ${bdir%%/} == ${WORKDIR%%/} ]] && bdir=${WORKDIR}/build
+
+	local prev_id=${MULTIBUILD_ID:+${MULTIBUILD_ID}-}
+	local ret=0 lret=0 v
+
+	debug-print "${FUNCNAME}: initial build_dir = ${bdir}"
+
+	for v in "${MULTIBUILD_VARIANTS[@]}"; do
+		local MULTIBUILD_VARIANT=${v}
+		local MULTIBUILD_ID=${prev_id}${v}
+		local BUILD_DIR=${bdir%%/}-${v}
+		local log_fd
+
+		# redirect_alloc_fd accepts files only. so we need to open
+		# a random file and then reuse the fd for logger process.
+		redirect_alloc_fd log_fd /dev/null
+
+		_multibuild_run() {
+			# find the first non-private command
+			local i=1
+			while [[ ${!i} == _* ]]; do
+				(( i += 1 ))
+			done
+
+			[[ ${i} -le ${#} ]] && einfo "${v}: running ${@:${i}}"
+			"${@}"
+		}
+
+		# bash can't handle ${log_fd} in redirections,
+		# we need to use eval to pass fd numbers directly.
+		eval "
+			exec ${log_fd}> >(exec tee -a \"\${T}/build-\${MULTIBUILD_ID}.log\")
+			_multibuild_run \"\${@}\" >&${log_fd} 2>&1
+			lret=\${?}
+			exec ${log_fd}>&-
+		"
+	done
+	[[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
+
+	return ${ret}
+}
+
+# @FUNCTION: multibuild_parallel_foreach_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command repeatedly for each of the enabled package
+# variants alike multibuild_foreach_variant. Multiple invocations of the command
+# will be performed in parallel, up to MULTIBUILD_JOBS tasks.
+#
+# The function returns 0 if all commands return 0, or the first non-zero
+# exit status otherwise. However, it performs all the invocations
+# nevertheless. It is preferred to call 'die' inside of the passed
+# function.
+multibuild_parallel_foreach_variant() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local ret lret
+
+	_multibuild_parallel() {
+		(
+			multijob_child_init
+			"${@}"
+		) &
+		multijob_post_fork
+	}
+
+	local opts
+	if [[ ${MULTIBUILD_JOBS} ]]; then
+		opts=-j${MULTIBUILD_JOBS}
+	else
+		opts=${MAKEOPTS}
+	fi
+
+	multijob_init "${opts}"
+	multibuild_foreach_variant _multibuild_parallel "${@}"
+	ret=${?}
+	multijob_finish
+	lret=${?}
+
+	[[ ${ret} -eq 0 ]] && ret=${lret}
+	return ${ret}
+}
+
+# @FUNCTION: multibuild_for_best_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command once, for the best of the enabled package
+# variants.
+#
+# The run will have a proper, variant-specificBUILD_DIR set, and output
+# teed to a separate log in ${T}.
+#
+# The function returns command exit status.
+multibuild_for_best_variant() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${MULTIBUILD_VARIANTS} ]] \
+		|| die "MULTIBUILD_VARIANTS need to be set"
+
+	local MULTIBUILD_VARIANTS=( "${MULTIBUILD_VARIANTS[-1]}" )
+	multibuild_foreach_variant "${@}"
+}
+
+# @FUNCTION: run_in_build_dir
+# @USAGE: <argv>...
+# @DESCRIPTION:
+# Run the given command in the directory pointed by BUILD_DIR.
+run_in_build_dir() {
+	debug-print-function ${FUNCNAME} "${@}"
+	local ret
+
+	[[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
+	[[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${@}"
+	ret=${?}
+	popd >/dev/null || die
+
+	return ${ret}
+}
+
+_MULTIBUILD=1
+fi
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@ -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/eclass/multilib-build.eclass,v 1.7 2013/03/02 18:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.9 2013/03/04 19:31:01 mgorny Exp $

 # @ECLASS: multilib-build.eclass
 # @MAINTAINER:
@ -23,7 +23,7 @@ case ${EAPI:-0} in
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac

-inherit multilib multiprocessing
+inherit multibuild multilib

 # @ECLASS-VARIABLE: _MULTILIB_FLAGS
 # @INTERNAL
@ -91,6 +91,19 @@ multilib_get_enabled_abis() {
 	fi
 }

+# @FUNCTION: _multilib_multibuild_wrapper
+# @USAGE: <argv>...
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for ABI selected for multibuild.
+_multilib_multibuild_wrapper() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local ABI=${MULTIBUILD_VARIANT}
+	multilib_toolchain_setup "${ABI}"
+	"${@}"
+}
+
 # @FUNCTION: multilib_foreach_abi
 # @USAGE: <argv>...
 # @DESCRIPTION:
@ -101,14 +114,10 @@ multilib_get_enabled_abis() {
 # If multilib support is disabled, it just runs the commands. No setup
 # is done.
 multilib_foreach_abi() {
-	local initial_dir=${BUILD_DIR:-${S}}
+	debug-print-function ${FUNCNAME} "${@}"

-	local abis=( $(multilib_get_enabled_abis) )
-	local ABI
-	for ABI in "${abis[@]}"; do
-		multilib_toolchain_setup "${ABI}"
-		BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
-	done
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+	multibuild_foreach_variant _multilib_multibuild_wrapper "${@}"
 }

 # @FUNCTION: multilib_parallel_foreach_abi
@ -124,25 +133,22 @@ multilib_foreach_abi() {
 #
 # Useful for running configure scripts.
 multilib_parallel_foreach_abi() {
-	local initial_dir=${BUILD_DIR:-${S}}
+	debug-print-function ${FUNCNAME} "${@}"

-	multijob_init
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+	multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}"
+}

-	local abis=( $(multilib_get_enabled_abis) )
-	local ABI
-	for ABI in "${abis[@]}"; do
-		(
-			multijob_child_init
+# @FUNCTION: multilib_for_best_abi
+# @USAGE: <argv>...
+# @DESCRIPTION:
+# Runs the given command with setup for the 'best' (usually native) ABI.
+multilib_for_best_abi() {
+	debug-print-function ${FUNCNAME} "${@}"

-			multilib_toolchain_setup "${ABI}"
-			BUILD_DIR=${initial_dir%%/}-${ABI}
-			"${@}"
-		) &
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )

-		multijob_post_fork
-	done
-
-	multijob_finish
+	multibuild_for_best_variant _multilib_multibuild_wrapper "${@}"
 }

 # @FUNCTION: multilib_check_headers
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@ -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/eclass/mysql-cmake.eclass,v 1.14 2013/02/13 00:40:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $

 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@ -221,6 +221,7 @@ mysql-cmake_src_prepare() {
 	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"

 	rm -f "scripts/mysqlbug"
+	epatch_user
 }

 # @FUNCTION: mysql-cmake_src_configure
@ -275,7 +276,10 @@ mysql-cmake_src_configure() {

 	CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing"
 	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
-	CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	# Causes linkage failures.  Upstream bug #59607 removes it
+	if ! mysql_version_is_at_least "5.6" ; then
+		CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+	fi
 	export CXXFLAGS

 	# bug #283926, with GCC4.4, this is required to get correct behavior.
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@ -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/eclass/python-r1.eclass,v 1.44 2013/02/27 21:02:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.47 2013/03/04 19:28:47 mgorny Exp $

 # @ECLASS: python-r1
 # @MAINTAINER:
@ -48,7 +48,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi

-inherit python-utils-r1
+inherit multibuild python-utils-r1

 # @ECLASS-VARIABLE: PYTHON_COMPAT
 # @REQUIRED
@ -173,6 +173,14 @@ _python_set_globals() {
 }
 _python_set_globals

+# @ECLASS-VARIABLE: DISTUTILS_JOBS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The number of parallel jobs to run for distutils-r1 parallel builds.
+# If unset, the job-count in ${MAKEOPTS} will be used.
+#
+# This variable is intended to be set in make.conf.
+
 # @FUNCTION: _python_validate_useflags
 # @INTERNAL
 # @DESCRIPTION:
@ -578,6 +586,37 @@ _python_check_USE_PYTHON() {
 	fi
 }

+# @FUNCTION: _python_obtain_impls
+# @INTERNAL
+# @DESCRIPTION:
+# Set up the enabled implementation list.
+_python_obtain_impls() {
+	MULTIBUILD_VARIANTS=()
+
+	for impl in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if has "${impl}" "${PYTHON_COMPAT[@]}" \
+			&& use "python_targets_${impl}"
+		then
+			MULTIBUILD_VARIANTS+=( "${impl}" )
+		fi
+	done
+}
+
+# @FUNCTION: _python_multibuild_wrapper
+# @USAGE: <command> [<args>...]
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for Python implementation selected
+# for multibuild.
+_python_multibuild_wrapper() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local -x EPYTHON PYTHON
+	python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON
+
+	"${@}"
+}
+
 # @FUNCTION: python_foreach_impl
 # @USAGE: <command> [<args>...]
 # @DESCRIPTION:
@ -597,30 +636,35 @@ python_foreach_impl() {
 	_python_validate_useflags
 	_python_check_USE_PYTHON

-	local impl
-	local bdir=${BUILD_DIR:-${S}}
-	local ret=0 lret=0
+	local MULTIBUILD_VARIANTS
+	_python_obtain_impls

-	debug-print "${FUNCNAME}: bdir = ${bdir}"
-	for impl in "${_PYTHON_ALL_IMPLS[@]}"; do
-		if has "${impl}" "${PYTHON_COMPAT[@]}" \
-			&& _python_impl_supported "${impl}" \
-			&& use "python_targets_${impl}"
-		then
-			local EPYTHON PYTHON
-			python_export "${impl}" EPYTHON PYTHON
-			local BUILD_DIR=${bdir%%/}-${impl}
-			export EPYTHON PYTHON
+	multibuild_foreach_variant _python_multibuild_wrapper "${@}"
+}

-			einfo "${EPYTHON}: running ${@}"
-			"${@}"
-			lret=${?}
+# @FUNCTION: python_parallel_foreach_impl
+# @USAGE: <command> [<args>...]
+# @DESCRIPTION:
+# Run the given command for each of the enabled Python implementations.
+# If additional parameters are passed, they will be passed through
+# to the command.
+#
+# The function will return 0 status if all invocations succeed.
+# Otherwise, the return code from first failing invocation will
+# be returned.
+#
+# For each command being run, EPYTHON, PYTHON and BUILD_DIR are set
+# locally, and the former two are exported to the command environment.
+#
+# Multiple invocations of the command will be run in parallel, up to
+# DISTUTILS_JOBS (defaulting to '-j' option argument from MAKEOPTS).
+python_parallel_foreach_impl() {
+	debug-print-function ${FUNCNAME} "${@}"

-			[[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
-		fi
-	done
-
-	return ${ret}
+	local MULTIBUILD_JOBS=${MULTIBUILD_JOBS:-${DISTUTILS_JOBS}}
+	local MULTIBUILD_VARIANTS
+	_python_obtain_impls
+	multibuild_parallel_foreach_variant _python_multibuild_wrapper "${@}"
 }

 # @FUNCTION: python_export_best
@ -690,24 +734,5 @@ python_replicate_script() {
 	done
 }

-# @FUNCTION: run_in_build_dir
-# @USAGE: <argv>...
-# @DESCRIPTION:
-# Run the given command in the directory pointed by BUILD_DIR.
-run_in_build_dir() {
-	debug-print-function ${FUNCNAME} "${@}"
-	local ret
-
-	[[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
-	[[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${@}"
-	ret=${?}
-	popd >/dev/null || die
-
-	return ${ret}
-}
-
 _PYTHON_R1=1
 fi
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@ -1 +1,2 @@
 DIST manaplus-1.3.2.3.tar.xz 5879180 SHA256 8de6a13606cd6e0af7e9773a85a535ed1c869bcff1f08a9f1454690f2e7c5bb9 SHA512 bd9a38a297e3e473b8abea7e4154b8b0886f7584c0862169ce808194cad29873ece3e5b0bb953e5b34ed32c86f7373bbe4e14f8a218747706c3281f197b0f6b3 WHIRLPOOL a740099d0287f53bae6be05af186c2093588103c1d5c03072e9f503923f89a5a0d05532f2465398194f190318c709425540ea54aab7bf2942941a3531c672727
+DIST manaplus-1.3.3.3.tar.xz 6826144 SHA256 fc032eaee411e355c687e1e802018b77cea2469238cd0d1350221564133ce807 SHA512 edd974f958d1f4f137d43f8770625c6edafde02cbebf52081897db657cd1c49d30bad42aa76c8a4899464f8b20584b550d8b9d4f2672491bb9ce9db9e59c2a5d WHIRLPOOL 7753f91d054357de375309f2412826a0069df934037d24ceb2a5108476f3291e2ce6183cabbd390b554b0bbb899b3562efffecb2378b3824a184507b94c2a82a
--- a/games-rpg/manaplus/manaplus-1.3.3.3.ebuild
+++ b/games-rpg/manaplus/manaplus-1.3.3.3.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.3.3.3.ebuild,v 1.1 2013/03/04 19:06:57 hasufell Exp $
+
+EAPI=5
+
+inherit games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	dev-libs/libxml2
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/libpng:0
+	media-fonts/dejavu
+	>=dev-games/guichan-0.8.1[sdl]
+	media-libs/libsdl[X,opengl?,video]
+	media-libs/sdl-gfx
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	x11-misc/xsel
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/^SUBDIRS/s/fonts//' \
+		data/Makefile.in || die
+
+	rm -r src/guichan || die
+}
+
+src_configure() {
+	egamesconf \
+		--without-internalguichan \
+		--localedir=/usr/share/locale \
+		--disable-manaserv \
+		--disable-eathena \
+		$(use_with opengl) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf
+	insinto "${GAMES_DATADIR}"/${PN}/data
+
+	prepgamesdirs
+}
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@ -1 +1 @@
-DIST liquidwar-5.6.4.tar.gz 3268432 RMD160 991da4af05d1a8cf292faf23e9c06c1f7571672c SHA1 a3006c4da9517c3af3b7bf165b2c86fa369a71c6 SHA256 32c52e4588e8e723f907ef43703b4ddf009e8ff1f29555c09bcc1f70bf5b93a3
+DIST liquidwar-5.6.4.tar.gz 3268432 SHA256 32c52e4588e8e723f907ef43703b4ddf009e8ff1f29555c09bcc1f70bf5b93a3 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7 WHIRLPOOL b4480b250c45adf3b93761d0a7f167cb24e6a03c404b364f2bedd8203e8711f00d3a25b5d3fc86e9b19edb056ebece4f2a51d2be488d4b002104f4f34e7bf9b6
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild,v 1.1 2013/03/04 22:36:22 hasufell Exp $
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="unique multiplayer wargame"
+HOMEPAGE="http://www.ufoot.org/liquidwar/"
+SRC_URI="http://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+
+RDEPEND=">=media-libs/allegro-4.2:0[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
+	sed -i \
+		-e 's:/games::' \
+		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
+		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
+		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applnk/Games/:' \
+		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
+		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
+		-e '/install/s:-s ::' \
+		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
+		-e 's:$(GMAKE):$(MAKE):' \
+		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
+		|| die 'sed Makefile.in failed'
+	sed -i \
+		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
+		-e 's:/games::' src/Makefile.in \
+		|| die "sed src/Makefile.in failed"
+	epatch "${FILESDIR}"/${P}-underlink.patch
+}
+
+src_configure() {
+	egamesconf \
+		--disable-doc-ps \
+		--disable-doc-pdf \
+		--disable-target-opt \
+		$(use_enable x86 asm)
+}
+
+src_compile() {
+	# skip build_doc target wrt bug 460344
+	emake build_bin build_data
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_nolink
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
+	prepgamesdirs
+}
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@ -1,2 +1,2 @@
-DIST gnome-integration-spotify-git-20130116.tgz 6571 SHA256 2fbe745ba24d1f7dccb27efc7fd87fc0b35da5a9c992bb9c114c3ac15e1a5dc0 SHA512 8362242312d799ff062425ad720b376b691da3cef3b3d7e48823e0b2638c67977793fc93e34ac3f80ffb4248d86c100401a209b5c0a1f0cdcf9e35acab0aa5fe WHIRLPOOL fb399e84d13743fc5d498b066eed795700b2f142ec98b3bc3b489b646f76dd250485be4ba1d00218dc2de25b67e325cbfbc5a31b7a89ca60daddf4269eb0fc21
 DIST gnome-integration-spotify-git-20130119.tgz 6623 SHA256 f93746b75be4f6b85f661c77d709d9b8e678c68ea81f38428cd996a172906c70 SHA512 f859e1b20e281877fa37f82d7be135f33f4e9382226fad530917eea0f3806ff59630a3ed264f13be11d4c11db44373b45b8d0d19e2f59e80bc8ce91f814a4bf7 WHIRLPOOL 117203e7eac920833a872ae8cba7dc07c18849bfe02af5389c751bd4818f0207a010a8048c998423d2747aead77d6ebe4674603118c8c7b7595f0a4026b8fad0
+DIST gnome-integration-spotify-git-20130304.tgz 6711 SHA256 ceaae62317831f716a6dbfbb3f352b0ff19711985cc66681e1fb4450de5e7798 SHA512 b5923fc9f6f4da28c25f4b82a8a09dbe6b59f152dde595eb03efed6e18e477c2163172ebbe5b3c0a98ad0061edbd504c5f78b7cf94a4ff900e9ab162e2783c9f WHIRLPOOL 3c148850b1f614399128d5c0a68bd25d9e1564764a99000c7b3e46c8e27c3d70a221ddfab5cc977175b89851a31c8b685c979258838c9306207508e9dea312b9
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20130304.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20130304.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/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20130116.ebuild,v 1.1 2013/01/17 08:06:05 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20130304.ebuild,v 1.1 2013/03/04 21:53:22 prometheanfire Exp $

 EAPI=4

@ -9,7 +9,7 @@ inherit gnome2-utils
 DESCRIPTION="GNOME integration for Spotify"
 HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
 SRC_URI="http://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/mrpdaemon-${PN}-55ce7a3"
+S="${WORKDIR}/mrpdaemon-${PN}-9af735f"

 LICENSE="GPL-3"
 SLOT="0"
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@ -1,3 +1,2 @@
 DIST povray-3.7.0.RC3.tar.bz2 11226551 SHA256 246affb3be8ebbd3b0a192da7ee9684295d707143d192d4831e78210c6dbbdcb SHA512 a485881c03c1b91607d7ab69203ccf89e68e6382d460e8ac864dd60ee9a173e19fc727f091a95724dde2b4bfbd0871033380e3da99460ef4025114e873d3f943 WHIRLPOOL 81e28342eee0e14b9a8c0b38d62c7469726f3d7f17d19a662e11b7e54ee09368100f8e91b2fbecd69c6a7c26990371d533614b00d3b895dfbcd1893185951611
-DIST povray-3.7.0.RC5.tar.gz 13175516 SHA256 5ba524ab637666b7220e834399780205889589a7d78d6c54b11a7d71c99b20a9 SHA512 ca00ab877a64fdf88e300d5d4a4682fe3572a16b95236bd113ea6ecd7a4ba5483745485a44db113237ca0fcf3a7b50986e1bdc7174777914e147ae40538321d4 WHIRLPOOL 12cd2732627e05addc4d53d703c4fbf840cc9f8f049e909d103be111038525519406761883234f464c231504d1c597626c18b58ad3c3403444217c317213490a
 DIST povray-3.7.0.RC6.tar.gz 13298421 SHA256 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3 SHA512 93ff4a648ccd5685f1f8baec7e61a9daf43f536cd3fadf6903e284a9bd4e9e8feae5ca31aa6c67a44a6f5d60fd992154a3b7d843a1041f0bb628d763f532422d WHIRLPOOL 1517c8889d8180afa98a663b793ca4b5e35d532b12f571a2d13f435623e1f43f9b7c767a7845c10ba234da142f9f6e56c63c5ebc0390818537791609e14abaf3
--- a/media-gfx/povray/files/povray-3.7.0_rc6-darwin-defaults.patch
+++ b/media-gfx/povray/files/povray-3.7.0_rc6-darwin-defaults.patch
@ -0,0 +1,21 @@
+# Darwin does not support thread-local storage (__thread)
+# http://lists.apple.com/archives/xcode-users/2006/Jun/msg00551.html
+# so use default from boost thread
+
+# use lseek for lseek64
+# sys/types.h is needed because of uint
+
+--- povray-3.7.0.RC6/vfe/unix/syspovconfig.h.orig	2013-03-01 11:09:42.000000000 -0700
+++ povray-3.7.0.RC6/vfe/unix/syspovconfig.h	2013-03-01 11:07:14.000000000 -0700
+@@ -171,9 +171,7 @@
+ #define METADATA_PLATFORM_STRING BUILD_ARCH
+ #define METADATA_COMPILER_STRING COMPILER_VERSION
+ 
+-#define DECLARE_THREAD_LOCAL_PTR(ptrType, ptrName)                __thread ptrType *ptrName
+-#define IMPLEMENT_THREAD_LOCAL_PTR(ptrType, ptrName, ignore)      __thread ptrType *ptrName
+-#define GET_THREAD_LOCAL_PTR(ptrName)                             (ptrName)
+-#define SET_THREAD_LOCAL_PTR(ptrName, ptrValue)                   (ptrName = ptrValue)
+#define lseek64 lseek
+#include <sys/types.h>
+
+ #endif
--- a/media-gfx/povray/povray-3.7.0_rc3.ebuild
+++ b/media-gfx/povray/povray-3.7.0_rc3.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/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.10 2011/11/17 17:02:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.12 2013/03/05 01:34:02 ottxor Exp $

 EAPI="3"

@ -21,7 +21,7 @@ SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV

 LICENSE="povlegal-3.6"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug openexr tiff X"

 DEPEND="
@ -78,6 +78,10 @@ src_configure() {
 	append-flags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\"
 	append-flags -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"

+	#460238, included in the patch for povray-3.7.0_rc6
+	has_version ">=dev-libs/boost-1.52" && \
+		append-flags "-lboost_system" "-lboost_date_time" "-DTIME_UTC=TIME_UTC_"
+
 	if ! use tiff ; then
 		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
 	else
--- a/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0_rc5-r1.ebuild
@ -1,125 +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/povray/povray-3.7.0_rc5-r1.ebuild,v 1.7 2012/12/30 16:34:56 armin76 Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator multilib
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="povlegal-3.6"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug mkl openexr tiff X"
-
-DEPEND="
-	>=dev-libs/boost-1.50.0[threads(+)]
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr )
-	mkl? ( sci-libs/mkl )
-	tiff? ( media-libs/tiff:0 )
-	X? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	sys-devel/boost-m4"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/3.7.0_rc3-user-conf.patch \
-		"${FILESDIR}"/${P}+boost-1.50.patch \
-		"${FILESDIR}"/${P}-automagic.patch
-
-	# Change some destination directories that cannot be adjusted via configure
-	sed \
-		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
-		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
-		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
-		-i configure.ac || die
-
-	sed \
-		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
-		-e 's:mkdir_p:MKDIR_P:g' \
-		-i Makefile.am || die
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local non_redist_conf
-
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
-
-	if ! use tiff ; then
-		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
-	else
-		non_redist_conf=""
-	fi
-
-	econf \
-		${non_redist_conf} \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_enable debug) \
-		$(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
-		--disable-strip \
-		--disable-optimiz \
-		--disable-optimiz-arch
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${ED}/etc/${PN}"); do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}
--- a/media-gfx/povray/povray-3.7.0_rc6.ebuild
+++ b/media-gfx/povray/povray-3.7.0_rc6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild,v 1.5 2013/03/02 00:49:41 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild,v 1.6 2013/03/05 01:34:02 ottxor Exp $

 EAPI=4

@ -47,6 +47,9 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-3.7.0_rc5+boost-1.50.patch \
 		"${FILESDIR}"/${PN}-3.7.0_rc5-automagic.patch

+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch
+
 	# Change some destination directories that cannot be adjusted via configure
 	sed \
 		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@ -1,2 +1 @@
-DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c SHA512 5a5df41df5899a2578a7d4cf03789080db028af78229254183c36f6bb094c4351c13bae4e893c6aad8e2385bafba292d7a7702436dd163cc4c53604df481349e WHIRLPOOL f028207602b652e60c9dd7fade3ca67a7e7b0173dea84602865ea66402fcb8e275529baceae416bea1a1f7bb4074e4b6d66bc0b87e15f9fedb9f4831e1820eef
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.22.ebuild
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.22.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.22.ebuild,v 1.6 2012/12/25 17:51:23 eva Exp $
-
-EAPI="1"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/ladspa-sdk-1.12-r2
-	>=media-libs/gst-plugins-base-0.10.33:0.10
-	>=media-libs/gst-plugins-bad-${PV}:0.10" # uses signalprocessor helper library
-DEPEND="${RDEPEND}
-	>=media-libs/gst-plugins-bad-${PV}:0.10"
-
-src_unpack() {
-	unpack ${A}
-
-	gst-plugins10_find_plugin_dir
-	# signalprocessor has no .pc
-	sed -e "s:\$(top_builddir)/gst-libs/gst/signalprocessor/.*\.la:-lgstsignalprocessor-${SLOT}:" \
-		-i Makefile.am Makefile.in || die
-}
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@ -1,4 +1,2 @@
-DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14 SHA512 af4657e3d4c4b8a323078c7aeadaa7e5e8ea95660a20975770930f576f28cb9b85176b06066fd168f91ae17e68ff1525ed55b4546d041bc0d9a4bd83cf3fdb2e WHIRLPOOL 84b2b35a7ad40699aab20168321a38606ae1f1ded9c6dd7506abe343ef0d524f741096196dc404ed86e4af62a475cb47ab12674be133add187a9c085d3aa7740
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.0.3.tar.xz 825988 SHA256 b8f4cfef12201f19c53a4cde7bc4fef995740c566ea45921d4473f3714e4d8c0 SHA512 f8d134571ae0013f34f19f50339ab9c14ebd95cc8c21235d04c6a06e8ae616177f712f85726052710769d9221a25e61accc458b8f6c9bdc7f60f3663bcf82f0b WHIRLPOOL bd676c973b92d2e0093ccd7d3302be9b0666c022660bdc3fe8eacda444ef9a8f2c447d1c8cf70e054368e5bab4ee67306722c93edd7e674b55ee0b5b1f31d8ed
 DIST gst-plugins-ugly-1.0.5.tar.xz 826376 SHA256 a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331 SHA512 156ebec5fb1eaeaae8fa744ecc9b9991f4a5966d04659d0f74a7909a4ec25d002efed9beac4c5440dad6c5a8d0ab9e12045ec0caea5384473a9800d195a673dc WHIRLPOOL 91b7432804639ba7b0d111433e3b09a48ce5bfda56ad605525e314e60cb8575b4c8853b360007d9cc220200f6ac89b20117c9b1455032661b6ccf63b53ade712
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild,v 1.10 2013/01/01 17:53:25 ago Exp $
-
-EAPI="1"
-
-inherit gst-plugins-ugly
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-sound/lame-3.95
-	>=media-libs/gstreamer-0.10.26:0.10
-	>=media-libs/gst-plugins-base-0.10.26:0.10"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.0.3.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.0.3.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-lame/gst-plugins-lame-1.0.3.ebuild,v 1.3 2013/01/01 12:37:22 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-ugly
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-sound/lame-3.95"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@ -1,4 +1,2 @@
-DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c SHA512 5a5df41df5899a2578a7d4cf03789080db028af78229254183c36f6bb094c4351c13bae4e893c6aad8e2385bafba292d7a7702436dd163cc4c53604df481349e WHIRLPOOL f028207602b652e60c9dd7fade3ca67a7e7b0173dea84602865ea66402fcb8e275529baceae416bea1a1f7bb4074e4b6d66bc0b87e15f9fedb9f4831e1820eef
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.0.3.tar.xz 3139308 SHA256 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0 SHA512 b1306557234e5db178c7b1d0549a7ce9d82603286e1e8b07e6e1b55e149df430b64936cf2a727b4bbcc5a54edcf44e7d49bc69e24c83e51683027f5a4bce4be0 WHIRLPOOL b781a317e6100c2571e7dd375e5331847ee3a20da5f7d95515fd32f09e12cb3fbfee1861fdf9cb93aaa8e629e8f8a2cfdb3b0491afd70f50a559fa712660f649
 DIST gst-plugins-bad-1.0.5.tar.xz 3144720 SHA256 2e8f5b9a2fd274142d0a916b6425b9466028978b85858dc835dc80de744b276a SHA512 2c227908c61be22d6546078c0f1a68c2294903512b30adbb2bf8fa17225cf2c0409b3a5812ed8aab2d321658b5946e5a59f1add4ca85d5275cbbf5aafce0169d WHIRLPOOL af3be98e3b3bdf35ecdc502e5e9e8c09fa3db1ef0727dab640b99d78d675fe095b6c3e953bbb75532e3a1228a0278578cacfa2e7d0fef875de7f4a923076ad6f
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-0.10.22.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-0.10.22.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libmms/gst-plugins-libmms-0.10.22.ebuild,v 1.9 2012/12/02 16:18:59 eva Exp $
-
-EAPI="1"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.33:0.10
-	>=media-libs/libmms-0.4"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.0.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.0.3.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.0.3.ebuild,v 1.3 2013/02/02 22:54:34 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmms-0.4"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@ -1,4 +1,2 @@
-DIST gst-plugins-good-0.10.30.tar.bz2 3361361 SHA256 b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6 SHA512 2b3421700870624db956aaccb855d64a346178483f26901c78268cd4f4b0043fda6679c24a60a505713d142712f53bc999c24aad45c0fdf531cbb91799da7af2 WHIRLPOOL 2bd9a865c249abb7aa96357c91282ceb5734b8647fea2810c8be7f71e5b0fd0f13b33ba79bab53d2f2aa7d0f506594f74fa1e1072e845b07f8c951fb6a751ff3
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.0.3.tar.xz 2714708 SHA256 92ab8bdee2e539a5302c1b0c8d460e638da33ebf89142caee210cb0c9720c68e SHA512 65273a150c134629bc29ea6d69bd39bf01b08fa888ebab84e458abc1c7c693fa5983baf153d0301b968dd391ad5ad29d6b17ac182f01c7c96b426cf19402aff8 WHIRLPOOL 991e92225bd55a0f0b57869f8fd78dac3e1f7b1876b506564e12c4784adc9378e708f0f610e00d95b007878c6c38fa65d462993932af698f7f6fc2ec3b1d4d69
 DIST gst-plugins-good-1.0.5.tar.xz 2710452 SHA256 53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5 SHA512 1a135c6bc271f52c99cddc29547260aeb4f01c15fd6afaedda8601f13f526c36718bb74d582b12bfd40a8e7f2e2a87755a7b961430e7a0ddfa719b96562ee192 WHIRLPOOL d0ca858a8d09b461665ae3b2b1cabfaaa16914e4ca88ccd8a9633da6f2fb8b396fe85e8ce0992219c2ca089ca7fdf00ed13d43caf502dc081be422a4a0f8ef26
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.30.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.30.ebuild
@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/gst-plugins-libpng-0.10.30.ebuild,v 1.6 2012/12/02 16:19:31 eva Exp $
-
-EAPI="3"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.4
-	>=media-libs/gst-plugins-base-0.10.33:0.10"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.0.3.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.0.3.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.0.3.ebuild,v 1.1 2012/12/03 23:46:50 eva Exp $
-
-EAPI="5"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.4"
-DEPEND="${RDEPEND}"
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@ -1,4 +1,2 @@
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
-DIST gst-plugins-base-1.0.3.tar.xz 2344500 SHA256 066ba8a7fa709a25ad291f7b21329b73f513637aafceee00396e588e723d7f9e SHA512 78d2a4a32d4c6527d055e57aff35a83dcf6246780cf06bbfc726c5eea693379b806568a0410d88bb50fb54a2c3a6faa515105fc17f59a51d092b4e01a3ee28ff WHIRLPOOL 00d656315b652dbfd1d68b426702756fbbfbaa087c0fad2690f8b4801b8e31cd44835b670c39917b70f5f1ebb1f907df515f93587e53eaa2f0cd90d117607025
 DIST gst-plugins-base-1.0.5.tar.xz 2351532 SHA256 37ce6e09b99ef3879111c861ee5090582b4fd4c764e81ab6eb2b2b4dd77d7173 SHA512 261e0273f8fa34f6261a911b35d20d27056e48c6d851a163d924031e46ee6811617ed35367a3d2b5c67fb645231e2eab191c8604bc0f2569ea5bd3cf5b697833 WHIRLPOOL c811c77bfa24eb628c7acec2df72aea39d89ed530deefacaee5a96a0ac9a78f196232540dd71439dee183479fc30aa6e71cfc14147e7dfc49272334d34da94b8
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.35.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.35.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.35.ebuild,v 1.9 2012/12/02 18:23:58 eva Exp $
-
-EAPI="3"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libvisual-0.4
-	>=media-plugins/libvisual-plugins-0.4"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	gst-plugins10_system_link \
-		gst-libs/gst/audio:gstreamer-audio \
-		gst-libs/gst/video:gstreamer-video
-}
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.0.3.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.0.3.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.0.3.ebuild,v 1.5 2013/02/02 22:54:57 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libvisual-0.4
-	>=media-plugins/libvisual-plugins-0.4"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	gst-plugins10_system_link \
-		gst-libs/gst/audio:gstreamer-audio \
-		gst-libs/gst/video:gstreamer-video
-}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST os_diskconfig_python_novaclient_ext-0.1.1.tar.gz 2013 SHA256 1edcb7b39070b773f5d3cef015906dfd257e80e7116bf613770e748ed469f1ca SHA512 0b71de275c1909455909c3e1c4b2a09f69ddfa3970e79ef0e77783b61737997e470038970dd1e1eea22d2a7f3ee1cbf899dcdc0672f8d0f220ce68c4a6e629b2 WHIRLPOOL a573e9949e49ef6fec509e8e75f366b5ec1a502b98437b4464784ad017153499731e930468011aecdc61104c966c5c226bee7d42ef9910e3638b2fb9f09d8c5c`
				`@ -0,0 +1 @@`
				`DIST os_networksv2_python_novaclient_ext-0.21.tar.gz 2171 SHA256 2598aaaf19a6897be8427a402bb10b772178ed3c8922d9d955fa411ed8ec11a8 SHA512 077549d05addcdaedf9ea07f3fd15cc35f0282602cd46406666ce3a395ce5ca00f48fe70ac64269998bcf661f3e220115ed497abf0d78688f0d9d8a78297db0c WHIRLPOOL fee01e4c71ef57e02efe0ba216b00cf22be3b637515eccf87e7fbccc84a1622926cb2445c520d6faaafe83dfc0955bac6bd13edef7c091d1b19762c8738e0c83`
				`@ -0,0 +1 @@`
				`DIST rackspace-auth-openstack-1.0.tar.gz 6583 SHA256 3ab3de4e3d25a5b5f6014a9c74763f65859d4425cb96c46e5916e7e9718a0791 SHA512 47ef81a4f14e8bed8823a04d1a894e380a86d24b176d49f7d9f076d21f00f489f7851ed390ce4e62399e74e1f39a0c4d242b3f6f4e6c8da54ad7516778c03f1b WHIRLPOOL 8782b023d7ae20686a6f75bd77db2763b6055a33628374c71757f5d97916b0f3d09f688b8407f14909b6d3627133ef31275a9fdbf578c3aa9c4688b153935c33`
				`@ -0,0 +1 @@`
				`DIST rackspace-novaclient-1.2.tar.gz 1462 SHA256 c7d99bf26f89e6b7c827ba8a0253a3a06c53c2d31558968b85959bf9b5925cd5 SHA512 4a83e5beb685e3bfd3a7f85ca0a93e9112b2572bbeff8a3c8f1a417256071b894dbf8525a0ba054ad7b89c79708c5b18c9b32464f725edf73b5cb2756c1fbb28 WHIRLPOOL ec4b5b821ac16be8a44dd439209138505aae2530a743d4222afc20c7b5dc76e53f1a436e163ba08b153a17b56fc1af475663f82e5e7db6a35c87e6c984b94e2b`
				`@ -0,0 +1 @@`
				`DIST rax_backup_schedule_python_novaclient_ext-0.1.2.tar.gz 3090 SHA256 90714932d20928e89f03a1e40c8bbe0ebf911cdf5faae9072b98eb14648363c0 SHA512 fd363e55ad4fe55962a14b29c8daebde81a564d816dc6f55a0044e47aae32a621ddf7968941a29e69256e4bbc9ca02bb44e6045aaf602bed5b87cc4a71316703 WHIRLPOOL 1405818cdae150b7b846d9e722250d8a1e08bd739764adc91680404f485e6d0182b148b1de317a3a8027a5bd50cb886ccbd95b1d45824d405f1c53c8c194a482`
				`@ -0,0 +1 @@`
				`DIST rax_default_network_flags_python_novaclient_ext-0.1.3.tar.gz 2399 SHA256 7241364afc39f88a29996d5d6aceb0b2ba2f85ba24496d433e245db32f6905aa SHA512 d3142f7c0a6cba84e07c1dd85c26425d8f21c6f170765a175f0dec914416a72127488c7d448643a0bec37eb6cd5237d2037a390d7c4df7e5f696519f05a9d017 WHIRLPOOL 995e545ebbe9493a699b33d42b6cdc20f3da0d451007c960e97f7a58fe0305f23a0f63fff48d4bb5831334cb175678f223a47ad6474092259de08b0c479f5c00`