Drop optional runtime dep on dev-libs/distorm64, and restore python3 and pypy support. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

6 files changed, 17 insertions, 142 deletions

diff --git a/dev-python/python-ptrace/ChangeLog b/dev-python/python-ptrace/ChangeLog
index 8a3df778a3c9..4bc1982eaf55 100644
--- a/dev-python/python-ptrace/ChangeLog
+++ b/dev-python/python-ptrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-ptrace
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/ChangeLog,v 1.17 2014/11/30 16:55:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/ChangeLog,v 1.18 2014/12/01 02:02:53 floppym Exp $
+
+  01 Dec 2014; Mike Gilbert <floppym@gentoo.org> -python-ptrace-0.6.6.ebuild,
+  -python-ptrace-0.7.ebuild, -python-ptrace-0.8.ebuild,
+  python-ptrace-0.8.1.ebuild:
+  Drop optional runtime dep on dev-libs/distorm64, and restore python3 and pypy
+  support. Remove old.
 
   30 Nov 2014; Michał Górny <mgorny@gentoo.org> python-ptrace-0.7.ebuild,
   python-ptrace-0.8.1.ebuild, python-ptrace-0.8.ebuild:
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
index 8d7963a58cd3..5933c6a521d7 100644
--- a/dev-python/python-ptrace/Manifest
+++ b/dev-python/python-ptrace/Manifest
@@ -1,32 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST python-ptrace-0.6.6.tar.gz 77931 SHA256 8e6a169d7d534edd127fd5946fddf9ca71891853051d2b39c3259b82dcb46b9c SHA512 e5be324bf2751ffd8e7e9c9b9c74bd5218978a67230af63d496fce88b5a0d8dd279aed12b20d4edbea66b03146d3df31cf868327d1d6cb4b158440b505bd74e6 WHIRLPOOL a95e153a674a00cfc793a1ecae991bb74ff1cd9b73fdfc268f340fed4c476bbe519ddc0393cc090c6045a09c275e6ebf65e24fd37490e5d75f2103931d8d7dcd
-DIST python-ptrace-0.7.tar.gz 84069 SHA256 df268620f8201ef7be65be6967799409b9b1befaabb669a09ff59451f17a3c6f SHA512 90e041d93545904b4b1e4f3f1458721da095b8b618854b72bae5325e193a58a9efdb001bf9f1391238ab324afff25f91ea3833a5c5ec069332fd92ebc84db26d WHIRLPOOL ea0afe342bdcf9aa23ab0073c87bc5ed4a9e65a9d25c08b047ca2fccb6dd6b641473125ac2560e96f43e76d4a8899c356a70d4545403ee3f09ad95fabf1729fb
 DIST python-ptrace-0.8.1.tar.gz 93674 SHA256 779e04c7bdc00150b739e7d49c9c61b7f36f17afd26355f91b10cd0e7d55d19f SHA512 1c3dadf381ad0fe30374fe030fc3a81b5ec0885c31ac9be4ae561cf14ff891fc2e465555133b2efce6be0154b06768121aa068161bb3de10aca6df0eb181e25c WHIRLPOOL 1541571ed580b5852b1fc51f515776463dc622a4a2c334691f0433083a29bc1059549e0b4e938ea7c694517e341cd39bbc3f487f5ea7f83b327aaad1dbd8b7df
