Remove old (slotted) version.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 19 insertions, 167 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 38e1f949688f..0f294b783125 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pypy-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.18 2014/05/12 20:49:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.19 2014/05/16 21:50:11 mgorny Exp $
+
+  16 May 2014; Michał Górny <mgorny@gentoo.org> -pypy-bin-2.0.2.ebuild:
+  Remove old (slotted) version.
 
   12 May 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.2.1-r1.ebuild:
   Remove the versioned deps, they are too painful to maintain for a minor tool
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index a53aea223cc7..d27db7c82c1c 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -22,26 +22,25 @@ DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 8981480 SHA256 e965e343
 DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5179532 SHA256 2cc4e6208303ed64a09e9769a866523217dadfb81322ea0dc931e6d4f2cd757c SHA512 3bd1b3a45c60461294eee63d25f4f71c93289d5aa18193585a478dae343fd2930cf3f2ce0ef001fa33b3a6c77abc26842e4941f0573ed163c8a60feb0fe6ff51 WHIRLPOOL 536a6dfbc6f11fb8e3d3f3fab232263e4731ec97cc3eca4c952042c747b30f761821bc4ddf7c7e896d9692d555a5b5fcb6057f3c3c31e8f8cd6bc9edbbd88503
 DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz 5179732 SHA256 2889b1b3e0af8d7a763f9d237295ab181c9661c0f57d26e799c71d28df388714 SHA512 ce34e0cb0d362381ce6ba8fab84a55463d2c4cc0834df550e0823b6ec97d762386d382ba1a7a5e039ef531070bfa27ed76c88326a48f948cb9f82af78fda2391 WHIRLPOOL e6cc06898e967010d30d225a4ca59b70080da3763e0ad153211719bc99fd707ac8ee8d28ee2c286f87404439424ab59ecf7332162658f0b4cb0a3efbac35f54c
 EBUILD pypy-bin-2.0.2-r1.ebuild 4210 SHA256 570f883a61d8feb59c8b3134ce3ca9b918bc95ac4563a54325e8e604ec5705e0 SHA512 500ccb454884c49bdcc0b22d95e1c70c23146b8312f2847201eea9d3b797cec07d1726638ae80cdeba39a50ec1966d13554cc4580cac28a894a1272e4054be6e WHIRLPOOL ae7ef9a4670802f537cbc0671230af688149b892fff62f1ec2afcf346a706f4a7af4094388aff32083f5209e6104f754e37ce9d5ab82198574cab8cff48a674c
-EBUILD pypy-bin-2.0.2.ebuild 4335 SHA256 69858bcefe29c507b1c9215731f282d3c9ad0709e5a51df400fba300f297d14f SHA512 487764092f830a69e10e45261e1b788282e0d9ca82c999dd547d67d7732654fa2f3170661108cd9aed703611c0ac1276388ea862bf50ee5223cb7efbb02305a9 WHIRLPOOL 0e7b36a108dda2bda996d9ba0b21f3ed8fd806c177d23af847406613b3a926be53a081d861be2b1d1ab36d385bb5730430c84ce322fc006ca5c086e823068327
 EBUILD pypy-bin-2.2.1-r1.ebuild 4855 SHA256 35dab852d6ceb79c6bc524bab1c2c1c35fff75b07b4070e73dc2b1217000fcbb SHA512 e53a6579dd6f1e750a04daee62fce58af3f966ca7bcca853fc58e221e01f74ca6e061d39eb8a4710a5833ab0786fb39eca7d67c60d9704a5b927c346ff838072 WHIRLPOOL e2dc3352beff744d900ac43c522389d81f2f9f255af2e7487cadb6d2ef282359e5302f8b0bc5041d10fdb19fa5be2497d9ad8cc96be318ee1880db12dba4e773
