From 98d1261155d89f102c869a7c3ad84c3d4dbed3b4 Mon Sep 17 00:00:00 2001
From: Alexandre PIGNÉ <alex@freesenses.net>
Date: Mon, 12 Nov 2012 15:26:15 +0100
Subject: Replace distutils module with -r1 and use python-r1 to handle
 PYTHON_TARGETS

---
 dev-python/netzob/Manifest           |  2 +-
 dev-python/netzob/netzob-9999.ebuild | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dev-python/netzob/Manifest b/dev-python/netzob/Manifest
index ac2ea75..626dfc2 100644
--- a/dev-python/netzob/Manifest
+++ b/dev-python/netzob/Manifest
@@ -8,4 +8,4 @@ EBUILD netzob-0.3.2_rc1.ebuild 1301 SHA256 aa0107ba1cc34246d27d79bfa7a94e342abf9
 EBUILD netzob-0.3.3-r1.ebuild 1256 SHA256 9c35087500f5c8d1a9af345dc9bdc82d1be0366e19509ab25c631eca1aa8a940 SHA512 34610ff4520f0eef1152eefd7d5923688c5a2a064d9c82a2c02d02afb6e3924d795120c2572bd43098a48cdeba7b7e03ba37244a0c264b24c10ba6d0cb28e16f WHIRLPOOL d97116bdb46a41d22704583f24efb29aae07c7b5abdfb3c28f667a4c9e0e47ae6d99d743e13f1ac701de9d9df377dfa9f72d2160a3668acb1b9cc9d88d2c48c2
 EBUILD netzob-0.3.3-r2.ebuild 1263 SHA256 8b102fd3531fa38807a3c92e09ddc2e2ce299df418f6c35c1bf4147a2596dd24 SHA512 3b9f75181aa5287d88d65fd0725ee715d16e6729c1f9e27e64b086b9833e64677bbd91d241a4d60d9d51ec7d1ac4592c8c311da7bf853f39cd911943a12d64a2 WHIRLPOOL 5d09cd667c600700742d3fcd22378b06819fa55c0d6687da3e88d51fe73e2aebc8238e72df5db1891347f0bf97aa70d5f4dbefc1c10ad5e7e9bd7ef6193c71a4
 EBUILD netzob-0.3.3.ebuild 1256 SHA256 9c35087500f5c8d1a9af345dc9bdc82d1be0366e19509ab25c631eca1aa8a940 SHA512 34610ff4520f0eef1152eefd7d5923688c5a2a064d9c82a2c02d02afb6e3924d795120c2572bd43098a48cdeba7b7e03ba37244a0c264b24c10ba6d0cb28e16f WHIRLPOOL d97116bdb46a41d22704583f24efb29aae07c7b5abdfb3c28f667a4c9e0e47ae6d99d743e13f1ac701de9d9df377dfa9f72d2160a3668acb1b9cc9d88d2c48c2
-EBUILD netzob-9999.ebuild 1220 SHA256 d6006b44ff7be2acc8422b90aeae79cd33fd036533466eda5f4514ffac178297 SHA512 4142c88e4bb9532aae72f0db44810920b77be236cb3fa0e9208b1eea5071c6437be9b1c758b534bfbeefabc3af3b890636a6d3388173e1cd9c1468e628101329 WHIRLPOOL ed3a05e1cd2c4ae2b6fd84c5a828eeb2ec7578c95075dce761d1f442c2c82e0ef6c099e494a230641f97b400ff33ccf875de5761cbd3eeb965ed0ac6ce614a83
+EBUILD netzob-9999.ebuild 1212 SHA256 35ea1465255978df4b8db199bc22abefa367c41f92216bb8c6862cde46a5565c SHA512 7227e939921aff94a099432dd258ab491edc6a0d4317f6e6ba5405332e9a84245f9fe8b5e772121696c2539e50bd9d7eba3e5341c64bd5763cb52ff590b22fca WHIRLPOOL 564883ddbfc196ba6c7b28efccdfa4cde449d6d9de6935e1d945d98537e2fcd2ab817ca0a896d9b1ef07bd4649fc406219fd66c502b78ef955c7a3425aee7877
diff --git a/dev-python/netzob/netzob-9999.ebuild b/dev-python/netzob/netzob-9999.ebuild
index a0e24ae..7421175 100644
--- a/dev-python/netzob/netzob-9999.ebuild
+++ b/dev-python/netzob/netzob-9999.ebuild
@@ -3,10 +3,9 @@
 # $Header: $
 
 EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils distutils git-2
+inherit eutils distutils-r1 git-2 python-r1
 
 MY_P="Netzob-${PV}"
 
@@ -27,22 +26,22 @@ RDEPEND="
 	dev-python/bitarray
 	dev-python/Babel
 	dev-python/pygobject:3
+	dev-python/pcapy
+	dev-python/python-ptrace
 	>=dev-python/httplib2-0.7.0
-	media-gfx/graphviz
-"
+	media-gfx/graphviz"
 DEPEND="${RDEPEND}
-	dev-python/setuptools
+	>=dev-python/setuptools-0.6.30-r1
 	doc? ( >=dev-python/sphinx-1.1.3 )"
 
-RESTRICT_PYTHON_ABIS="3.*"
-
 EGIT_BRANCH="next"
 
 S="${WORKDIR}/${MY_P}"
-DOCS="README.rst AUTHORS.txt NEWS.rst COPYING.txt"
+DOCS=( README.rst AUTHORS.txt NEWS.rst COPYING.txt )
+HTML_DOCS=( doc/documentation/html/ )
 
 src_compile() {
-	distutils_src_compile
+	distutils-r1_src_compile
 
 	if use doc; then
 		einfo "Generation of documentation"
@@ -53,10 +52,7 @@ src_compile() {
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 
 	doman doc/netzob.1
-	if use doc; then
-		dohtml -r doc/documentation/html/* || die "dohtml failed"
-	fi
 }
-- 
cgit v1.2.3-65-gdbad