-DIST python-ptrace-0.8.tar.gz 86752 SHA256 0c5cdcb930916ed0ba142f01cc414212785e53972311b48656dd6c1bc5f28578 SHA512 7725b85533468240fca9ca82a046cc9e9ba788294258cb0be1bf3cf4fb206dd966c2e9667f327d1536d4b32c73d683deeaf74f2fc0ac14030428dbccaa1ef115 WHIRLPOOL 4c598303efff45eb2a3e3d3dca4e1dc2227622d82987e65909d702884f79aaacfc1ec5c79dbd06cd9c4e4530b073b4189356c391c5f03dcb76fceb237a2ef7cd
-EBUILD python-ptrace-0.6.6.ebuild 1276 SHA256 5d97766664e759b614af6fdf9bf4c439d54c9a9e6b022ee876851e7a475a67da SHA512 4427326e37e97f16cb46e226fa5944990419ee1a90b150cc435ae65e973b5bece465648958e749634e9ea46849a1a33097b9f7f1d1c45aad6f46a5d224863ffe WHIRLPOOL be2803f99226e583a0b845d1dfcb7413cac4a6fc5daa3e3f69ad48b96f2134d326826d2723b6087095e00384ea1fbe7f4774a658997cb1b50daf96467324e665
-EBUILD python-ptrace-0.7.ebuild 906 SHA256 f667854152891a4a26e60a73aa046083c9116676b448ce39712b2f7d8444efd3 SHA512 9232acc991898a89bb108a57bc0f143ba4762acebf62ab4170e82c3c4a9a1f1aa7b1746a96476f2e77d5628a92f1f40fdd9dc65b8ebbeb13ca664cbaee212f1e WHIRLPOOL ace5b58752debb5affff83ab58442959dcedba885e504b810c9ea95dff7ad692d480b4bb80f0f9c0f4ac30b39b8f345d0ca8613a134fce6fd25bf3e391fc040d
-EBUILD python-ptrace-0.8.1.ebuild 1012 SHA256 fe0110ad2b423865eb596a47c9e8164f532becce22afd34f9a89cf8a213c26e1 SHA512 be5cd07f8ad547502c19bb2bd876a98b042db0e59952e4d90fe009921b27ad256b824346e89f2b843caafdcf8bba1a0adfe62ca34b9f0fd541932689e6f54deb WHIRLPOOL c70aa0c16af4e1b2f5baaeed334e3f1dfdc244decfca68168956cebf83fda069e19cc8c2ae9199d3fb759543fce202e4e7c8c9020b0be0862aacc1282bbbce2d
-EBUILD python-ptrace-0.8.ebuild 1010 SHA256 8ae981e1e55b3c43a7ec93793a71f695232e74a2b4a814b960a18d8b47b4c6ee SHA512 cdacc6fd28800e060bc0d7f20370c83073dc260bc221d058d0569bfad13fc9fa6f8af00fa33c6c0b920c87a2407d59e5956df406aa65ff439bde0d6e6c04f89b WHIRLPOOL 1f4c1e261c026ecf3ee21c4f5fe8b8ea802007a467d4ae4420316d9b58d19bcd73b5ce074f6c133bbacf4643fcd6ae8d0cba18faa330d5be92684e4ae0415a4a
-MISC ChangeLog 2960 SHA256 f739d87c6dfe607fd7f089418afac731b6fa36446f046b8ae45b4aa17beae97a SHA512 8426decb9c236aa09bf8cbafb42e0155d134f49ec7933b6e05870e8d16d60e7d3ed8bb08ea59032127939eb73a46904c07cea54f22d42222d911f2f9c7a1a03a WHIRLPOOL 67586fea871e7529ddd86a275c01bd6e3bf614d10705bfbcc7bb120bbe33d4d74331eda67f0b77a22a6743229aa7c32f08c8facf40a964532fa5fdc5993a403a
+EBUILD python-ptrace-0.8.1.ebuild 1079 SHA256 590d58a20d08e936a4907b1dbeabdb10cf69e0f47a163bb5164a5d17c76ede7d SHA512 77ef643a30e73d7520a61bae30f4c8fdbaa2439f3507dd6742b0e65ab81b261cfe529dabe0ada496180a2a190ec42fd5e0dfc1cce3ed316100b8bfbee491453f WHIRLPOOL 50b1427a0cc1daca6ae6b3d681878d4aaf921aff0f872dc39bc69fefd868cd8b816ffdccc56222407d040bb4ab6e1d11badc5d040e1abaac09fbb81f1c61e611
+MISC ChangeLog 3229 SHA256 bac8dcc54004164cfd498d566263781795898a972bafa57b60348c4d0889079e SHA512 26860d66eb6b64c26a8564ff1eaaecc6d953d976cc683a2f59c7cb679619cc345e90740606ff8c559d4d87982173206fd27883034bb650fc56161f52bdc1a2c8 WHIRLPOOL 512ff5c3ad55e394ad6b904cc239c922a99be953debc372d62dd6ff548cb20e648f8e4737c0376ba5fabf4c802e79f0465d174b3db1be620f2a3345ebc6ea990
 MISC metadata.xml 236 SHA256 ef9f12fc623783043709c89a6c5febf6f6d6bcec5882e7ce867228e3e13f0b40 SHA512 6ab6dc105ead9eb542ce5800527ccf9fe99f813cfe59ca8b075b877468d2f027ce6e96ddbe1cfc4e9ac42fc24a96a80b5490e5e2e85eb3d8145e4b97c2a2dcec WHIRLPOOL f0b5d1dee36e29c2ef1122261d24054db7388f32b2e743e47177156f396cf24e77d88af071e93f3505946e5026ae4696e71949e0163da0f498e4d55c0243e2e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUe0vsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnp4P/3yhM52QwVSdEvdflg1Te/Tm
