Sync with portage [Sun May 5 12:54:02 MSK 2013].

11 years ago · fea71964e6
parent f9972fa4c7
commit fea71964e6
159 changed files with 1915 additions and 896 deletions
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -1,3 +1,2 @@
-DIST salt-0.13.1.tar.gz 1016399 SHA256 944caedffef0d3d4ecdb34e3cf32749e32cdddf5b78fee759f43f63a3fd0430c SHA512 7fc4e63683f25b323e9717fe71e5bf397c60484f0cc65dec9f8a1a0b2f978d231a7a4f847abd523a5406d7afc80a7e38525fe480feeced28b6ed753c84931e4d WHIRLPOOL 21e590bb0f0ccaadeb27fbbeadb6029e68d1b62849e11c0dbc5b128d5339f2c50b924f2c61ee466126cf0cb295bbdcb79067ade0939710f233a644e561f65893
-DIST salt-0.14.0.tar.gz 3343825 SHA256 219b3b1a81407ba107a22754753ef882369df697da5b0ac74cfbbf67a702c664 SHA512 b59d211ee5693338d0a2d3026618ee9a35314f8ea86dfde9344d505e0b9a4d60385dea01e8f38fd5fff77fa6d1615fcd2c85064185b9e60302a03b3e184107e3 WHIRLPOOL d487c799f0f98518986b30bd6e02502227ea036bfe4ae78a1dd933fe80742f8992991b8ed84ec89bb62db9dca412e865866459509a439d421531eebbbf7d7687
 DIST salt-0.14.1.tar.gz 3366334 SHA256 615fb644da111c8e7c500ac23cd258edec24d7db7bd4f5a40a465b56e54e0fd1 SHA512 7c8624274e4247ad8d4153c1ed4185504daac1557e2dc0bde1ac49d6090130467bf478408a962f745d5ff80a9e6453e0c40fc26bc3161c26a087bd7a67f223e4 WHIRLPOOL 692b5ee28c5cfafc02dbdf9028b60fe3f3d1431b952ac9ba1998f43f0df2beb137c421aafc20e5f99d753ba987b6e065559b2b9d265d3924c5e614ea3b878454
+DIST salt-0.15.0.tar.gz 3411308 SHA256 7d7d8c372571e0d3f36eea8e04a692ac566197030dffeb145e5b7282e56bd3d5 SHA512 08805f10e0101090f8fa67c9dfa3190ed81ff5754f29235e0b8aae45ba55233c0a80559d5975bf0a16880820b349dbe6e2136b3469690b7b691fd153aaa26b29 WHIRLPOOL a2c7037d703546efe3f39b8b293152180d63634a4a190e4c1de3d5f7f9d3ece804b59827567c2f423240fd953b774d5772f152b98a640384e2c4deb0c05b3034
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@ -25,6 +25,7 @@ backbone of cloud and data center management.
 		<flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
 		<flag name="mongodb">Support returning data to a mongodb server.</flag>
 		<flag name="redis">Support returning data to a redis database.</flag>
+		<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
 	</use>
 </pkgmetadata>

