bump; add py3 pypy support and migration -> distutils-r1, rm old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 58 insertions, 125 deletions

diff --git a/dev-python/fusil/ChangeLog b/dev-python/fusil/ChangeLog
index d3c1a8590398..1e6a6945e3a8 100644
--- a/dev-python/fusil/ChangeLog
+++ b/dev-python/fusil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/fusil
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/ChangeLog,v 1.8 2012/06/07 20:29:52 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/ChangeLog,v 1.9 2014/04/10 07:52:53 idella4 Exp $
+
+*fusil-1.5 (10 Apr 2014)
+
+  10 Apr 2014; Ian Delaney <idella4@gentoo.org> +fusil-1.5.ebuild,
+  -fusil-1.3.2.ebuild, -fusil-1.4.ebuild:
+  bump; add py3 pypy support and migration -> distutils-r1, rm old
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> fusil-1.3.2.ebuild,
   fusil-1.4.ebuild:
@@ -45,4 +51,3 @@
   28 Feb 2009; Patrick Lauer <patrick@gentoo.org> +metadata.xml,
   +fusil-1.2.1.ebuild:
   Initial import. Fixes #247893. Ebuild contributed by Tuna <tuna@lyua.org>
-
diff --git a/dev-python/fusil/Manifest b/dev-python/fusil/Manifest
index c309b4738389..517970211714 100644
--- a/dev-python/fusil/Manifest
+++ b/dev-python/fusil/Manifest
@@ -1,7 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.4-python25.patch 313 SHA256 dd587a243c9d3c228423357322385280020700ae43743f7401faefca6062e602 SHA512 3a7f6f8a707af78cd7f0dd582ef206b3e7d656be2ad0bf507ea410b05bd158ee661a0713ab20506f9aa85af62a1bd93ffb33c9696c0fc7bc9b8e003f5f4cc417 WHIRLPOOL 5ca15f464eb6feba726f41924ccab24d16de19695c82268b1ed383e529209a33fa2a7d2e36d7aa536ea3d5f288429d41482d5cebde24ff9f911bf7836310fe11
-DIST fusil-1.3.2.tar.gz 134684 SHA256 8cdef921e19d495e39db0208ca1a66775d78add4dbdf7ff802303464689689e3 SHA512 f9bb1abb6b092a99396a3c8ff545ccd17aca431365466d4f3c9a57deceb2261b253ff6555372bb180e0bceb58e9a37d43bc24ba707985451608b1c2b1a74a33d WHIRLPOOL 1d618763645b21bb88f564503b10c65065ffdac42c9a4c0c242ff27143aadc698d01d6516b41f70904910dc17dc5f462ea2db2cf13b210a158eb42c838804f82
-DIST fusil-1.4.tar.gz 133188 SHA256 5908b22cabd509ba385dbf0e3d2547147d6d2c21937eba25f89bbac3e6cd5d0b SHA512 d8ddb2f32e6b6aa5d802931692b601aa8d74469ca56ae193beee26834e1fa8e6f959977904935cd5e4c45afe62aa0e0a72516bc00f91d38dfc90636eb50928d4 WHIRLPOOL 3ba0dbf0baba3a73022cd006b5946b5dae049b891e7fd1315e0affd1294ef2c5524f5750aff77b5ff9730f7ac0d978a3fd6a40c0f124cb26a9963f24ada6c3cc
-EBUILD fusil-1.3.2.ebuild 1560 SHA256 0350ac2afa03d36d1e73e533e5fff176fe32245bf9c12c90a12a56a5a709a684 SHA512 bc089002bd925f62b43eb17044a90678f2c026b0fedcd692d9940354bcf20e73de5359813a90cd39e7a01afd7088b19be8648f403d4f1d042b10921b8615ebfd WHIRLPOOL 7f0dd4f496a5adb9ac77d3b9f1e15bba44e727d5db66f89f82ab656ed815930b181362247fb6f80baedb87206cc0fcd692fbd7fa24ac68ae32415350f8b69716
-EBUILD fusil-1.4.ebuild 1144 SHA256 85958d3061eea234fa82ae0bfc4275a989fd3911a409cfe17ec89ee331657310 SHA512 a3a7f8f2e79ae8f42bc06a32eebfdf5196febd86f63c25b1362d4239e1dbe523c16cd94c1b23a2736516629c2a2679ea30656ac7c8ae6a50608bf7e61d1ba95f WHIRLPOOL 4f107cbee5d1d95054bbeb40062bf9a2eb2a3b236be0fa7924947c497861612f5a452a33110331b46adfdaa998cf498e431c21535095aa7b1c872678f76a2476
-MISC ChangeLog 1504 SHA256 7485b6d68b1db9609fbbf09a1e3e6d70f67ece01674b23ca39d5f892e71da668 SHA512 40dd035a65da6aec0947978e1650d9838766c63572d3f4f5b9dad73f1095925305dc2493a7ab1038f419c7dd9fe1de7077c18a59eef6d596fe968082e5f17ab2 WHIRLPOOL 64d8fba65a88478ad8c5a15fdcc7d62e1286234f66956cda42121ab0556722e1f6f610b92a7b1e2be4a0b3f1c732e8c210e9bf221aa5ac9ab674c37fe03a0f62
+DIST fusil-1.5.tar.gz 138910 SHA256 1b6e269f47636b5fd1ddd25940aa1beaae68c05c076b3ad6bcef72db5865729b SHA512 0d84bfd2d9b8e509989723de26b30c3ec2824612dbdcc097ff3e998fd4efa6b1293cb78743e098ad5012d4981b8e8036f3ad3f9c6acf2dc30e3ff1f707c7d1c0 WHIRLPOOL d0747c9f53af8ccaa9155fa05726928b0a52b5cef6fc76f7ab38b3219ca3d1c82c396737de3427fe3129d257f91853659ea7f2ab158c31a4349b53d906c5121d
+EBUILD fusil-1.5.ebuild 1054 SHA256 217d433bdb2167e17ad2dee94610d2627c103f22b3a21e7c36ad8046466b81b2 SHA512 d348ddfd099664ec793d1555b0c34d38c135bdc4951d4919e30523ba961b530b2e0f284bdbc58b49fbe6df3b8d0e17e9e99b6f2603cc6a9253cbbf4b62cf40e4 WHIRLPOOL 76cbc06ff6ee535973977769f6ba27cf08ee7f6dfd7808d65c3c8a23061440ad4ac3222dd9ed8cb3fe436152bb88061b7c2258bda639931a6b8443f2f0400461
+MISC ChangeLog 1706 SHA256 41e0ae11ba00aabfb669f2743000ac0a4e19f4ce7048d6c66bb368445713b98a SHA512 2efa5cc05fc572b3a1c3722cba7438a6a6346c825192cbd4210ebcb47613765b19d79b7a568c3208750db4a988d7059f83de5ffb8265ff1edad8010c67ff5a83 WHIRLPOOL f6c6c004816821d25c37f224198ed6d1e444102bbfa4925a97cf141ece93be1769dcf16d8c6ff6007892f74cd9686d1560183f9e83c6c7a94e1b206bebf850d5
 MISC metadata.xml 228 SHA256 4a1f4235aba4aa3315bc7fe1b79e76bb1931a1103d9e94521654a3aaca195b01 SHA512 0b29b0ada9fb4256008d740d4531d7a76aa85538d2c579a697192bcdb2c067824276ab07acf772271b403f151563e272fc7a2903ab91f75bd15929838898904b WHIRLPOOL 13a4f9ceafe4873ac6857c669bf4d1b48c537a91523e6616f29536281b3c6cdae6475d319e1531dfe05d3369b9ea05001a1436f757a1b82cb2a501464147fc03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlNGTBwACgkQso7CE7gHKw36vACdEKvLueV1qrjHtjRoymFDNAeo