-uv91oxgHhvLc/0a1GL3+X9CkNsaom/8MdaipqPC6MVdfPcVctPYJu99angZdDuBv
-bGo70KRMfSfpYDcJCwbz1SSSSEG5OFS51HXzKrEpQvC71a2cMbGsJkiU4Q7pc/PK
-fE1KqxWcZYHcXpv5yHDNNhdx5R2gmWNWSVoV8QSXUqM3SgHCmIXLZsCL8cDj98Sz
-eI3PuKIPxfmb4LqGJL9DVPcT71NjJzBYts5yzFN/7J84Xjt+b+KK4fBVltTb9hgQ
-aUdjlAkgH29bCH8OhyIrHCz+c9XD+zPixGhbUF2vNej6ykZCc/zVLhTKcAGyCd/A
-kInn32EBwp3PJI2LHM+BgYQ00pkZ/lPLeJR3H3iNtJ1QtKN4CXUmQ/X459198KcL
-LAn9uD186wMwuoKEFcP93bYoI8/vpUa7eobHbBE2JDzcdfOQGr2v/XjL3IfEySOy
-jBMEeV7KgDiDvEDr3O6aYOuVPDennUoXa8IwJjqkGcRo3HqoyOiqwYjl/uacB97N
-WmLVSZhpNeV5FV2yEbO/BBxkmcg6Z35uVgFNKVG6N/oBNgKebjn864mITIQWjDMJ
-dfeiI305ty5eBpbCu2kzH5dUNNwmcc4JitGrzuI2sGUikfqPQ38bAUVqjBjssrzc
-zGZ4Kf9u6do9hAtU1/Wq
-=F569
+iF4EAREIAAYFAlR7zFEACgkQC77qH+pIQ6QhSgD/bqgKRZ+g9f8Pnug42f4ux7sC
+/DNVwTqgLCscsJhnPdAA/2fyAxHoT/+SZc49ucENSdnJ05wIVUjIzALiH6OgOqLl
+=WzML
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-ptrace/python-ptrace-0.6.6.ebuild b/dev-python/python-ptrace/python-ptrace-0.6.6.ebuild
deleted file mode 100644
index ab301b29f94e..000000000000
--- a/dev-python/python-ptrace/python-ptrace-0.6.6.ebuild
+++ /dev/null
@@ -1,45 +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/python-ptrace/python-ptrace-0.6.6.ebuild,v 1.2 2014/08/10 21:19:40 slyfox Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="http://bitbucket.org/haypo/python-ptrace/ http://pypi.python.org/pypi/python-ptrace"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="dev-libs/distorm64"
-RESTRICT_PYTHON_ABIS="2.4"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-PYTHON_MODNAME="ptrace"
-
-src_prepare() {
-	python_copy_sources
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-
-		2to3-${PYTHON_ABI} -w . > /dev/null || die "2to3 failed"
-		2to3-${PYTHON_ABI} -dw . > /dev/null || die "2to3 failed"
-	}
-	python_execute_function --action-message 'Applying patches for Python ${PYTHON_ABI}' --failure-message 'Applying patches for Python ${PYTHON_ABI} failed' -s conversion
-}
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-	   insinto usr/share/doc/${PF}/examples
-	   doins examples/*
-	fi
-}
diff --git a/dev-python/python-ptrace/python-ptrace-0.7.ebuild b/dev-python/python-ptrace/python-ptrace-0.7.ebuild
deleted file mode 100644
index 509c770886bf..000000000000
--- a/dev-python/python-ptrace/python-ptrace-0.7.ebuild
+++ /dev/null
@@ -1,32 +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/python-ptrace/python-ptrace-0.7.ebuild,v 1.3 2014/11/30 16:55:05 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="http://bitbucket.org/haypo/python-ptrace/ http://pypi.python.org/pypi/python-ptrace"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="dev-libs/distorm64[${PYTHON_USEDEP}]"
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test_doc.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild
index d16292903b97..1d350a6f790b 100644
--- a/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild,v 1.2 2014/11/30 16:55:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ptrace/python-ptrace-0.8.1.ebuild,v 1.3 2014/12/01 02:02:53 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -16,13 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-DEPEND=""
-RDEPEND="dev-libs/distorm64[${PYTHON_USEDEP}]"
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
 python_test() {
-	"${PYTHON}" test_doc.py || die "tests failed under ${EPYTHON}"
+	# Python 3.4 adds SOCK_CLOEXEC to socket.type automatically, and ptrace does
+	# not translate that on output causing it to fail test_strace.test_socket.
+	"${PYTHON}" runtests.py || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.ebuild
deleted file mode 100644
index f6a5482dcfb5..000000000000
--- a/dev-python/python-ptrace/python-ptrace-0.8.ebuild
+++ /dev/null
@@ -1,33 +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/python-ptrace/python-ptrace-0.8.ebuild,v 1.2 2014/11/30 16:55:05 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="http://bitbucket.org/haypo/python-ptrace/ http://pypi.python.org/pypi/python-ptrace"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND="dev-libs/distorm64[${PYTHON_USEDEP}]"
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test_doc.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	# doc folder missing key files to effect a proper doc build
-	use doc && local DOCS=( README doc/* )
-	distutils-r1_python_install_all
-}