-MISC ChangeLog 4091 SHA256 df589e41f03007a94e6e4f3675452c73e9374230afa3ff33572932336acdc3b5 SHA512 91c56f5c20f8c7f4a17eef25e0297f5d814bcee9726d0272207563278e93f00fe78251d982f8a8eedcb2ead2d4704240a8fdd6d76a2e77c26256efa3de8564a7 WHIRLPOOL af9c018c5456de1335601f068d5eb912e2b231d03dfb7083f047f72523f4219c4ea1c47cb2432f10ba13e8129e705ede31693842262b8741182d37895eddc8e7
+MISC ChangeLog 4198 SHA256 5959f8529068dc7ff3a3968dfed86b3b1fe6b0e6a7bee9feb6abddb2a4505d68 SHA512 42c9121299367f6140d47661da9ba87aee89e0e66f2fa658128cb113c4faf53af12df9fdbde3aade95d66d75df277afd4b8f18d70be4c2b6059bc0460d2902f9 WHIRLPOOL 216aec36a41f4425c89fbdfee2e85dee85f1d11a52e3574d51672acfefb7aabd5de3ebe3b11b6c6f90b2535ca0f9e28dfd4a752ab36ee92972cdf7ea8e40db66
 MISC metadata.xml 428 SHA256 99cbecab117f387c279567957835aa68a397906b2309e9c9b8feb80d10812899 SHA512 fda6cede1be6fe8c7d1cbaceebe3193cd16102ad2a570afb1a2269c02ee3021ed9130fc8b09e9f6c5cf742afa95af6864577030b3eaeb41ea29a500826bf7260 WHIRLPOOL 2d765c32b3534dd8fedeee10ea0e3cfcf22fd51121046009a5196ce206dbaf1625f363e8b6dcf3798c6a185de90f27fe06e73b755ad27723ecd8c8bf3ff13ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTcTPBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTdogUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4F4QAMWTyFpsqxdrpyS3byIxoelb