+RyAAoILB4dynFlWSKLhF+XSIsMW9cZkn
+=KoEf
+-----END PGP SIGNATURE-----
diff --git a/dev-python/fusil/fusil-1.3.2.ebuild b/dev-python/fusil/fusil-1.3.2.ebuild
deleted file mode 100644
index 5a9b3e43995c..000000000000
--- a/dev-python/fusil/fusil-1.3.2.ebuild
+++ /dev/null
@@ -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/dev-python/fusil/fusil-1.3.2.ebuild,v 1.6 2012/06/07 20:29:52 zmedico Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4"
-
-inherit distutils eutils user
-
-DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs."
-HOMEPAGE="http://bitbucket.org/haypo/fusil/wiki/Home http://pypi.python.org/pypi/fusil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=">=dev-python/python-ptrace-0.6"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-src_prepare() {
-	python_copy_sources
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-
-		# Based on commands from conv_python3.0.sh.
-		2to3-${PYTHON_ABI} -w . fuzzers/fusil-* fuzzers/notworking/fusil-* > /dev/null
-		epatch python3.0.patch
-	}
-	python_execute_function --action-message 'Applying patches for Python ${PYTHON_ABI}' --failure-message 'Applying patches for Python ${PYTHON_ABI} failed' -s conversion
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd doc
-		emake RST2HTML="rst2html.py" || die "Generation of documentation failed"
-	fi
-}
-
-src_install(){
-	distutils_src_install
-
-	if use doc; then
-		dohtml doc/*
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	enewgroup fusil
-	enewuser fusil -1 -1 -1 "fusil"
-}
diff --git a/dev-python/fusil/fusil-1.4.ebuild b/dev-python/fusil/fusil-1.4.ebuild
deleted file mode 100644
index eba0a8c92151..000000000000
--- a/dev-python/fusil/fusil-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/fusil-1.4.ebuild,v 1.2 2012/06/07 20:29:52 zmedico Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4"
-
-inherit distutils eutils user
-
-DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs."
-HOMEPAGE="http://bitbucket.org/haypo/fusil/wiki/Home http://pypi.python.org/pypi/fusil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=">=dev-python/python-ptrace-0.6"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-python25.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd doc
-		emake RST2HTML="rst2html.py" || die "Generation of documentation failed"
-	fi
-}
-
-src_install(){
-	distutils_src_install
-	if use doc; then
-		dohtml doc/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	enewgroup fusil
-	enewuser fusil -1 -1 -1 "fusil"
-}
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
new file mode 100644
index 000000000000..79a9aa675ae6
--- /dev/null
+++ b/dev-python/fusil/fusil-1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fusil/fusil-1.5.ebuild,v 1.1 2014/04/10 07:52:53 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy2_0 pypy )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs."
+HOMEPAGE="http://bitbucket.org/haypo/fusil/wiki/Home http://pypi.python.org/pypi/fusil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND=">=dev-python/python-ptrace-0.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C doc RST2HTML="rst2html.py" || die "Generation of documentation failed"
+}
+
+python_install_all(){
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	enewgroup fusil
+	enewuser fusil -1 -1 -1 "fusil"
+}