Remove old packages

Package-Manager: portage-2.1.11.63

32 files changed, 176 insertions, 451 deletions

diff --git a/dev-python/bunch/metadata.xml b/dev-python/bunch/metadata.xml
index 988266a..0645cd9 100644
--- a/dev-python/bunch/metadata.xml
+++ b/dev-python/bunch/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
         <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>johneed@hotmail.com</email>
-                <name>Ian idella4 Delaney proxy maintainer</name>
-        </maintainer>
 </pkgmetadata>
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
deleted file mode 100644
index 0ee723f..0000000
--- a/dev-python/kombu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kombu-2.5.10.tar.gz 304810 SHA256 01c1e56fe88053b6e7801682277c4cc8318c485d8bd47c830c08567bfac680e2 SHA512 f42c8b1dc2e5b39c5a6bad4e69d4cd532bac978d7f9ec6e6337032228aada3c4fc2d6f434c6d2ac6b2f4e0a806223b24bb592d8ddaee20ab723bb7b6db6cfe0f WHIRLPOOL 05b0057775e1fd2b34b10e46950ba3455b5d1716a6d50f5fdff0d2b8f343e34517b65611a21eb15936deeb9d9324c878bbc2959344230e1d0111f3a5ebc5bb4f
diff --git a/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch b/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch
deleted file mode 100644
index d8a0ccc..0000000
--- a/dev-python/kombu/files/kombu-2.1.1-add-assertIsInstance-with-unittest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kombu/tests/utils.py	2012-02-07 17:57:27.000000000 +0100
-+++ b/kombu/tests/utils.py	2012-02-28 16:09:43.687489572 +0100
-@@ -23,6 +23,8 @@
- 
-     if not hasattr(unittest.TestCase, "assertItemsEqual"):
-         assertItemsEqual = unittest.TestCase.assertSameElements
-+    if not hasattr(unittest.TestCase, "assertIsInstance"):
-+        assertIsInstance = lambda inst, obj, cls: unittest.TestCase.assertTrue(inst, isinstance(obj, cls))
- 
- 
- class Mock(mock.Mock):
diff --git a/dev-python/kombu/kombu-2.5.10.ebuild b/dev-python/kombu/kombu-2.5.10.ebuild
deleted file mode 100644
index 3b72167..0000000
--- a/dev-python/kombu/kombu-2.5.10.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_1,3_2} pypy{1_9,2_0} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="amqplib doc examples test"
-
-RDEPEND=">=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
-	>=dev-python/py-amqp-1.0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose-cover3[${PYTHON_USEDEP}]
-	>=dev-python/mock-0.7[${PYTHON_USEDEP}]
-	dev-python/django[$(python_gen_usedep python{2_7,3_2})]
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/pymongo[$(python_gen_usedep 'python2_7' 'pypy{1_9,2_0}')]
-	dev-python/msgpack[$(python_gen_usedep python{2_7,3_1,3_2})] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/django[$(python_gen_usedep python{2_7,3_2})]
-	dev-python/beanstalkc[$(python_gen_usedep python2_7)]
-	dev-python/couchdb-python[$(python_gen_usedep python2_7)] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html || die "kombu docs failed installation"
-	fi
-}
-
-# wip; https://github.com/celery/kombu/issues/227; at this point upstr. maintainer established these tests 
-# 'can and do' pass, acks their failing 'on Travis' and offers neither a solution nor any plan to make 1.
-python_test() {
-	if [[ "${EPYTHON}" == python3* ]]; then
-		if [[ "${EPYTHON}" == 'python3.1' ]]; then
-			einfo "python3.1 ill-equipped to run testsuite, skipped"
-		else
-			nosetests --py3where=build/lib -e 'test_basic_consume_registers_ack_status*' \
-				-e 'test_close_resolves_connection_cycle*' -e 'test_init*' \
-				-e 'test_message_to_python*' -e 'test_prepare_message*' \
-				-e 'test_produce_consume*' -e 'test_produce_consume_noack*' kombu/tests \
-				|| die "Tests failed under ${EPYTHON}"
-		fi
-	else
-		nosetests -e 'test_basic_consume_registers_ack_status*' -e 'test_close_resolves_connection_cycle*' \
-			-e 'test_init*' -e 'test_message_to_python*' -e 'test_prepare_message*' \
-			|| die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docompress -x usr/share/doc/${P}/examples/
-		insinto usr/share/doc/${PF}/
-		doins -r examples/
-	fi
-
-	use doc && dohtml -r ./docs/.build/html/
-}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
deleted file mode 100644
index 829c259..0000000
--- a/dev-python/kombu/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>iksaif@gentoo.org</email>
-		<name>Corentin Chary</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">kombu</remote-id>
-		<remote-id type="github">celery/kombu</remote-id>
-	</upstream>
-	<use>
-		<flag name="amqplib">Enable amqplib support</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-python/lxml-cffi/Manifest b/dev-python/lxml-cffi/Manifest
new file mode 100644
index 0000000..a563300
--- /dev/null
+++ b/dev-python/lxml-cffi/Manifest
@@ -0,0 +1 @@
+DIST lxml-cffi-3.0.2.tar.gz 1004566 SHA256 5175ed5bc966934d9ba1919e7e2c90f3abd676ffb66796653cf380ee097a1bc3 SHA512 c51934cec3fff80e0ba1597af81cc84c246a75bd09dfb6b29b51dde17dd717f358e371d148ee007a7f430f56cda6db1a8c438ce954924b4135c2cbf703a5d9e9 WHIRLPOOL 2225b8535b8fca5f9be1c38bcff6ea2ebf29eb26ac255d866cceadc69f9dec76eb8177ad9d970a6404d60e86fb7017cb8a28911d0e1b87d4c99e385cc1126a8e
diff --git a/dev-python/lxml-cffi/lxml-cffi-3.0.2.ebuild b/dev-python/lxml-cffi/lxml-cffi-3.0.2.ebuild
new file mode 100644
index 0000000..22c272c
--- /dev/null
+++ b/dev-python/lxml-cffi/lxml-cffi-3.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A pypy capable Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
+SRC_URI="http://dev.gentoo.org/~idella4/tarballs/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test +threads"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND=">=dev-libs/libxml2-2.7.2
+	>=dev-libs/libxslt-1.1.15
+
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( !dev-python/elementtree )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+# lxml tarball contains files pregenerated by Cython.
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+#	if [[ ${EPYTHON} != python3* ]]; then
+#		local CFLAGS=${CFLAGS}
+#		append-cflags -fno-strict-aliasing
+#	fi
+#	esetup.py build_ext -i --without_cython
+	:
+}
+
+python_test() {
+#	cp -r -l src/lxml/tests build/temp.linux*/lxml/ || die
+#	cp -r -l src/lxml/html/tests build/temp.linux*/lxml/html/ || die
+#	ln -s "${S}"/doc build/ || die
+
+	local test
+	if [[ "${EPYTHON}" == 'python3.1' ]]; then
+		einfo "Many tests not compatible to py3.1"
+		return 0
+	else
+		for test in test.py selftest.py selftest2.py; do
+			einfo "Running ${test}"
+			PYTHONPATH=src/ "${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
+		done
+	fi
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r samples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lxml-cffi/metadata.xml b/dev-python/lxml-cffi/metadata.xml
new file mode 100644
index 0000000..de483c5
--- /dev/null
+++ b/dev-python/lxml-cffi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
deleted file mode 100644
index ccd729b..0000000
--- a/dev-python/manuel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST manuel-1.6.0.tar.gz 31454 SHA256 8ff1cd33d3dea6f7d960ca25c9e25a4ce8393b3b9708bd53323eb7cdfac27c13 SHA512 b5417f68603aa5db9b41bdd33ba48ab4b126557112aabf7e18f7203e8516c7d41800a5ec64619637d67dafca6eb6987409eb960690a5c003847e6d16bc298ad5 WHIRLPOOL 1ad8a5884282f9dfd22a0f5f64a1ad14468563dd37cc0030d1cc474f84697496cf0d799f4d997b46538b2b167a308a53e9aaf90c864cdf514ac0f438be65b45a
diff --git a/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch
deleted file mode 100644
index 6f6dec2..0000000
--- a/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur manuel-1.6.0.orig/src/manuel/tests.py manuel-1.6.0/src/manuel/tests.py
---- src/manuel/tests.py	2012-04-17 03:08:54.000000000 +0800
-+++ src/manuel/tests.py	2012-05-21 20:43:20.981722893 +0800
-@@ -9,16 +9,17 @@
- import os.path
- import re
- import unittest
--import zope.testing.renormalizing
- 
- doctest = manuel.absolute_import('doctest')
- 
- here = os.path.dirname(os.path.abspath(__file__))
- 
--checker = zope.testing.renormalizing.RENormalizing([
-+try:
-+    checker = zope.testing.renormalizing.RENormalizing([
-     (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
-     ])
--
-+except:
-+    pass
- 
- def turtle_on_the_bottom_test():
-     """We use manuel to test itself.
-@@ -52,7 +53,6 @@
-     optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
- 
-     m = manuel.ignore.Manuel()
--    m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
-     m += manuel.codeblock.Manuel()
-     m += manuel.capture.Manuel()
-     m += manuel.testcase.SectionManuel()
-@@ -66,3 +66,6 @@
-         suite,
-         doctest.DocTestSuite(),
-         ))
-+
-+if __name__ == '__main__':
-+    unittest.TextTestRunner().run(test_suite())
-diff -ur manuel-1.6.0.orig/src/manuel/index.txt manuel-1.6.0/src/manuel/index.txt
---- src/manuel/index.txt        2012-04-17 03:08:54.000000000 +0800
-+++ src/manuel/index.txt        2012-04-28 05:43:26.918993769 +0800
-@@ -166,16 +166,16 @@
-
- .. code-block:: python
-
--     import os.path
--     import manuel.testing
-+    import os.path
-+    import manuel.testing
-
--     class StripDirsTestCase(manuel.testing.TestCase):
--         def shortDescription(self):
-+    class StripDirsTestCase(manuel.testing.TestCase):
-+        def shortDescription(self):
-              return os.path.basename(str(self))
--     suite = manuel.testing.TestSuite(
--         m, path_to_test, TestCase=StripDirsTestCase)
-+    suite = manuel.testing.TestSuite(
-+        m, path_to_test, TestCase=StripDirsTestCase)
-
--    >>> list(suite)[0].shortDescription()
-+    list(suite)[0].shortDescription()
-     'bugs.txt'
-
-
diff --git a/dev-python/manuel/manuel-1.6.0.ebuild b/dev-python/manuel/manuel-1.6.0.ebuild
deleted file mode 100644
index 00f9f73..0000000
--- a/dev-python/manuel/manuel-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS=1
-DISTUTILS_SRC_TEST=setup.py
-RESTRICT_PYTHON_ABIS="*-jython"
-#2.5 fails tests purely due to test files using relative import.
-PYTHON_TESTS_RESTRICTED_ABIS="2.5"
-inherit distutils eutils
-
-DESCRIPTION="Manuel lets you build tested documentation."
-HOMEPAGE="http://packages.python.org/manuel/ http://pypi.python.org/pypi/manuel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-python/six"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-#       test? ( net-zope/zope-testing )"
-
-DOCS=( CHANGES.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rm_zope_test.patch
-}
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
deleted file mode 100644
index 7422e5a..0000000
--- a/dev-python/manuel/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>jonheed@hotmail.com,della5@iinet.com.au</email>
-                <name>Ian Delaney aka idella4 proxy maintainer</name>
-        </maintainer>
-</pkgmetadata>
diff --git a/dev-python/multiprocessing/Manifest b/dev-python/multiprocessing/Manifest
deleted file mode 100644
index 056d00a..0000000
--- a/dev-python/multiprocessing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST multiprocessing-2.6.2.1.tar.gz 108003 SHA256 ef3b81ad85d7de252e5491b1daac028e17f9741cbe3625032e6eaa4ad4c79900 SHA512 c9d00c2cc1785f79562c397cb6f5b94ba19d06addb3e95600daa01719b383c880f6e727d80d6a0bde1677ccf40d75cc72f622f567af2ca995297cfc617174e52 WHIRLPOOL 92f585039bd936216dec6adafb0af5c656a1d0fad3a3540eb6d9b54480a680240c99cc70e4911e17aa0319f765a49bccef0d5ceba4e3ff6495cae3676c20c362
diff --git a/dev-python/multiprocessing/metadata.xml b/dev-python/multiprocessing/metadata.xml
deleted file mode 100644
index 5366461..0000000
--- a/dev-python/multiprocessing/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>della5@iinet.com.au</email>
-                <name>Ian Delaney aka idella4 proxy maintainer</name>
-        </maintainer>
-
-</pkgmetadata>
diff --git a/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild b/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild
deleted file mode 100644
index e5a9d03..0000000
--- a/dev-python/multiprocessing/multiprocessing-2.6.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-inherit distutils
-
-DESCRIPTION="A reusable application for the Django web framework"
-HOMEPAGE="http://pypi.python.org/pypi/ordereddict/1.1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		sphinx-build -b html Doc/ glossary
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r glossary
-	fi
-}
diff --git a/dev-python/pil/Manifest b/dev-python/pil/Manifest
deleted file mode 100644
index 6df149b..0000000
--- a/dev-python/pil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pil-1.1.7.tar.gz 506382 SHA256 c4a94b9eec83b7c06a11de3086eb2c2164e90e4844e5263e2dacc6f82d993961 SHA512 a7ca18bbc2e8edfd8d8822fba31975147f317e9dc210fe8d4cb2e4aab0f1f3db931580d1f75d16385537f1545d445129292189ede5a623b17aa76e2eba90f5b2 WHIRLPOOL 11ce1bfd876885933f8a302ff95e62d90b3f45cfcc3266b45c62dff2d6e9fa7225255751465889ceaaca97ec874b5e6b06749319bb4253ca2bf270f7a0017727
diff --git a/dev-python/pil/metadata.xml b/dev-python/pil/metadata.xml
deleted file mode 100644
index b743448..0000000
--- a/dev-python/pil/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>johneed@hotmail.com</email>
-                <name>Ian idella4 Delaney proxy maintainer</name>
-        </maintainer>
-		<use>
-			<flag name='ext'>Enable building of tkinter, freetype2 and lcms support</flag>
-			<flag name='sane'>Enable building of the sane module</flag>
-		</use>
-</pkgmetadata>
diff --git a/dev-python/pil/pil-1.1.7.ebuild b/dev-python/pil/pil-1.1.7.ebuild
deleted file mode 100644
index 71598a3..0000000
--- a/dev-python/pil/pil-1.1.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-#RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-inherit python
-
-DESCRIPTION="A Python Imaging Library"
-HOMEPAGE="http://www.pythonware.com/products/pil"
-SRC_URI="http://effbot.org/media/downloads/${MY_P}-${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-IUSE="doc ext sane examples"
-LICENSE="MIT"
-SLOT="0"
-PYTHON_MODNAME="${MY_P}"
-
-RDEPEND=">=media-libs/jpeg-6a
-	>=media-libs/freetype-2.3.9
-	>=media-libs/lcms-1.1.5"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S=${WORKDIR}/${P/pil/PIL}
-
-src_compile() {
-	do_build() {
-		if use ext; then
-			"$(PYTHON)" setup.py build_ext -i
-		fi
-
-		if use sane; then
-			pushd Sane > /dev/null
-			PYTHONPATH=. "$(PYTHON)" setup.py build
-			popd > /dev/null
-		fi
-		"$(PYTHON)" setup.py build
-	}
-	python_execute_function do_build
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="${S}"/ "$(PYTHON)" selftest.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	do_sane() {
-		insinto $(python_get_sitedir)/PIL/
-		doins $(find Sane -name _sane.so)
-		doins $(find Sane -name sane.py)
-		chmod +x "${ED}"$(python_get_sitedir)/PIL/_sane.so || die
-	}
-	use sane && python_execute_function do_sane
-	use doc && dohtml Docs/*
-	if use examples; then
-		insinto use/share/doc/${P}/demo
-		doins Sane/demo*.py
-	fi
-}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
deleted file mode 100644
index e3bac0b..0000000
--- a/dev-python/pillow/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pillow-2.0.0.zip 1408539 SHA256 3e70c8f13675284166e4a8d8899107bf67febe676b893eb8d88785c24cca4c15 SHA512 8d87ba6b1cc60cf0c80d1a7222fa2ba309c8336fe1061aeb778562c70b2427b80e6d89fffcfe430d6da764e5f0c1ad55a3a03a8635cc305c98699b73ee10d32c WHIRLPOOL 409614ae169526db2f5beba49db362ea4f1ef73889f09e63fe8be8419a0893d6ea155b03cd0826549bb42777d1d49831fcc362a1889675e3a19e40a540fe1dd1
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
deleted file mode 100644
index b743448..0000000
--- a/dev-python/pillow/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>johneed@hotmail.com</email>
-                <name>Ian idella4 Delaney proxy maintainer</name>
-        </maintainer>
-		<use>
-			<flag name='ext'>Enable building of tkinter, freetype2 and lcms support</flag>
-			<flag name='sane'>Enable building of the sane module</flag>
-		</use>
-</pkgmetadata>
diff --git a/dev-python/pillow/pillow-2.0.0.ebuild b/dev-python/pillow/pillow-2.0.0.ebuild
deleted file mode 100644
index ac0728d..0000000
--- a/dev-python/pillow/pillow-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-
-inherit distutils-r1
-
-MY_PN="Pillow"
-
-DESCRIPTION="The friendly Python Imaging Library fork by Alex Clark and Contributors"
-HOMEPAGE="http://github.com/python-imaging/Pillow"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ext sane examples"
-LICENSE="PIL"
-SLOT="0"
-
-RDEPEND=">=media-libs/jpeg-6a
-	>=media-libs/freetype-2.4.9
-	>=media-libs/lcms-1.1.5"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-#S=${WORKDIR}/${P/pil/PIL}
-
-python_compile() {
-	do_build() {
-		if use ext; then
-			"${PYTHON}" setup.py build_ext -i
-		fi
-
-		if use sane; then
-			pushd Sane > /dev/null
-			PYTHONPATH=. "$(PYTHON)" setup.py build
-			popd > /dev/null
-		fi
-		"${PYTHON}" setup.py build
-	}
-	do_build
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="${S}"/ "$(PYTHON)" selftest.py
-	}
-	python_execute_function testing
-}
-
-python_install() {
-#	do_sane() {
-#		insinto $(python_get_sitedir)/PIL/
-#		doins $(find Sane -name _sane.so)
-#		doins $(find Sane -name sane.py)
-#		chmod +x "${ED}"$(python_get_sitedir)/PIL/_sane.so || die
-#	}
-#	use sane && do_sane
-	use doc && dohtml -r Docs/
-	if use examples; then
-		insinto use/share/doc/${P}/demo
-		doins Sane/demo*.py
-	fi
-}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
new file mode 100644
index 0000000..f5825cf
--- /dev/null
+++ b/dev-python/pypy-bin/Manifest
@@ -0,0 +1 @@
+DIST pypy-bin-2.0.2.tbz2 18013208 SHA256 ca9abc1a4f18930a1f7a5724bd79fdb3e4e640bcde40bc231f9201b398af5cd6 SHA512 b4012f1642b69517aca3cbf3fc9fd5cfea6ec54f62667730b37170821c9770f60aabaf0626629806e62225bd4a26e2e6e3c98f4e3fc17ae76ca80c7afd7fea20 WHIRLPOOL 357c9331c9a081f602f35b717253298ff4c9b89482e4fc55b7c2ce350cbbab1d7e213ad78e26f9b14c655ba2d7f501ccc18c96f4d099190b6c3e9eacbefa82bc
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
new file mode 100644
index 0000000..0645cd9
--- /dev/null
+++ b/dev-python/pypy-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
new file mode 100644
index 0000000..f774a67
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit multilib multiprocessing python-any-r1 toolchain-funcs vcs-snapshot versionator
+
+DESCRIPTION="Pre-built pypy binary for low memory systems"
+HOMEPAGE=""http://pypy.org/""
+SRC_URI="amd64? ( http://dev.gentoo.org/~idella4/${P}.tbz2 )"
+
+LICENSE="MIT"
+SLOT=$(get_version_component_range 1-2 ${PV})
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="bzip2 +jit ncurses 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"
+
+python_install() {
+
+	python-any-r1_python_install
+}
diff --git a/dev-python/pypy-bin/pypy-bin/CVS/Entries b/dev-python/pypy-bin/pypy-bin/CVS/Entries
new file mode 100644
index 0000000..1784810
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/CVS/Entries
@@ -0,0 +1 @@
+D
diff --git a/dev-python/pypy-bin/pypy-bin/CVS/Repository b/dev-python/pypy-bin/pypy-bin/CVS/Repository
new file mode 100644
index 0000000..9694064
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/dev-python/pypy-bin
diff --git a/dev-python/pypy-bin/pypy-bin/CVS/Root b/dev-python/pypy-bin/pypy-bin/CVS/Root
new file mode 100644
index 0000000..5990c63
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/CVS/Root
@@ -0,0 +1 @@
+idella4@cvs.gentoo.org:/var/cvsroot
diff --git a/dev-python/pypy-bin/pypy-bin/Manifest b/dev-python/pypy-bin/pypy-bin/Manifest
new file mode 100644
index 0000000..ee9fe92
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/Manifest
@@ -0,0 +1,3 @@
+DIST pypy-bin-2.0.2.tbz2 18013208 SHA256 ca9abc1a4f18930a1f7a5724bd79fdb3e4e640bcde40bc231f9201b398af5cd6 SHA512 b4012f1642b69517aca3cbf3fc9fd5cfea6ec54f62667730b37170821c9770f60aabaf0626629806e62225bd4a26e2e6e3c98f4e3fc17ae76ca80c7afd7fea20 WHIRLPOOL 357c9331c9a081f602f35b717253298ff4c9b89482e4fc55b7c2ce350cbbab1d7e213ad78e26f9b14c655ba2d7f501ccc18c96f4d099190b6c3e9eacbefa82bc
+EBUILD pypy-bin-2.0.2.ebuild 974 SHA256 781deb1fea17660bb8d9973683c8bfb3eaa9a259805560523158d9d6350f249e SHA512 c824aa9fb396cdafdf2c89097eba17ead85f094cc953da88f3288c4502db70c7ef715a10ba3933950aa829eb9b8f2236a55ae06673623721cfbc39fd8b199d9a WHIRLPOOL b6f993365408027636b95e2a7002d41ad29a89714ca8172cd09b0fc4704daec0dbb99bc2920245518059672d9b8ae0c8a0d5c226d1b08d3b9fb366ecf352e781
+MISC metadata.xml 284 SHA256 9640fb859af7aecb7c3d20e2eddae8e9cee4a7bcd4793337ccc8b1036b9e170d SHA512 e9bc9d5b197ea37f595f4f94cd63db72df00427d3ee1b88e88c32c73805177dfa5bb488d3149c67dc59c4ad96a87251bf5de2a764deec251930c09ab0aa07946 WHIRLPOOL 39713f48e4c45605ac1a3cef49686f763320b2d2233318a688e1ab1936ce1fe02abe9987a69cd562928660128bc5b7787a110aaf7139ee0c750ce773bc7c70ca
diff --git a/dev-python/pypy-bin/pypy-bin/metadata.xml b/dev-python/pypy-bin/pypy-bin/metadata.xml
new file mode 100644
index 0000000..d073a37
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>python</herd>
+        <maintainer><email>idella4@gentoo.org</email>
+                <name>Ian Delaney</name>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pypy-bin/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin/pypy-bin-2.0.2.ebuild
new file mode 100644
index 0000000..3e8f44e
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit multiprocessing python-any-r1 versionator
+
+DESCRIPTION="Pre-built pypy binary for low memory systems"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="amd64? ( http://dev.gentoo.org/~idella4/pypy/${P}.tbz2 )"
+
+LICENSE="MIT"
+SLOT=$(get_version_component_range 1-2 ${PV})
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="bzip2 doc examples +jit ncurses 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"
+
+src_unpack() {
+	default
+	mkdir "${WORKDIR}"/${P}
+	mv "${WORKDIR}"/usr "${WORKDIR}"/${P}/ || die
+}
+
+src_install() {
+	mv "${WORKDIR}"/${P}/usr "${D}" || die
+}
diff --git a/dev-python/recaptcha-client/Manifest b/dev-python/recaptcha-client/Manifest
deleted file mode 100644
index 1e7646b..0000000
--- a/dev-python/recaptcha-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST recaptcha-client-1.0.6.tar.gz 7389 SHA256 28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f SHA512 c41954d722181ece934701df0701101b31cad74c15a123c2c641e671e5117a27ea23e1f52aa9126d7ddfd038438f951d45ec4112323306a91d81072e31b3f5bb WHIRLPOOL a02764e7c67b62f6648cce97f3ba76ce894f0ef622c1a5da4e75f3bb6431257e24de4b9f137ab6a45d5b304b7f1320ef12261d0d17f0f7b80df2589e68cf96a7
diff --git a/dev-python/recaptcha-client/recaptcha-client-1.0.6.ebuild b/dev-python/recaptcha-client/recaptcha-client-1.0.6.ebuild
deleted file mode 100644
index 45566ac..0000000
--- a/dev-python/recaptcha-client/recaptcha-client-1.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS=1
-inherit distutils
-
-DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
-HOMEPAGE="http://pypi.python.org/pypi/recaptcha-client/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-PYTHON_MODNAME="recaptcha"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/pycrypto"
-DEPEND="${RDEPEND} dev-python/setuptools"