-/kJImn/z+WnhJdJfeQ++nrDnyaUzBI0CvyOolbS9ymBMC5vFzpUsq5GyQylJ+dUG
-7rviX0/R6qZllgP+bBkJ99bzMiiS7MIbEXDR6I1Pk8eDYAVj9s9cmrwwQH50dv4X
-/jfyXquRyPSKnl7wVDPpyHHzlaa9VbvAGi4bygxvj8IDP/hcJlWdJ23gsCwp+2Ns
-uyMq8ScT+rPeNwBQdXJR4lfOppYLE2OAbOIrNNmVJtOahQXtR4u0Zp8kZ68vKsst
-ys0cPNVNJNLYxqJpdHZVV0nLOjCwmvVKqxTrQA4ZyCfDz7NBiQTM9tsb7vHTgc3A
-oZwRZvEvKPCHNXeoPDtl9LiEgJnZfQed/kEzI5Fe9tsKD/x9yT9e9g+Qmxrvrmm2
-4fc2+dvyrG6NLTZJ4G5picdF2YWxT2Fnh/liwvCDBV5e3ar/HNxiymv3QfGNnf7x
-V73a7HI6JOZJU/nGXgQDZp04WlFjfIU6yALJQ76Ok5Sd8bm3wemlkwM6GVyyhN4l
-7oh538VLhFdAbwJMYyUQVuHXtWH7OdONqs4m3IcLzgCYJyHqekwWF/xW6qL9QXob
-BXzcVPKzkZ3Jjq+xdDoCmZgehWwQjQS1yF4p25q0ix8GNQdk/ikSmRNI9YWpnuns
-I8BVd8KX2PxKXFtggGGW
-=N+bH
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcMsP/05s+8ONktM15a7Q3kiUENhi
+YH8swQ8Ai/Igdhx55aQme0DHvzuh8A+DhV27gH793ItKyLS5/UHrKkL9O7tCfrla
+Xjvs5acq5Wid432OAhLNwn7YHN4prw7HrLIihI1mSEDvKsHDx+JJ4zWbDOZP2OMV
+ksvvnZo/QI/v0FwgBJDIGo0l918pACP3DOipZ60pJN5ER10gykXHNzC7gn6CvzhY
+Eije1R1nsN9b19/w/PbJQIGicxpPHpTkJhBL8WEqajcOMqX5gQfPNSSTKfe9XaHL
+9F4VsrwcBTs6NEw63k54dCxZEhe3h2lncf1Ovwtb4dhNvhjNBuoiZJvMBTjUHTyJ
+LnVYTJ+hX2bYiQ404W/wcXgQ3rFg7lwEz2H1UlseDotwV2rAPjyjSV0YxVpWbd5g
+PjVKcmbXA55tiFosSBnK+kl9hium3VNYsnedifMukG/5XLsO6OvpASYyseHfR/wH
+saFPH92JeTRZLGzwZYa3zgSfyJDmHzLnkylfqmj6B7XXjaQLks6kXgZ3o/n7FaYH
+EZHlg1HLWdnFr4oLvE2BXLXoMpSjcxAFwsDBpk1dMrSXLchWIoo4QxiWIozptmoG
+u5A0UgdWeX6czY5RWebhgUlZxsNFPa4jaXaTn7oZQUB0YDAAb4ssn7IeNUwcpbXi
+rs2NaNik7wAIEGZNreIa
+=rHPQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
deleted file mode 100644
index 913fb485c807..000000000000
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild,v 1.10 2014/04/08 15:33:13 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-inherit eutils multilib pax-utils python-any-r1 versionator
-
-BINHOST="http://dev.gentoo.org/~mgorny/dist/${PN}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
-	amd64? (
-		jit? ( shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-		) )
-		jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-		) )
-		!jit? ( !shadowstack? (
-			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-		) )
-	)
-	x86? (
-		sse2? (
-			jit? ( shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-			) )
-			jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
-			) )
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
-			) )
-		)
-		!sse2? (
-			!jit? ( !shadowstack? (
-				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
-			) )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-SLOT=$(get_version_component_range 1-2 ${PV})
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +jit shadowstack sqlite sse2 test"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-	~app-arch/bzip2-1.0.6:0
-	~dev-libs/expat-2.1.0:0
-	( <dev-libs/libffi-3.0.14:0
-		>=dev-libs/libffi-3.0.11:0 )
-	( <dev-libs/openssl-1.0.1h:0
-		>=dev-libs/openssl-1.0.1c:0 )
-	( <sys-libs/glibc-2.20:2.2
-		>=sys-libs/glibc-2.15:2.2 )
-	~sys-libs/ncurses-5.9:5
-	( <sys-libs/zlib-1.2.9:0
-		>=sys-libs/zlib-1.2.7:0 )
-	sqlite? ( dev-db/sqlite:3 )
-	!dev-python/pypy:${SLOT}"
-DEPEND="app-arch/xz-utils
-	doc? ( dev-python/sphinx )
-	test? ( ${RDEPEND} )"
-PDEPEND="app-admin/python-updater"
-
-S=${WORKDIR}/pypy-${PV}-src
-
-pkg_setup() {
-	use doc && 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.2-distutils-fix_handling_of_executables_and_flags.patch"
-
-	epatch_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/pypy-c . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	insinto "/usr/$(get_libdir)/pypy${SLOT}"
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSDESTTREE}/pypy-c
-	#needed even without jit :(
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dosym ../$(get_libdir)/pypy${SLOT}/include /usr/include/pypy${SLOT}
-	dodoc README.rst
-
-	if ! use sqlite; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die
-		rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
-	fi
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	einfo "Generating caches and byte-compiling ..."
-
-	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-
-	# Note: call portage helpers before this line.
-	# PYTHONPATH confuses them and will result in random failures.
-
-	local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
-
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi cache
-	"${PYTHON}" -c "import _curses" || die "Failed to import _curses"
-	if use sqlite; then
-		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3"
-	fi
-
-	# compile the installed modules
-	python_optimize "${ED%/}${INSDESTTREE}"
-}