--- a/app-admin/salt/salt-0.14.0.ebuild
+++ b/app-admin/salt/salt-0.14.0.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.14.0.ebuild,v 1.1 2013/03/26 00:51:44 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9
-		dev-python/msgpack
-		dev-python/pyyaml
-		dev-python/m2crypto
-		dev-python/pycrypto
-		dev-python/pycryptopp
-		dev-python/jinja
-		ldap? ( dev-python/python-ldap )
-		openssl? ( dev-python/pyopenssl )
-		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
-DEPEND="test? (
-			dev-python/virtualenv
-			${RDEPEND}
-		)"
-
-src_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	dodoc README.rst AUTHORS
-}
-
-python_test() {
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
--- a/app-admin/salt/salt-0.15.0-r1.ebuild
+++ b/app-admin/salt/salt-0.15.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.13.1.ebuild,v 1.1 2013/02/19 18:54:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.15.0-r1.ebuild,v 1.1 2013/05/04 23:08:49 chutzpah Exp $

 EAPI=5

@ -24,44 +24,46 @@ fi

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako mongodb mysql openssl redis test"

-RDEPEND=">=dev-python/pyzmq-2.1.9
-		dev-python/msgpack
-		dev-python/pyyaml
-		dev-python/m2crypto
-		dev-python/pycrypto
-		dev-python/pycryptopp
-		dev-python/jinja
-		ldap? ( dev-python/python-ldap )
-		openssl? ( dev-python/pyopenssl )
+RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/m2crypto[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		dev-python/pycryptopp[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
+		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
 DEPEND="test? (
 			dev-python/virtualenv
 			${RDEPEND}
 		)"

-src_prepare() {
+python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-	epatch "${FILESDIR}"/${P}-disable-failing-tests.patch
-
-	distutils-r1_src_prepare
 }

-src_install() {
-	distutils-r1_src_install
-
+python_install_all() {
 	for s in minion master syndic; do
 		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
 	done

+	insinto /etc/${PN}
+	doins conf/*
+
 	dodoc README.rst AUTHORS
 }

 python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
 	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
 }
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.3 2013/03/26 00:51:44 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.5 2013/05/04 23:11:34 chutzpah Exp $

 EAPI=5

@ -24,43 +24,46 @@ fi

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako mongodb mysql openssl redis test"

-RDEPEND=">=dev-python/pyzmq-2.1.9
-		dev-python/msgpack
-		dev-python/pyyaml
-		dev-python/m2crypto
-		dev-python/pycrypto
-		dev-python/pycryptopp
-		dev-python/jinja
-		ldap? ( dev-python/python-ldap )
-		openssl? ( dev-python/pyopenssl )
+RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/m2crypto[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		dev-python/pycryptopp[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
+		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
 DEPEND="test? (
 			dev-python/virtualenv
 			${RDEPEND}
 		)"

-src_prepare() {
+python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	distutils-r1_src_prepare
 }

-src_install() {
-	distutils-r1_src_install
-
+python_install_all() {
 	for s in minion master syndic; do
 		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
 	done

+	insinto /etc/${PN}
+	doins conf/*
+
 	dodoc README.rst AUTHORS
 }

 python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
 	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
 }
--- a/app-arch/unar/unar-1.5.ebuild
+++ b/app-arch/unar/unar-1.5.ebuild
@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/unar-1.5.ebuild,v 1.1 2013/01/10 22:17:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unar/unar-1.5.ebuild,v 1.2 2013/05/05 05:00:38 vapier Exp $

 EAPI=4

 inherit toolchain-funcs

-DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3."
+DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
 HOMEPAGE="http://unarchiver.c3.cx/"
 SRC_URI="http://theunarchiver.googlecode.com/files/${PN}${PV}_src.zip"
-LICENSE="LGPL-2.1"

+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@ -25,16 +25,18 @@ S="${WORKDIR}/The Unarchiver/XADMaster"

 src_compile() {
 	emake -f Makefile.linux \
+		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		OBJCC="$(tc-getCC)" \
-		C_OPTS="-std=gnu99 ${CFLAGS}" \
-		OBJC_OPTS="-std=gnu99 ${CFLAGS}" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime \
-		${LDFLAGS}" || die "emake failed"
+		C_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
+		CXX_OPTS="${CXXFLAGS} ${CPPFLAGS}" \
+		OBJC_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
+		LD="$(tc-getCXX)" \
+		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
 }

 src_install() {
-	dobin unar lsar || die "dobin failed"
-	doman ../Extra/lsar.1 ../Extra/unar.1 || die "doman failed"
+	dobin {ls,un}ar
+	doman ../Extra/{ls,un}ar.1
 }
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@ -1 +1,2 @@
 DIST cardpeek-0.7.1.tar.gz 599238 SHA256 fa7f4fcabf211fefb968a5a49099e9a07430995556b7d59e95eeefef59538546 SHA512 8ea7f69e096de37543fec779372355a6f6cad709e43a4a66a072b453f962ebe55d25e432fb426cd88824f7165d724ddc6da55a6106e571608162b8094823be45 WHIRLPOOL 95f41d53840969beb3b98729c22ed8fe1e781ab6fe36ad3387cddf52963c2d56f5bca95955681cea839ce64ab6afddfc4d3cbf403e320d8dfec37ac0bd3a68bd
+DIST cardpeek-0.7.2.tar.gz 1130295 SHA256 9908b38a91b4df80ec5a6d6a89780dd41684dc1f203587c1bcc8e4a13cb24ed2 SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd WHIRLPOOL 777397ca535d820453e4d315be495fc5cf845feea457c666cf935d19b8e2c7556b51e4e23f8d009c6165626c450fe5b92413841d0ee56fd6f1d549716ee05e56
--- a/app-crypt/cardpeek/cardpeek-0.7.2.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.7.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/app-crypt/cardpeek/cardpeek-0.7.2.ebuild,v 1.1 2013/05/04 21:24:43 alonbl Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="https://code.google.com/p/cardpeek/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	sys-apps/pcsc-lite
+	=dev-lang/lua-5.1*
+	dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
--- a/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild
+++ b/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild,v 1.1 2013/05/04 21:51:30 alonbl Exp $
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libgcrypt-1.2.0"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.6"
+
+src_prepare() {
+	use test || sed -e "/SUBDIRS/s/ tests//" -i Makefile.am
+
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	use doc && dohtml doc/opencdk-api.html
+}
--- a/app-emulation/ganeti/ganeti-2.6.0.ebuild
+++ b/app-emulation/ganeti/ganeti-2.6.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.0.ebuild,v 1.3 2012/12/31 12:57:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.0.ebuild,v 1.4 2013/05/04 21:13:54 floppym Exp $

 EAPI="4"

@ -54,7 +54,6 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 		dev-haskell/text
 		dev-haskell/hinotify )
 	dev-libs/openssl
-	dev-python/elementtree
 	dev-python/paramiko
 	dev-python/pyopenssl
 	virtual/pyparsing
--- a/app-emulation/ganeti/ganeti-2.6.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.6.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.1.ebuild,v 1.2 2012/12/31 12:57:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.1.ebuild,v 1.3 2013/05/04 21:13:54 floppym Exp $

 EAPI="4"

@ -54,7 +54,6 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 		dev-haskell/text
 		dev-haskell/hinotify )
 	dev-libs/openssl
-	dev-python/elementtree
 	dev-python/paramiko
 	dev-python/pyopenssl
 	virtual/pyparsing
--- a/app-emulation/ganeti/ganeti-2.6.2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.6.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.3 2012/12/31 12:57:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.4 2013/05/04 21:13:54 floppym Exp $

 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@ -56,7 +56,6 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 		dev-haskell/text
 		dev-haskell/hinotify )
 	dev-libs/openssl
-	dev-python/elementtree
 	dev-python/paramiko
 	dev-python/pyopenssl
 	virtual/pyparsing
--- a/app-emulation/lxc/lxc-0.8.0-r1.ebuild
+++ b/app-emulation/lxc/lxc-0.8.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0-r1.ebuild,v 1.1 2012/11/14 02:15:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0-r1.ebuild,v 1.2 2013/05/04 21:42:25 jlec Exp $

 EAPI="4"

@ -84,6 +84,7 @@ ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS	some GRSEC features m
 DOCS=(AUTHORS CONTRIBUTING MAINTAINERS TODO README doc/FAQ.txt)

 src_prepare() {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	if [[ -n ${BACKPORTS} ]]; then
 		epatch "${WORKDIR}"/patches/*
 		eautoreconf
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@ -8,7 +8,6 @@
  <maintainer>
    <email>dev-zero@gentoo.org</email>
  </maintainer>
-
  <use>
    <flag name="vanilla">
      Avoid adding Gentoo Linux-specific modifications, which include
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,2 +1,3 @@
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
 DIST calibre-0.9.28.tar.xz 28746916 SHA256 25fcc71a394f42ed701f215249f4b17b940c8fcf0a51f480c14f0fc3c7ff31f2 SHA512 eb237c9a96ddb53a567bb59bdd37f803c1d21b96517fea7c8f14fb02df107a17fca471375183c83602866750ace644c95816a04e3b29aa9d43c4470ef2128838 WHIRLPOOL 668a2106e8a7fa366161ec9a36d8d859842b2e31aee517f82b8bb6cf5820db21371f79fd8cd8d153c7673be1859e61909758cd020273343a1fa197b229b354dd
+DIST calibre-0.9.29.tar.xz 28819456 SHA256 29a789108772665000e895d0798b758068a4143807213de68fdd39aa85059058 SHA512 30a551a5108332741c80454264fa00fc1f332ccb9cd3c75b1c48253f027d84e4407e9e223325b0a0c36fc78ab1cd26b5dc02f7bb4d5dce486796bf3921b0252c WHIRLPOOL 349a4df78d3ad072b18133f398e72445fa74544e945a9d0e0cf3f4960c694d9d3ebd89cf43569d1020e319f1b4286858ad720cd8aaa5e79b1c12b907665ad5f6
--- a/app-text/calibre/calibre-0.9.27.ebuild
+++ b/app-text/calibre/calibre-0.9.27.ebuild
@ -1,12 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.3 2013/04/23 19:51:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.4 2013/05/05 02:13:32 zmedico Exp $

 EAPI=5
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"

-inherit python eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs

 DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
@ -23,6 +21,7 @@ IUSE="+udisks"
 COMMON_DEPEND="
 	>=app-text/podofo-0.8.2:=
 	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
 	>=dev-libs/chmlib-0.40:=
 	>=dev-libs/icu-4.4:=
 	>=dev-python/beautifulsoup-3.0.5:python-2
@ -55,11 +54,6 @@ DEPEND="${COMMON_DEPEND}

 S=${WORKDIR}/${PN}

-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
 src_prepare() {
 	# Fix outdated version constant.
 	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
@ -133,9 +127,9 @@ src_install() {
 	local libdir=$(get_libdir)
 	[[ -n $libdir ]] || die "get_libdir returned an empty string"

-	dodir "$(python_get_sitedir)" # for init_calibre.py
+	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/${libdir}" \
@ -173,7 +167,18 @@ src_install() {
 		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
 	done

-	python_convert_shebangs -r $(python_get_version) "${ED}"
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die

 	newinitd "${FILESDIR}"/calibre-server.init calibre-server
 	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
@ -182,9 +187,4 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
 }
--- a/app-text/calibre/calibre-0.9.29.ebuild
+++ b/app-text/calibre/calibre-0.9.29.ebuild
@ -0,0 +1,190 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.29.ebuild,v 1.1 2013/05/05 02:07:32 zmedico Exp $
+
+EAPI=5
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE="+udisks"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	>=dev-python/beautifulsoup-3.0.5:python-2
+	dev-python/netifaces
+	dev-python/python-dateutil
+	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
+	>=dev-python/cssutils-0.9.9
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/imaging-1.1.6
+	>=dev-python/lxml-2.2.1
+	>=dev-python/mechanize-0.1.11
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/freetype-2:=
+	>=media-libs/libwmf-0.2.8
+	>=media-libs/libmtp-1.1.4:=
+	virtual/libusb:1=
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|PreserveMIMEDefaults():||" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|xdg-mime install|\\0 --mode user|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
+	# due to bug #389515 (instead, calibre now calls udisks via dbus).
+	rm "${ED}usr/bin/calibre-mount-helper" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
+	rm -r "${ED}"usr/etc/bash_completion.d
+	find "${ED}"usr/etc -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/dev-libs/angelscript/angelscript-2.26.2-r1.ebuild
+++ b/dev-libs/angelscript/angelscript-2.26.2-r1.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.26.2-r1.ebuild,v 1.1 2013/05/04 22:05:59 hasufell Exp $
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+S2=${WORKDIR}/sdk_static
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	if use static-libs ; then
+		cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	einfo "Shared build"
+	emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+		if use static-libs ; then
+			einfo "Static build"
+			emake -C "${S2}"/${PN}/projects/gnuc
+		fi
+	fi
+}
+
+multilib_src_install() {
+	doheader ${PN}/include/angelscript.h
+	dolib.so ${PN}/lib/libangelscript-${PV}.so
+	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
+
+	if [[ ${ABI} == ${DEFAULT_ABI} ]] ; then
+		if use static-libs ; then
+			 dolib.a "${S2}"/${PN}/lib/libangelscript.a
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild,v 1.1 2013/05/04 21:15:16 alonbl Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="libmcrypt is a library that provides uniform interface to access several encryption algorithms."
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-rotate-mask.patch
+	mv configure.in configure.ac
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README THANKS TODO ChangeLog
+	dodoc doc/README.* doc/example.c
+}
--- a/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild
+++ b/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild,v 1.8 2013/02/02 22:26:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzeitgeist/libzeitgeist-0.3.18.ebuild,v 1.9 2013/05/04 21:59:19 jlec Exp $

 EAPI=4

@ -34,5 +34,11 @@ src_prepare() {
 	sed \
 		-e '/TEST_PROGS      += test-log/d' \
 		-i tests/Makefile.am || die
+
+	sed \
+		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
+		-i configure.ac || die
+
 	autotools-utils_src_prepare
 }
--- a/dev-libs/libzeitgeist/metadata.xml
+++ b/dev-libs/libzeitgeist/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<maintainer>
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>eva@gentoo.org</email>
+    <name>Gilles Dartiguelongue</name>
+  </maintainer>
 </pkgmetadata>
--- a/dev-python/egg-python/egg-python-2.25.3.ebuild
+++ b/dev-python/egg-python/egg-python-2.25.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egg-python/egg-python-2.25.3.ebuild,v 1.10 2013/02/02 22:28:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egg-python/egg-python-2.25.3.ebuild,v 1.11 2013/05/04 22:09:22 jlec Exp $

 EAPI="2"

@ -35,6 +35,7 @@ EXAMPLES="examples/egg/tray*"

 src_prepare() {
 	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eautoreconf
 	gnome-python-common_src_prepare
 }
--- a/dev-python/egg-python/metadata.xml
+++ b/dev-python/egg-python/metadata.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>python</herd>
+  <herd>gnome</herd>
+  <herd>python</herd>
 </pkgmetadata>
--- a/dev-python/elixir/elixir-0.7.1-r1.ebuild
+++ b/dev-python/elixir/elixir-0.7.1-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elixir/elixir-0.7.1-r1.ebuild,v 1.1 2012/11/10 13:09:28 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elixir/elixir-0.7.1-r1.ebuild,v 1.2 2013/05/04 21:20:52 floppym Exp $

 EAPI="2"
 PYTHON_DEPEND="2"
@ -24,7 +24,6 @@ RDEPEND=">=dev-python/sqlalchemy-0.4.0"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
 	doc? ( >=dev-python/docutils-0.4-r3
-		>=dev-python/elementtree-1.2.6
 		>=dev-python/kid-0.9
 		>=dev-python/pygments-0.8.1
 		>=dev-python/pudge-0.1.3
--- a/dev-python/flask-restless/Manifest
+++ b/dev-python/flask-restless/Manifest
@ -0,0 +1 @@
+DIST flask-restless-0.10.0.tar.gz 495229 SHA256 ce4d2a018a15f31b24235dad5ae9be554094d818cf95c5654293f63b03baa9d5 SHA512 b6910a44b265a429ddaeca071376f1ab0f78cba7951ef6d5f2ace1a48403624229e0fb64e75c9ea7fa4173cbf0b143aa61801ff36e190cea986ea81781259a85 WHIRLPOOL 426e823fa5eef30b74a6f2692a0d5182ada47fd8892db915e852fded072b8fe333707c0eb470cc775be710f4b9f166bbd481c0188585ae5d32d270da1bda0408
--- a/dev-python/flask-restless/flask-restless-0.10.0.ebuild
+++ b/dev-python/flask-restless/flask-restless-0.10.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.10.0.ebuild,v 1.1 2013/05/04 22:51:10 rafaelmartins Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+DESCRIPTION="Flask extension for easy ReSTful API generation"
+HOMEPAGE="http://packages.python.org/Flask-Restless/"
+SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( AGPL-3 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Can't build docs for now, missing deps
+#IUSE="doc"
+IUSE=""
+
+RDEPEND=">=dev-python/flask-0.7
+	dev-python/flask-sqlalchemy
+	dev-python/sqlalchemy
+	dev-python/python-dateutil"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? ( dev-python/unittest2 )"
+
+PYTHON_MODNAME="flask_restless"
--- a/dev-python/flask-restless/metadata.xml
+++ b/dev-python/flask-restless/metadata.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+</pkgmetadata>
+
--- a/dev-python/gdata/gdata-2.0.14.ebuild
+++ b/dev-python/gdata/gdata-2.0.14.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.14.ebuild,v 1.10 2012/08/02 22:35:14 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.14.ebuild,v 1.11 2013/05/04 21:22:22 floppym Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ssl(+)"
+PYTHON_USE_WITH="ssl(+) xml"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"

@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples"

-DEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree )"
+DEPEND=""
 RDEPEND="${DEPEND}"

 S="${WORKDIR}/${MY_P}"
--- a/dev-python/lxml/files/lxml-test-elementtree.patch
+++ b/dev-python/lxml/files/lxml-test-elementtree.patch
@ -0,0 +1,43 @@
+From a7853944dacbe12097c1ef15836caeffbab8396c Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Sat, 4 May 2013 14:00:06 +0200
+Subject: [PATCH] prefer stdlib ET over externally installed version as the
+ stdlib has taken the lead now
+
+---
+ src/lxml/tests/common_imports.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lxml/tests/common_imports.py b/src/lxml/tests/common_imports.py
+index 645a7db..c528a3c 100644
+--- a/src/lxml/tests/common_imports.py
+++ b/src/lxml/tests/common_imports.py
+@@ -19,10 +19,10 @@ def make_version_tuple(version_string):
+ IS_PYTHON3 = sys.version_info[0] >= 3
+ 
+ try:
+-    from elementtree import ElementTree # standard ET
+    from xml.etree import ElementTree # Python 2.5+
+ except ImportError:
+     try:
+-        from xml.etree import ElementTree # Python 2.5+
+        from elementtree import ElementTree # standard ET
+     except ImportError:
+         ElementTree = None
+ 
+@@ -32,10 +32,10 @@ def make_version_tuple(version_string):
+     ET_VERSION = (0,0,0)
+ 
+ try:
+-    import cElementTree # standard ET
+    from xml.etree import cElementTree # Python 2.5+
+ except ImportError:
+     try:
+-        from xml.etree import cElementTree # Python 2.5+
+        import cElementTree # standard ET
+     except ImportError:
+         cElementTree = None
+ 
+-- 
+1.8.1.6
+
--- a/dev-python/lxml/lxml-3.2.0.ebuild
+++ b/dev-python/lxml/lxml-3.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.2 2013/05/04 16:05:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.3 2013/05/04 20:40:24 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 # lxml tarball contains files pregenerated by Cython.

+PATCHES=( "${FILESDIR}/lxml-test-elementtree.patch" )
+
 python_prepare_all() {
 	# avoid replacing PYTHONPATH in tests.
 	sed -i -e '/sys\.path/d' test.py || die
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@ -1,2 +1,3 @@
 DIST pypy-1.9.tar.bz2 13466551 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68 SHA512 1e02f1f1ac493be35272212f2be62db17a01a95c56ffbd8c00a043587e38131e779928fef1383c61575ecb48bf4dc407b62726d30d5b5728221a612fe67ec8c3 WHIRLPOOL 5b601f31f695623c2e5f6d48ae902e07c5cdccafe415ae89878e5cf71408b31fc44fb1c173a93e66d81188503651000de219533e69071495b87d80a8d217274f
 DIST pypy-2.0_beta1.tar.bz2 13654084 SHA256 492fcdd8f37990e7364eb5f2c4b5c2b0f61b44b2603207b200fc2d4e44b413ce SHA512 50b8a26433fc04bb35c9a0669f7da94621eddb3e303c6eaf624b663e7b2f3656a80b238227204938fc22ef3c15fbabf1d04e09d3ddc0377be008f7f40d4c0721 WHIRLPOOL 07e2e430a1d01401a0bfbddb775652acaf09ab05d8d038a644454c9802a463cdb83287620ac8bb3af6f235d21228d1e462e3a041e5770773cb50786740ae259f
+DIST pypy-2.0_beta2.tar.bz2 14608838 SHA256 f8cdb5b1402dbedd329650cd54925a9c72f2e3140742f289bfa919bf1e190853 SHA512 bcbfa1c0f4f710d3846a1700569cb2aa5e00b5b2cc0a16ae7f2ba6a922e35b22e790984fa9c161939f24b3917fed779c1b29ade5163231cffcbb1763a69053c4 WHIRLPOOL 5615194d0cb8056a2c63d339ad6a53d4ea4c4657e47d3095fbd4b99d003f29d37ad88838c9ea071bf3fb375a1f51b762a77242ff2c91c5abb92d69f47473ea34
--- a/dev-python/pypy/files/2.0-no-static-hack-r1.patch
+++ b/dev-python/pypy/files/2.0-no-static-hack-r1.patch
@ -0,0 +1,39 @@
+Remove logic that links to libssl and libcrypto statically if
+possible. Just always link dynamically: Gentoo is expected to have
+sane dynamic libraries for us to use, and our users are not expected
+to copy their pypy binary to a system with an incompatible
+libssl/libcrypto and expect it to work.
+
+Based on patch contributed by XU Benda <heroxbd@gentoo.org>.
+
+--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
+@@ -20,27 +20,8 @@
+         # so that openssl/ssl.h can repair this nonsense.
+         'wincrypt.h']
+ else:
+-    libraries = ['z']
+    libraries = ['z','ssl','crypto']
+     includes = []
+-    if (sys.platform.startswith('linux') and
+-        os.path.exists('/usr/lib/libssl.a') and
+-        os.path.exists('/usr/lib/libcrypto.a')):
+-        # use static linking to avoid the infinite
+-        # amount of troubles due to symbol versions
+-        # and 0.9.8/1.0.0
+-        link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a']
+-        testonly_libraries += ['ssl', 'crypto']
+-    elif (sys.platform.startswith('linux') and
+-        os.path.exists('/usr/local/ssl/lib/libssl.a') and
+-        os.path.exists('/usr/local/ssl/lib/libcrypto.a')):
+-        # use static linking, 2nd version
+-        include_dirs += ['/usr/local/ssl/include']
+-        link_files += ['/usr/local/ssl/lib/libssl.a',
+-                       '/usr/local/ssl/lib/libcrypto.a',
+-                       '-ldl']
+-        testonly_libraries += ['ssl', 'crypto']
+-    else:
+-        libraries += ['ssl', 'crypto']
+ 
+ includes += [
+     'openssl/ssl.h', 
--- a/dev-python/pypy/pypy-2.0_beta2.ebuild
+++ b/dev-python/pypy/pypy-2.0_beta2.ebuild
@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta2.ebuild,v 1.1 2013/05/05 04:37:13 floppym Exp $
+
+EAPI=5
+
+# XXX: test other implementations
+PYTHON_COMPAT=( python2_7 pypy{1_8,1_9,2_0} )
+inherit check-reqs eutils multilib multiprocessing python-any-r1 toolchain-funcs vcs-snapshot versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV/_/-}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT=$(get_version_component_range 1-2 ${PV})
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	dev-libs/expat
+	bzip2? ( app-arch/bzip2 )
+	ncurses? ( sys-libs/ncurses )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+PDEPEND="app-admin/python-updater"
+
+pkg_pretend() {
+	CHECKREQS_MEMORY="2G"
+	use amd64 && CHECKREQS_MEMORY="4G"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch"
+	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/2.0-distutils-fix_handling_of_executables_and_flags.patch"
+
+	# The following is Gentoo-specific.
+	epatch "${FILESDIR}/2.0-no-static-hack-r1.patch"
+}
+
+src_compile() {
+	tc-export CC
+
+	local args=(
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+		ssl:_ssl
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+}
+
+src_install() {
+	local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
+	doins -r include lib_pypy lib-python pypy-c
+	fperms a+x ${INSDESTTREE}/pypy-c
+	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
+	dodoc README.rst
+
+	if ! use sqlite; then
+		rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
+		rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
+	fi
+
+	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=${ED}${INSDESTTREE}/pypy-c
+	fi
+
+	# Generate Grammar and PatternGrammar pickles.
+	PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" \
+		"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# compile the installed modules
+	python_optimize "${ED}${INSDESTTREE}"
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+src_test() {
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
+}
--- a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
+++ b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild,v 1.1 2013/05/04 20:18:21 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P="yum-metadata-parser-${PV}"
+
+DESCRIPTION="sqlite cacher for python applications"
+HOMEPAGE="http://yum.baseurl.org/"
+SRC_URI="http://yum.baseurl.org/download/yum-metadata-parser/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# glib and libxml2 are used via an extension module written in C.
+# No need to add PYTHON_USEDEP here.
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
--- a/dev-python/turbogears/turbogears-1.0.8.ebuild
+++ b/dev-python/turbogears/turbogears-1.0.8.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.8.ebuild,v 1.4 2011/04/12 16:22:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.8.ebuild,v 1.5 2013/05/04 21:39:53 floppym Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -33,8 +33,6 @@ RDEPEND=">=dev-python/turbojson-1.1.4
 	>=dev-python/configobj-4.3.2
 	|| ( =dev-lang/python-2.4*
 		( =dev-lang/python-2.5* >=dev-python/cheetah-2.0_rc7-r1 ) )
-	|| ( =dev-lang/python-2.5*
-		( =dev-lang/python-2.4* >=dev-python/celementtree-1.0.5 ) )
 	>=dev-python/sqlobject-0.7
 	test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3
 		|| ( =dev-lang/python-2.5*
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@ -1,2 +1 @@
-DIST kramdown-0.14.1.gem 277504 SHA256 e79fe2df71f0a411407d55aa58ddeb8d04d88be9bbbd99629945de02c878373f SHA512 0cc55ae3f316bbfd3d6bbdca8939944b5087370c892fc47ad4234f094b5f979f03163323d8953f28d9129fa28504cd5d387fd814c6073d206b27bee0b5caf113 WHIRLPOOL ebb195c85f849c6b4c133f5c38910564b0dd9cb002996af3567ba682f798f5b3fc8a6e5f2341c5661a8b81631103b87aecdc9b82ee8239f05d0ca60983dbaf27
 DIST kramdown-0.14.2.gem 278528 SHA256 4351344ebf3b986990341987320d076486d5b1b63032bdf5bfb5eb10d1a43eb7 SHA512 07f3f3b300497196463f660d3d5ec3548c91df79592320e8469a475ced70df21da921d0b00daa1410a9ee9d3ebc0bc4aa12338eabc76d1303264385d6e6f86d2 WHIRLPOOL 473669c9267ed914407214fee7c4c16cf058be4bed5cbef498728578f57fe8550fe2cf7b57889e644a269442560fb2b7b9771f16e3b0c254b20b3760139344cd
--- a/dev-ruby/kramdown/kramdown-0.14.1.ebuild
+++ b/dev-ruby/kramdown/kramdown-0.14.1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/kramdown/kramdown-0.14.1.ebuild,v 1.1 2012/12/01 10:32:34 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS ChangeLog CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition."
-HOMEPAGE="http://kramdown.rubyforge.org/"
-
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/coderay-1.0.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@ -1,2 +1 @@
-DIST libxml-ruby-2.2.1.gem 244224 SHA256 ec2bac12e6a6b2d871e799892771f03bdb4e13577b70a3d2f5734396c69790ea SHA512 720a0c74c3a61c3d5bd778042cd931c7db20a480d33f7bc1d451dd7e8cb2ea988125dbd74b0b181f8ce7291c1bd4606c8da9a2856b238947bb51e9732a4b2327 WHIRLPOOL ca3ebd22dc55c613b4cf3cded2c1239d5b55ecb131b279b3badedd6b8ed95985899a36a494b279691942184ced4a0a4c9862cca80e2284a2bc46e455ea30aadb
 DIST libxml-ruby-2.4.0.gem 260608 SHA256 5dabf6d9859ede50a6ffb0230f7031741037c1d6ac38988e816a90b208c2467f SHA512 870d72b978cf6b09ee932dff424ca8735d106b6b237a0b0ab963f8b14829adb48e4303ceaa6e382b28bb7b510648467d33a53cb40aa56f3e350227856ba18b99 WHIRLPOOL e73dd0e8a30824516de02a279068dd4a26f5c991bf2558aaaf2deb64089b9bf0d7b08758fe52276335898440f21c755091877b2ce9654f147d566dd5b96ffba6
--- a/dev-ruby/libxml/libxml-2.2.1.ebuild
+++ b/dev-ruby/libxml/libxml-2.2.1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.2.1.ebuild,v 1.11 2013/01/15 07:16:14 zerochaos Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
-HOMEPAGE="http://libxml.rubyforge.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r test/test_helper.rb test/test_suite.rb || die
-}
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@ -1,2 +1 @@
-DIST listen-0.7.2-git.tgz 34804 SHA256 67ca0a2b4dd47b156265804d8b2230188430afcf59309dbcfec8458f52d14eb1 SHA512 1d12c78fafc9d0f9d60c89784338a4fb9e1600989aefdcfe1aadf330b321fc7deae62e8df746585591027a08c84cd505b55ca218ea256ae387911bec286b97ea WHIRLPOOL 027777ffdeecddf92c8ba143e4b736c5516f162379555912ee863b4f8a4686ac9d1843f18e107f210db04e2ef9989204650e6265d3db411f99718d081a9daddf
 DIST listen-0.7.3-git.tgz 34831 SHA256 e6e1b8b45251e5bdcb397a9774dea57918ab091b6358ae42654a99bda280686b SHA512 9d4297f24b63449f3293f750d903170793b31c2a7d0a87c16bc4c3b741b993e0cc06ec5408d7a2c706505641fa3cd3f070cc09e7a7a5d358d8f18f26b41fb408 WHIRLPOOL da8c416f3e2757f146c6bdc83f7c527b8c566ac7716b52408788abd3407c2ac823d5f1cb94dd3df92ce75e5510705aa7bb65f9833974c3be20c18a470d9e5659
--- a/dev-ruby/listen/listen-0.7.2-r1.ebuild
+++ b/dev-ruby/listen/listen-0.7.2-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.2-r1.ebuild,v 1.1 2013/01/21 12:09:32 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Listens to file modifications and notifies you about the changes."
-HOMEPAGE="https://github.com/guard/listen"
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.8.8"
-
-all_ruby_prepare() {
-	# Adhere to semantic versioning.
-	sed -i -e '/rb-inotify/ s/0.8.8/0.8/' lib/listen/adapters/linux.rb || die
-}
--- a/dev-util/osc/osc-0.139.1.ebuild
+++ b/dev-util/osc/osc-0.139.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.2 2013/03/18 10:29:48 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-0.139.1.ebuild,v 1.3 2013/05/04 21:28:50 floppym Exp $

 EAPI=5

@ -33,7 +33,6 @@ KEYWORDS="amd64 x86"
 DEPEND="
 	dev-python/urlgrabber
 	dev-python/pyxml
-	dev-python/elementtree
 	app-arch/rpm[python]
 	dev-python/m2crypto
 "
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-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-util/osc/osc-9999.ebuild,v 1.8 2013/03/18 10:26:27 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/osc/osc-9999.ebuild,v 1.9 2013/05/04 21:28:50 floppym Exp $

 EAPI=5

@ -33,7 +33,6 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
 	dev-python/urlgrabber
 	dev-python/pyxml
-	dev-python/elementtree
 	app-arch/rpm[python]
 	dev-python/m2crypto
 "
--- a/dev-util/wiggle/metadata.xml
+++ b/dev-util/wiggle/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
 </pkgmetadata>
--- a/dev-util/wiggle/wiggle-0.9.ebuild
+++ b/dev-util/wiggle/wiggle-0.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.9.ebuild,v 1.5 2013/03/02 22:38:53 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.9.ebuild,v 1.6 2013/05/04 22:51:50 jlec Exp $

 EAPI=4

@ -43,6 +43,10 @@ src_prepare() {
 	# Use prefixed time binary
 	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"

+	sed \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+
 	ht_fix_file p

 	append-cppflags -I.
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.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-minimal.eclass,v 1.2 2013/04/07 16:56:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.3 2013/05/04 20:06:42 hasufell Exp $

 # @ECLASS: multilib-minimal.eclass
 # @MAINTAINER:
@ -84,7 +84,13 @@ multilib-minimal_src_install() {
 		if declare -f multilib_src_install >/dev/null ; then
 			multilib_src_install
 		else
-			default_src_install	
+			# default_src_install will not work here as it will
+			# break handling of DOCS wrt #468092
+			# so we split up the emake and doc-install part
+			# this is synced with __eapi4_src_install
+			if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then
+				emake DESTDIR="${D}" install
+			fi
 		fi
 		multilib_prepare_wrappers
 		multilib_check_headers
@ -96,4 +102,17 @@ multilib-minimal_src_install() {
 	if declare -f multilib_src_install_all >/dev/null ; then
 		multilib_src_install_all
 	fi
+
+	# this is synced with __eapi4_src_install
+	if ! declare -p DOCS &>/dev/null ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
+				THANKS BUGS FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif [[ $(declare -p DOCS) == "declare -a "* ]] ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
 }
--- a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
+++ b/media-libs/libv4l/libv4l-0.9.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.2 2013/05/04 16:55:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.3 2013/05/05 01:16:50 ssuominen Exp $

 EAPI=5
 inherit eutils linux-info udev multilib-minimal
@ -53,7 +53,7 @@ multilib_src_compile() {
 }

 multilib_src_install() {
-	emake -C lib DESTDIR="${D}" install
+	emake -j1 -C lib DESTDIR="${D}" install
 }

 multilib_src_install_all() {
--- a/media-libs/libv4l/libv4l-0.9.5.ebuild
+++ b/media-libs/libv4l/libv4l-0.9.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/media-libs/libv4l/libv4l-0.9.5.ebuild,v 1.2 2013/05/04 16:55:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5.ebuild,v 1.3 2013/05/05 01:16:50 ssuominen Exp $

 EAPI=5
 inherit eutils linux-info udev
@ -47,7 +47,7 @@ src_compile() {
 }

 src_install() {
-	emake -C lib DESTDIR="${D}" install
+	emake -j1 -C lib DESTDIR="${D}" install
 	dodoc ChangeLog README.lib* TODO
 	prune_libtool_files --all
 }
--- a/media-libs/libxmi/libxmi-1.2.ebuild
+++ b/media-libs/libxmi/libxmi-1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libxmi/libxmi-1.2.ebuild,v 1.1 2013/05/04 13:12:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libxmi/libxmi-1.2.ebuild,v 1.2 2013/05/04 21:04:58 jlec Exp $

 EAPI=5

@ -17,6 +17,9 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

+DEPEND="!<=media-libs/plotutils-2.6"
+RDEPEND="${DEPEND}"
+
 src_prepare() {
 	sed \
 		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ b/media-libs/libxmi/libxmi-1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libxmi/libxmi-1.3.ebuild,v 1.1 2013/05/04 13:44:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libxmi/libxmi-1.3.ebuild,v 1.2 2013/05/04 21:04:58 jlec Exp $

 EAPI=5

@ -13,7 +13,11 @@ HOMEPAGE="http://www.gnu.org/software/libxmi/"
 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 #mirror://gnu/${PN}/${P}.tar.gz"
 # Version unbundled from plotutils
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+
+DEPEND="!<=media-libs/plotutils-2.6"
+RDEPEND="${DEPEND}"
--- a/media-libs/plotutils/plotutils-2.6.ebuild
+++ b/media-libs/plotutils/plotutils-2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6.ebuild,v 1.11 2013/05/03 17:01:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.6.ebuild,v 1.12 2013/05/04 21:06:53 jlec Exp $

 EAPI=3
 inherit libtool eutils autotools
@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="+png static-libs X"

-DEPEND="png? ( media-libs/libpng
+DEPEND="
+	!media-libs/libxmi
+	png? ( media-libs/libpng
 		sys-libs/zlib )
 	X? ( x11-libs/libXaw
 		x11-proto/xextproto )"
--- a/media-plugins/mythplugins/mythplugins-0.25.3_p20130422.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.25.3_p20130422.ebuild
@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/mythplugins-0.25.3_p20130422.ebuild,v 1.1 2013/05/05 01:43:54 cardoe Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.6"
+BACKPORTS="dc6d68a2"
+MY_P=${P%_p*}
+
+inherit eutils python
+
+DESCRIPTION="Official MythTV plugins"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
+mythmusic mythnetvision mythnews mythweather"
+
+IUSE="${MYTHPLUGINS} cdda cdr exif fftw raw"
+
+DEPEND="!media-plugins/mytharchive
+	!media-plugins/mythbrowser
+	!media-plugins/mythgallery
+	!media-plugins/mythgame
+	!media-plugins/mythmovies
+	!media-plugins/mythmusic
+	!media-plugins/mythnetvision
+	!media-plugins/mythnews
+	!media-plugins/mythweather
+	=media-tv/mythtv-${PV}*[python]
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		dev-python/imaging
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythgallery? (
+		media-libs/tiff
+		virtual/opengl
+		exif? ( >media-libs/libexif-0.6.9 )
+		raw? ( media-gfx/dcraw )
+	)
+	mythmusic? (
+		>=media-libs/flac-1.1.2
+		>=media-libs/libvorbis-1.0
+		>=media-libs/taglib-1.6
+		media-sound/lame
+		virtual/opengl
+		cdda? (
+			dev-libs/libcdio
+			cdr? ( virtual/cdrtools )
+		)
+		fftw? ( sci-libs/fftw )
+	)
+	mythnetvision? (
+		=dev-lang/python-2*[xml]
+		dev-python/lxml
+		dev-python/mysql-python
+		dev-python/oauth
+		dev-python/pycurl
+	)
+	mythweather? (
+		dev-perl/DateManip
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/ImageSize
+		dev-perl/JSON
+		dev-perl/SOAP-Lite
+		dev-perl/XML-Simple
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-XPath
+	)"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	cdda? ( mythmusic )
+	cdr? ( mythmusic cdda )
+	exif? ( mythgallery )
+	fftw? ( mythmusic )
+	mythnews? ( mythbrowser )
+	raw? ( mythgallery )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--python=python2 \
+		--enable-opengl \
+		--disable-mythzoneminder \
+		$(use_enable mytharchive) \
+		$(use_enable mythbrowser) \
+		$(use_enable mythgallery) \
+		$(use_enable mythgame) \
+		$(use_enable mythmusic) \
+		$(use_enable mythnetvision) \
+		$(use_enable mythnews) \
+		$(use_enable mythweather) \
+		$(use_enable cdda cdio) \
+		$(use_enable exif) \
+		$(use_enable exif new-exif) \
+		$(use_enable raw dcraw) \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+}
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@ -1,2 +1,2 @@
-DIST freevo-1.7.6.1.tar.gz 20856412 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e
+DIST freevo-1.7.6.1.tar.gz 20856412 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e SHA512 f8562990ac4137042bfd9657bffb3b5f38bc02c3809a528cb798de67fbfa0c6fe2ba87b3cc0a6a2f65fbc11bc456ebba4dd27b4975202859835858893414f9b8 WHIRLPOOL 44019711a03a8736ff05518f1bbd3f0173facbe3ebf2f104e4f1b3820ccdca6e8be6785bc3d6b18569e334b2512fcaf00f64225b4dfa04d2b32b6837afc2e0df
 DIST freevo-1.9.0.tar.gz 27182867 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722
--- a/media-tv/freevo/freevo-1.7.6.1.ebuild
+++ b/media-tv/freevo/freevo-1.7.6.1.ebuild
@ -1,9 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.8 2013/03/22 23:08:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.10 2013/05/04 21:34:56 floppym Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"

 inherit distutils

@ -27,7 +28,6 @@ RDEPEND=">=dev-python/pygame-1.5.6
 	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
 	media-libs/sdl-image[jpeg,png]
 	>=sys-apps/sed-4
-	>=dev-python/elementtree-1.2.6
 	>=dev-python/beautifulsoup-3.0
 	>=dev-python/kaa-base-0.2.0
 	>=dev-python/kaa-metadata-0.7.1
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@ -1,3 +1,4 @@
+DIST mythtv-0.25.3-cfa6d18d.tar.xz 30376 SHA256 d1ddfd1be4654f24d70d3a73a2f8c3b6871fddc7095b0f89feaa1051a5668cc9 SHA512 35d3d792ca39f7b0acfbcc65919cd3979b059023be4b22cc0347bc014d2e7d862e4a755f1df8e1d6140234bd9d8e1352bb68e4b9e15c153301b40f40ce0835dd WHIRLPOOL 3ce274b839736f821831f4cd2d0070b619c189582873a6a2073758da71eb50682053a7d5d9929fb631f8990e22a8297d1046484856f03a0dd9ff14ee2eb78e00
 DIST mythtv-0.25.3-dc6d68a2.tar.xz 28388 SHA256 1ae8ce66ffe2945da5512e1f9539103b56131d2bc43fd816b39694bb1156ba90 SHA512 3ce738f74f32834c5512a2ab1bd1a60617f8ac9dbb5d8b4b379071e15e10b17992651ad451930cbb4c06ca37421baa216bbbf255b63158e25acf46a2314f271a WHIRLPOOL 0a7bab591fe9dab35a782a026cc9ea2635ad9420ae44ad72ebf243e7c64b8b410dadef986766d9e8a26eda72156ef9e77827ca113f90cc7e016e52707e35ddd3
 DIST mythtv-0.25.3-ff8c4960.tar.xz 14792 SHA256 d2a8a66e1fbd3507866c976be125b9fb3252d2be2d7fd0db485b56877e745d74 SHA512 3dc5608dd8ad224358b37b283b0ab49ec93023cbae4234f22f431f8d844bc46e6ade298f1c0bfd04e6862cbb1dbfb335f3c5f0fd72bcdd5c7e7ac0b5f72b05b9 WHIRLPOOL d317137cdf05638764e4d2fd7a3c8c72a2e4493ca6efb0fd29757639af87ec919499e25affec0e81fac721063bd05159193e243693fb13998310621f398d126b
 DIST mythtv-0.25.3.tar.bz2 31834461 SHA256 17740e95599436f818abaac394338c0d344df025d5451326cdc7b7d6e7d9dc41 SHA512 40902dd43053b08112050611a26ed204c78a1f40562d0f00cf0591792676f52a9cb804d434764b337453e82a6cbe3f5efd39efc87a80b43053c4d98f35177392 WHIRLPOOL d96823625f2dc5eec2dc0b5e7dd152702a7e1180599cd5d57038b267ee8e217578e8b2fe462dbc69f52e87f2885af74ebb638d5e1835380228d09b8c94e621d4
--- a/media-tv/mythtv/mythtv-0.25.3_p20130422.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.3_p20130422.ebuild
@ -0,0 +1,342 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.3_p20130422.ebuild,v 1.1 2013/05/05 01:34:49 cardoe Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.6"
+BACKPORTS="cfa6d18d"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python user
+
+MYTHTV_VERSION="v${MY_P}"
+MYTHTV_BRANCH="fixes/0.25"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
+vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="
+	bluray? ( xml )
+	theora? ( vorbis )"
+
+COMMON="
+	>=media-libs/freetype-2.0
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	>=dev-qt/qtcore-4.7.2:4
+	>=dev-qt/qtdbus-4.7.2:4
+	>=dev-qt/qtgui-4.7.2:4
+	>=dev-qt/qtscript-4.7.2:4
+	>=dev-qt/qtsql-4.7.2:4[mysql]
+	>=dev-qt/qtopengl-4.7.2:4[egl?]
+	>=dev-qt/qtwebkit-4.7.2:4
+	x11-misc/wmctrl
+	virtual/mysql
+	virtual/opengl
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio
+		media-libs/libbluray
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		media-libs/libdvb
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? ( dev-libs/libcdio )
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx
+		>=media-libs/x264-0.0.20110426
+		>=media-sound/lame-3.93.1
+	)
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0
+		>=sys-libs/libavc1394-0.5.3
+		>=media-libs/libiec61883-1.0.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11 )
+	lirc? ( app-misc/lirc )
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/Net-UPnP
+		dev-perl/LWP-Protocol-https
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		>=dev-perl/libwww-perl-5
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	raop? (
+		dev-libs/openssl
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	theora? ( media-libs/libtheora )
+	vaapi? ( x11-libs/libva )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	"
+
+RDEPEND="${COMMON}
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+	"
+
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	use cec || myconf="${myconf} --disable-libcec"
+	use raop || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libmp3lame"
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=$(PYTHON)"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=profile"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	use vdpau && myconf="${myconf} --enable-vdpau"
+	use vaapi && myconf="${myconf} --enable-vaapi"
+	use crystalhd && myconf="${myconf} --enable-crystalhd"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r3 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize MythTV
+
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup MythTV
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ b/media-video/vlc/vlc-2.0.5.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/media-video/vlc/vlc-2.0.5.ebuild,v 1.4 2013/03/02 22:44:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.5 2013/05/04 20:02:37 vincent Exp $

-EAPI="4"
+EAPI="5"

 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
--- a/media-video/vlc/vlc-2.0.6.ebuild
+++ b/media-video/vlc/vlc-2.0.6.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/media-video/vlc/vlc-2.0.6.ebuild,v 1.2 2013/04/24 07:43:06 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.3 2013/05/04 20:02:36 vincent Exp $

-EAPI="4"
+EAPI="5"

 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@ -36,7 +36,6 @@ SRC_URI="${SRC_URI}
 	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
 "

-
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"

--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.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/media-video/vlc/vlc-2.0.9999.ebuild,v 1.20 2013/04/12 21:58:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.21 2013/05/04 20:02:37 vincent Exp $

-EAPI="4"
+EAPI="5"

 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.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/media-video/vlc/vlc-9999.ebuild,v 1.185 2013/04/27 15:05:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.186 2013/05/04 20:02:37 vincent Exp $

-EAPI="4"
+EAPI="5"

 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@ -55,7 +55,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger
 	sdl sdl-image shine shout sid skins speex sse svg +swscale
 	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	wma-fixed +X x264 +xcb xml xv zvbi"
+	win32codecs wma-fixed +X x264 +xcb xml xv zvbi"

 RDEPEND="
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sat, 04 May 2013 19:36:54 +0000
+Sun, 05 May 2013 07:36:54 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sat, 04 May 2013 19:36:54 +0000
+Sun, 05 May 2013 07:36:55 +0000
--- a/metadata/md5-cache/app-admin/salt-0.13.1
+++ b/metadata/md5-cache/app-admin/salt-0.13.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/virtualenv >=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Salt is a remote execution and configuration manager.
-EAPI=5
-HOMEPAGE=http://saltstack.org/
-IUSE=ldap libvirt mongodb mysql openssl redis test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-0.13.1.tar.gz
-_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ca0f851d873afee9d51d9090ef124ec9
--- a/metadata/md5-cache/app-admin/salt-0.14.0
+++ b/metadata/md5-cache/app-admin/salt-0.14.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/virtualenv >=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Salt is a remote execution and configuration manager.
-EAPI=5
-HOMEPAGE=http://saltstack.org/
-IUSE=ldap libvirt mongodb mysql openssl redis test python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-0.14.0.tar.gz
-_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8ab5b399db157a2154270d2010880040
--- a/metadata/md5-cache/app-admin/salt-0.15.0-r1
+++ b/metadata/md5-cache/app-admin/salt-0.15.0-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/virtualenv >=dev-python/pyzmq-2.1.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] mako? ( dev-python/mako[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Salt is a remote execution and configuration manager.
+EAPI=5
+HOMEPAGE=http://saltstack.org/
+IUSE=ldap libvirt mako mongodb mysql openssl redis test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyzmq-2.1.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] mako? ( dev-python/mako[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://pypi/s/salt/salt-0.15.0.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6e6ebf54518a23099a589741eaf445c
--- a/metadata/md5-cache/app-admin/salt-9999
+++ b/metadata/md5-cache/app-admin/salt-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/virtualenv >=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git
+DEPEND=test? ( dev-python/virtualenv >=dev-python/pyzmq-2.1.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] mako? ( dev-python/mako[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Salt is a remote execution and configuration manager.
 EAPI=5
 HOMEPAGE=http://saltstack.org/
-IUSE=ldap libvirt mongodb mysql openssl redis test python_targets_python2_6 python_targets_python2_7
+IUSE=ldap libvirt mako mongodb mysql openssl redis test python_targets_python2_6 python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyzmq-2.1.9 dev-python/msgpack dev-python/pyyaml dev-python/m2crypto dev-python/pycrypto dev-python/pycryptopp dev-python/jinja ldap? ( dev-python/python-ldap ) openssl? ( dev-python/pyopenssl ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) redis? ( dev-python/redis-py ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/pyzmq-2.1.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] mako? ( dev-python/mako[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	git-2	e92e09651292b1bef5656592364550f7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab885adcaf1b50edca676487fbcbd046
+_md5_=c818e295127b52ead07500a78c5c9d61
--- a/metadata/md5-cache/app-arch/unar-1.5
+++ b/metadata/md5-cache/app-arch/unar-1.5
@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install
 DEPEND=gnustep-base/gnustep-base >=gnustep-base/gnustep-make-2.6.0[native-exceptions] dev-libs/icu sys-devel/gcc[objc]
-DESCRIPTION=Unpacker for various archiving formats, e.g. rar v3.
+DESCRIPTION=unpacker for various archiving formats, e.g. rar v3
 EAPI=4
 HOMEPAGE=http://unarchiver.c3.cx/
 KEYWORDS=~amd64
@ -9,4 +9,4 @@ RDEPEND=gnustep-base/gnustep-base >=gnustep-base/gnustep-make-2.6.0[native-excep
 SLOT=0
 SRC_URI=http://theunarchiver.googlecode.com/files/unar1.5_src.zip
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=3edf4430dae9fde684fe7fc4f81c5d1d
+_md5_=b43fd065f5ec8998666e04661ee1fe85
--- a/metadata/md5-cache/app-crypt/cardpeek-0.7.2
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.7.2
@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite =dev-lang/lua-5.1* dev-libs/openssl virtual/pkgconfig
+DESCRIPTION=Tool to read the contents of smartcards
+EAPI=5
+HOMEPAGE=https://code.google.com/p/cardpeek/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/gtk+-2.12:2 sys-apps/pcsc-lite =dev-lang/lua-5.1* dev-libs/openssl
+SLOT=0
+SRC_URI=https://cardpeek.googlecode.com/files/cardpeek-0.7.2.tar.gz
+_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ece16e4297ff88b0bea4073b896cf4af
--- a/metadata/md5-cache/app-crypt/opencdk-0.6.6-r1
+++ b/metadata/md5-cache/app-crypt/opencdk-0.6.6-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-libs/libgcrypt-1.2.0 >=dev-lang/perl-5.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Open Crypto Development Kit for basic OpenPGP message manipulation
+EAPI=5
+HOMEPAGE=http://www.gnutls.org/
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libgcrypt-1.2.0
+SLOT=0
+SRC_URI=ftp://ftp.gnutls.org/pub/gnutls/opencdk/opencdk-0.6.6.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=9cc24b2d91c1aa53ff6f61ecb42ff30c
--- a/metadata/md5-cache/app-emulation/ganeti-2.6.0
+++ b/metadata/md5-cache/app-emulation/ganeti-2.6.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6
+DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6
 DESCRIPTION=Ganeti is a virtual server management software tool
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ganeti/
 IUSE=kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6 haskell-daemons rbd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6 !app-emulation/ganeti-htools
+RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6 !app-emulation/ganeti-htools
 SLOT=0
 SRC_URI=http://ganeti.googlecode.com/files/ganeti-2.6.0.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e48267ca433234efcbe3a8ac82d9478
+_md5_=ccf539f0b71589f7fbf8fb0248d9d56a
--- a/metadata/md5-cache/app-emulation/ganeti-2.6.1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.6.1
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6
+DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6
 DESCRIPTION=Ganeti is a virtual server management software tool
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ganeti/
 IUSE=kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6 haskell-daemons rbd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6 !app-emulation/ganeti-htools
+RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 >=dev-lang/python-2.6 !app-emulation/ganeti-htools
 SLOT=0
 SRC_URI=http://ganeti.googlecode.com/files/ganeti-2.6.1.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ace66b1e676eac41f2215bff40bfe881
+_md5_=9fb95e10ea9badb205f10bb5598ee0f6
--- a/metadata/md5-cache/app-emulation/ganeti-2.6.2
+++ b/metadata/md5-cache/app-emulation/ganeti-2.6.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Ganeti is a virtual server management software tool
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ganeti/
 IUSE=kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6 haskell-daemons rbd test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/elementtree dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 !app-emulation/ganeti-htools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=xen? ( >=app-emulation/xen-3.0 ) kvm? ( app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( >=sys-cluster/drbd-8.3 ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) htools? ( >=dev-lang/ghc-6.10 dev-haskell/json dev-haskell/curl dev-haskell/network dev-haskell/parallel ) haskell-daemons? ( dev-haskell/hslogger dev-haskell/crypto dev-haskell/text dev-haskell/hinotify ) dev-libs/openssl dev-python/paramiko dev-python/pyopenssl virtual/pyparsing dev-python/pycurl dev-python/pyinotify dev-python/simplejson net-analyzer/arping net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 !app-emulation/ganeti-htools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 REQUIRED_USE=|| ( kvm xen lxc )
 SLOT=0
 SRC_URI=http://ganeti.googlecode.com/files/ganeti-2.6.2.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=97434907a037b4723882786cbb27395d
+_md5_=28945e004250afa42dcca9c31369da7d
--- a/metadata/md5-cache/app-emulation/lxc-0.8.0-r1
+++ b/metadata/md5-cache/app-emulation/lxc-0.8.0-r1
@ -10,4 +10,4 @@ RDEPEND=sys-libs/libcap sys-apps/util-linux app-misc/pax-utils >=sys-apps/openrc
 SLOT=0
 SRC_URI=http://lxc.sourceforge.net/download/lxc/lxc-0.8.0.tar.gz http://dev.gentoo.org/~flameeyes/lxc/lxc-0.8.0-backports-1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	177b3e32837e245539b46f16c43afed8	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0869a18fb284a301e8fd1a380a1ee315
+_md5_=81d4fd8c92f6fd291c8eac5780d9b83f
--- a/metadata/md5-cache/app-text/calibre-0.9.27
+++ b/metadata/md5-cache/app-text/calibre-0.9.27
@ -1,13 +1,13 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+DEFINED_PHASES=install postinst prepare
+DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5
 DESCRIPTION=Ebook management application.
 EAPI=5
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.27/calibre-0.9.27.tar.xz
-_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	384ae111f3649d456ed1754e3e1c4f6e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=031191b56b7e2f2172c2d052c84688fc
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	384ae111f3649d456ed1754e3e1c4f6e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=42a57fbdb4ed9df280d054af91e1db8f
--- a/metadata/md5-cache/app-text/calibre-0.9.29
+++ b/metadata/md5-cache/app-text/calibre-0.9.29
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5
+DESCRIPTION=Ebook management application.
+EAPI=5
+HOMEPAGE=http://calibre-ebook.com/
+IUSE=+udisks
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+SLOT=0
+SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.29/calibre-0.9.29.tar.xz
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	384ae111f3649d456ed1754e3e1c4f6e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=29bab198605a62fec06e22b4e65eecad
--- a/metadata/md5-cache/dev-libs/angelscript-2.26.2-r1
+++ b/metadata/md5-cache/dev-libs/angelscript-2.26.2-r1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/unzip
+DESCRIPTION=A flexible, cross-platform scripting library
+EAPI=5
+HOMEPAGE=http://www.angelcode.com/angelscript/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.26.2.zip
+_eclasses_=multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=177bce20dd993dd5d23475d22cd19b1d
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r3
@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=libmcrypt is a library that provides uniform interface to access several encryption algorithms.
+EAPI=5
+HOMEPAGE=http://mcrypt.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ed3539521ba44574025d443cae4b72e1
--- a/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18
+++ b/metadata/md5-cache/dev-libs/libzeitgeist-0.3.18
@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/libzeitgeist/0.3/0.3.18/+download/libzeitgeist-0.3.18.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7070f14fc0488c824be5fe8d6ad6d28a	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b011a01f1ad6f6e87e202e5b055f264e
+_md5_=8e8cc497b2fcb85240407ff4a8da561b
--- a/metadata/md5-cache/dev-python/egg-python-2.25.3
+++ b/metadata/md5-cache/dev-python/egg-python-2.25.3
@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome-python-common	c7b53edf13692ee6c71340ba735a12e5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7c823f5a1417e890a79fec0f65cdf853
+_md5_=dc9d77ec206ac1f1903a77cbddb12306
--- a/metadata/md5-cache/dev-python/elixir-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/elixir-0.7.1-r1
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=dev-python/sqlalchemy-0.4.0 dev-python/setuptools doc? ( >=dev-python/docutils-0.4-r3 >=dev-python/elementtree-1.2.6 >=dev-python/kid-0.9 >=dev-python/pygments-0.8.1 >=dev-python/pudge-0.1.3 >=dev-python/buildutils-0.3 ) =dev-lang/python-2*
+DEPEND=>=dev-python/sqlalchemy-0.4.0 dev-python/setuptools doc? ( >=dev-python/docutils-0.4-r3 >=dev-python/kid-0.9 >=dev-python/pygments-0.8.1 >=dev-python/pudge-0.1.3 >=dev-python/buildutils-0.3 ) =dev-lang/python-2*
 DESCRIPTION=Declarative Mapper for SQLAlchemy
 EAPI=2
 HOMEPAGE=http://elixir.ematia.de/trac/wiki http://pypi.python.org/pypi/Elixir
@ -10,4 +10,4 @@ RDEPEND=>=dev-python/sqlalchemy-0.4.0 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/E/Elixir/Elixir-0.7.1.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b486748482dbf6f3c9468ba1f9a42f54
+_md5_=c174864d9ed8ee4c424ca564e711166d
--- a/metadata/md5-cache/dev-python/flask-restless-0.10.0
+++ b/metadata/md5-cache/dev-python/flask-restless-0.10.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=>=dev-python/flask-0.7 dev-python/flask-sqlalchemy dev-python/sqlalchemy dev-python/python-dateutil dev-python/setuptools test? ( dev-python/unittest2 ) =dev-lang/python-2*
+DESCRIPTION=Flask extension for easy ReSTful API generation
+EAPI=3
+HOMEPAGE=http://packages.python.org/Flask-Restless/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( AGPL-3 BSD )
+RDEPEND=>=dev-python/flask-0.7 dev-python/flask-sqlalchemy dev-python/sqlalchemy dev-python/python-dateutil =dev-lang/python-2*
+SLOT=0
+SRC_URI=https://github.com/jfinkels/flask-restless/archive/0.10.0.tar.gz -> flask-restless-0.10.0.tar.gz
+_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
+_md5_=0254af8594aa0324c09747337235e2ec
--- a/metadata/md5-cache/dev-python/gdata-2.0.14
+++ b/metadata/md5-cache/dev-python/gdata-2.0.14
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree ) =dev-lang/python-2* =dev-lang/python-2*[ssl(+)]
+DEPEND==dev-lang/python-2* =dev-lang/python-2*[ssl(+),xml]
 DESCRIPTION=Python client library for Google data APIs
 EAPI=4
 HOMEPAGE=http://code.google.com/p/gdata-python-client/ http://pypi.python.org/pypi/gdata
 IUSE=examples
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree ) =dev-lang/python-2* =dev-lang/python-2*[ssl(+)]
+RDEPEND==dev-lang/python-2* =dev-lang/python-2*[ssl(+),xml]
 SLOT=0
 SRC_URI=http://gdata-python-client.googlecode.com/files/gdata-2.0.14.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=712e3c0eb101aa20bfd6bdfa1a6acc20
+_md5_=72e7d00b73a68694e45f7e33838f9577
--- a/metadata/md5-cache/dev-python/lxml-3.2.0
+++ b/metadata/md5-cache/dev-python/lxml-3.2.0
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 dev-python/beautifuls
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.2.0.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b2d0f4fcc0d350272df043b6ab09acd8
+_md5_=518dec3bdb70870dd5489f6b64128518
--- a/metadata/md5-cache/dev-python/pypy-2.0_beta2
+++ b/metadata/md5-cache/dev-python/pypy-2.0_beta2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare pretend setup test unpack
+DEPEND=>=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl dev-libs/expat bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) || ( dev-lang/python:2.7 dev-python/pypy:2.0 dev-python/pypy:1.9 )
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=5
+HOMEPAGE=http://pypy.org/
+IUSE=bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml
+KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux
+LICENSE=MIT
+PDEPEND=app-admin/python-updater
+RDEPEND=>=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl dev-libs/expat bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl )
+SLOT=2.0
+SRC_URI=https://bitbucket.org/pypy/pypy/get/release-2.0-beta2.tar.bz2 -> pypy-2.0_beta2.tar.bz2
+_eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	384ae111f3649d456ed1754e3e1c4f6e	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	2bfb0c9cefbef0b3cfde3d96e3d53f46	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4080f6bda297e9e6b23f0229f506c753
--- a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig python_targets_python2_5? ( dev-lang/python:2.5[sqlite] ) python_targets_python2_6? ( dev-lang/python:2.6[sqlite] ) python_targets_python2_7? ( dev-lang/python:2.7[sqlite] ) python_targets_pypy1_9? ( dev-python/pypy:1.9[sqlite] ) python_targets_pypy2_0? ( dev-python/pypy:2.0[sqlite] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=sqlite cacher for python applications
+EAPI=5
+HOMEPAGE=http://yum.baseurl.org/
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 python_targets_python2_5? ( dev-lang/python:2.5[sqlite] ) python_targets_python2_6? ( dev-lang/python:2.6[sqlite] ) python_targets_python2_7? ( dev-lang/python:2.7[sqlite] ) python_targets_pypy1_9? ( dev-python/pypy:1.9[sqlite] ) python_targets_pypy2_0? ( dev-python/pypy:2.0[sqlite] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=http://yum.baseurl.org/download/yum-metadata-parser/yum-metadata-parser-1.1.4.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	052a2872c3d341495152eb93212374e9	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=319f2a9345649969a199a9f9481965c4
--- a/metadata/md5-cache/dev-python/turbogears-1.0.8
+++ b/metadata/md5-cache/dev-python/turbogears-1.0.8
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/turbojson-1.1.4 >=dev-python/turbocheetah-1.0 >=dev-python/turbokid-1.0.4 =dev-python/cherrypy-2.3* >=dev-python/simplejson-1.3 >=dev-python/pastescript-0.9.7 >=dev-python/formencode-0.7.1 >=dev-python/ruledispatch-0.5_pre2306 >=dev-python/decoratortools-1.4 >=dev-python/configobj-4.3.2 || ( =dev-lang/python-2.4* ( =dev-lang/python-2.5* >=dev-python/cheetah-2.0_rc7-r1 ) ) || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* >=dev-python/celementtree-1.0.5 ) ) >=dev-python/sqlobject-0.7 test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3 || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* dev-python/pysqlite ) ) ) >=dev-python/genshi-0.3.6 app-arch/zip >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2*
+DEPEND=>=dev-python/turbojson-1.1.4 >=dev-python/turbocheetah-1.0 >=dev-python/turbokid-1.0.4 =dev-python/cherrypy-2.3* >=dev-python/simplejson-1.3 >=dev-python/pastescript-0.9.7 >=dev-python/formencode-0.7.1 >=dev-python/ruledispatch-0.5_pre2306 >=dev-python/decoratortools-1.4 >=dev-python/configobj-4.3.2 || ( =dev-lang/python-2.4* ( =dev-lang/python-2.5* >=dev-python/cheetah-2.0_rc7-r1 ) ) >=dev-python/sqlobject-0.7 test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3 || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* dev-python/pysqlite ) ) ) >=dev-python/genshi-0.3.6 app-arch/zip >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2*
 DESCRIPTION=The rapid web development meta-framework you've been looking for.
 EAPI=3
 HOMEPAGE=http://www.turbogears.org/
 IUSE=test
 KEYWORDS=~x86 ~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/turbojson-1.1.4 >=dev-python/turbocheetah-1.0 >=dev-python/turbokid-1.0.4 =dev-python/cherrypy-2.3* >=dev-python/simplejson-1.3 >=dev-python/pastescript-0.9.7 >=dev-python/formencode-0.7.1 >=dev-python/ruledispatch-0.5_pre2306 >=dev-python/decoratortools-1.4 >=dev-python/configobj-4.3.2 || ( =dev-lang/python-2.4* ( =dev-lang/python-2.5* >=dev-python/cheetah-2.0_rc7-r1 ) ) || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* >=dev-python/celementtree-1.0.5 ) ) >=dev-python/sqlobject-0.7 test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3 || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* dev-python/pysqlite ) ) ) >=dev-python/genshi-0.3.6 =dev-lang/python-2*
+RDEPEND=>=dev-python/turbojson-1.1.4 >=dev-python/turbocheetah-1.0 >=dev-python/turbokid-1.0.4 =dev-python/cherrypy-2.3* >=dev-python/simplejson-1.3 >=dev-python/pastescript-0.9.7 >=dev-python/formencode-0.7.1 >=dev-python/ruledispatch-0.5_pre2306 >=dev-python/decoratortools-1.4 >=dev-python/configobj-4.3.2 || ( =dev-lang/python-2.4* ( =dev-lang/python-2.5* >=dev-python/cheetah-2.0_rc7-r1 ) ) >=dev-python/sqlobject-0.7 test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3 || ( =dev-lang/python-2.5* ( =dev-lang/python-2.4* dev-python/pysqlite ) ) ) >=dev-python/genshi-0.3.6 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://files.turbogears.org/eggs/TurboGears-1.0.8.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=e5f3227b26fd62876421395e9b4eb1db
+_md5_=2f2e016bde457a7fafda6306fcecaee7
--- a/metadata/md5-cache/dev-ruby/kramdown-0.14.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-0.14.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-text/htmltidy ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition.
-EAPI=5
-HOMEPAGE=http://kramdown.rubyforge.org/
-IUSE=latex elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/kramdown-0.14.1.gem
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8e8f3daf6e6424bbbea29ca1466551be
--- a/metadata/md5-cache/dev-ruby/libxml-2.2.1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.2.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster.
-EAPI=2
-HOMEPAGE=http://libxml.rubyforge.org
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=0
-SRC_URI=mirror://rubygems/libxml-ruby-2.2.1.gem
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=429a8a9216ad86563c612d1fd92e2179
--- a/metadata/md5-cache/dev-ruby/listen-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.2-r1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Listens to file modifications and notifies you about the changes.
-EAPI=5
-HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.8[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=https://github.com/guard/listen/archive/v0.7.2.tar.gz -> listen-0.7.2-git.tgz
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6163809cb23fe85758e83ba1c7cae32d
--- a/metadata/md5-cache/dev-util/osc-0.139.1
+++ b/metadata/md5-cache/dev-util/osc-0.139.1
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/urlgrabber dev-python/pyxml dev-python/elementtree app-arch/rpm[python] dev-python/m2crypto || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=dev-python/urlgrabber dev-python/pyxml app-arch/rpm[python] dev-python/m2crypto || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Command line tool for Open Build Service
 EAPI=5
 HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-python/urlgrabber dev-python/pyxml dev-python/elementtree app-arch/rpm[python] dev-python/m2crypto app-admin/sudo dev-util/obs-service-meta || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=dev-python/urlgrabber dev-python/pyxml app-arch/rpm[python] dev-python/m2crypto app-admin/sudo dev-util/obs-service-meta || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=https://api.opensuse.org/public/source/openSUSE:Tools/osc/osc-0.139.1.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	obs-download	8b22473fde39f5051ce00b61062dd086	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=0cf86bca6e39b5de3e06406847bb66d4
+_md5_=30f7290b2557225d074a98bd627016ff
--- a/metadata/md5-cache/dev-util/osc-9999
+++ b/metadata/md5-cache/dev-util/osc-9999
@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=dev-python/urlgrabber dev-python/pyxml dev-python/elementtree app-arch/rpm[python] dev-python/m2crypto || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/git
+DEPEND=dev-python/urlgrabber dev-python/pyxml app-arch/rpm[python] dev-python/m2crypto || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/git
 DESCRIPTION=Command line tool for Open Build Service
 EAPI=5
 HOMEPAGE=http://en.opensuse.org/openSUSE:OSC
 LICENSE=GPL-2
-RDEPEND=dev-python/urlgrabber dev-python/pyxml dev-python/elementtree app-arch/rpm[python] dev-python/m2crypto app-admin/sudo dev-util/obs-service-meta || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=dev-python/urlgrabber dev-python/pyxml app-arch/rpm[python] dev-python/m2crypto app-admin/sudo dev-util/obs-service-meta || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=ff53b93c9d51ba1c4394c7becb537087
+_md5_=ed046aeade770cf51a7cd48501faf8d6
--- a/metadata/md5-cache/dev-util/wiggle-0.9
+++ b/metadata/md5-cache/dev-util/wiggle-0.9
@ -10,4 +10,4 @@ RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findut
 SLOT=0
 SRC_URI=http://neil.brown.name/wiggle/wiggle-0.9.tar.gz
 _eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	fixheadtails	f96922acc9287f1e889a1e50a6c8986e	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d56b08967b19f9a01ca5fcac131eceb
+_md5_=0ac408ba68a1f18fee8b72f3768000b6
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.tar.bz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b4f112abff5d77f982f83e1a9e554093	python-utils-r1	345dcecf1ef156d1d86a98f16d3c385c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d53cb06768a6ae778106bc57391e2baa
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r1
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4baadb1e4ad939fc851caa3b24fc0cad
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.2.0-r1
@ -10,5 +10,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib:= ) !media-libs/libmikmod:2
 REQUIRED_USE=|| ( alsa oss coreaudio )
 SLOT=0
 SRC_URI=http://mikmod.shlomifish.org/files/libmikmod-3.2.0.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cfc5fb450e9b79e547cb7ed160fefb34
--- a/metadata/md5-cache/media-libs/libv4l-0.9.5
+++ b/metadata/md5-cache/media-libs/libv4l-0.9.5
@ -9,4 +9,4 @@ RDEPEND=virtual/jpeg:= virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.9.5.tar.bz2
 _eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8630d4302971d5e6387a8b75bc0a6690
+_md5_=1dbdb451ce99fc0fda7d124418f843fc
--- a/metadata/md5-cache/media-libs/libv4l-0.9.5-r1
+++ b/metadata/md5-cache/media-libs/libv4l-0.9.5-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=virtual/jpeg:= virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.9.5.tar.bz2
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f99d0bcb00b201928ff3e8b617f6223f
+_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4397e63d486dbfda71c6636534a95a5a
--- a/metadata/md5-cache/media-libs/libwebp-0.3.0
+++ b/metadata/md5-cache/media-libs/libwebp-0.3.0
@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://webp.googlecode.com/files/libwebp-0.3.0.tar.gz
-_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	17ae39785bd22c9cf6159d6f11f87a04	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	384ae111f3649d456ed1754e3e1c4f6e	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	64d8186c893b4ba109fe29c632a72a58	multilib-minimal	bdf515a40f94b2a4d8e8741be0b1a728	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=660896d3a43eff8e648f3997bb085d54
--- a/metadata/md5-cache/media-libs/libxmi-1.2
+++ b/metadata/md5-cache/media-libs/libxmi-1.2
@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<=media-libs/plotutils-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ function library for rasterizing 2-D vector graphics
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libxmi/
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
+RDEPEND=!<=media-libs/plotutils-2.6
 SLOT=0
 SRC_URI=mirror://gnu/libxmi/libxmi-1.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7070f14fc0488c824be5fe8d6ad6d28a	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=179257bc3740eec8a19ce4e53c4cb7b0
+_md5_=38354e7cfc476d8767e4397d2a26d3a7
--- a/metadata/md5-cache/media-libs/libxmi-1.3
+++ b/metadata/md5-cache/media-libs/libxmi-1.3
@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!<=media-libs/plotutils-2.6 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=C/C++ function library for rasterizing 2-D vector graphics
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libxmi/
 IUSE=static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
+RDEPEND=!<=media-libs/plotutils-2.6
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/libxmi-1.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7070f14fc0488c824be5fe8d6ad6d28a	eutils	384ae111f3649d456ed1754e3e1c4f6e	libtool	177b3e32837e245539b46f16c43afed8	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e9ead34225df4133d19eb25c730b51de
+_md5_=30d6b50b89bbd796313d500be11a4e32
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST flask-restless-0.10.0.tar.gz 495229 SHA256 ce4d2a018a15f31b24235dad5ae9be554094d818cf95c5654293f63b03baa9d5 SHA512 b6910a44b265a429ddaeca071376f1ab0f78cba7951ef6d5f2ace1a48403624229e0fb64e75c9ea7fa4173cbf0b143aa61801ff36e190cea986ea81781259a85 WHIRLPOOL 426e823fa5eef30b74a6f2692a0d5182ada47fd8892db915e852fded072b8fe333707c0eb470cc775be710f4b9f166bbd481c0188585ae5d32d270da1bda0408`