New Netzob ebuild git@master-based.

Update dependencies for both versioned and unversioned ebuilds.

6 files changed, 90 insertions, 11 deletions

diff --git a/dev-python/netzob/Manifest b/dev-python/netzob/Manifest
index 3f25386..475d008 100644
--- a/dev-python/netzob/Manifest
+++ b/dev-python/netzob/Manifest
@@ -1,2 +1,3 @@
 DIST netzob-0.3.1.tar.gz 405615 RMD160 9db1ff1c944253a4c0bc6e14ec48e010d2c7a914 SHA1 e3933b06a6e0634d4af93d884cff67903e6cf43b SHA256 fb8543b17b4117909e9e497a7530051430673119ddef1d963384c04f6334ab0a
-EBUILD netzob-0.3.1.ebuild 906 RMD160 affd99783f74ec8f44da760927d897908d1600e1 SHA1 5bb6ef8c1167461554bfa0cdcab069acd19c8156 SHA256 e668ada7a11427b6f1fbb69027464ddc9af109fc425dd9772e6ee70121d969ab
+EBUILD netzob-0.3.1.ebuild 1190 RMD160 5dcea543dd53387dc508109dea77086c0676a5ad SHA1 9f4dfc49904a2f743741bdc9837a7e9f6ed6f290 SHA256 61887fc7a5810ac0879d6d80b52bbb6193f333dee8483e061910bdd18e5dc0a5
+EBUILD netzob-9999.ebuild 1154 RMD160 f4bdaba48cd59f27f3810a4c304544cacb13cf47 SHA1 90b218ea8a814cf5a4a35a511a19ed0f14c7c1ef SHA256 0c4d267f78c2fa8e3df6e38388ec5e1da1e4ad6b74145e44d5571133a2df7f1f
diff --git a/dev-python/netzob/netzob-0.3.1.ebuild b/dev-python/netzob/netzob-0.3.1.ebuild
index fcda0c7..2d68f48 100644
--- a/dev-python/netzob/netzob-0.3.1.ebuild
+++ b/dev-python/netzob/netzob-0.3.1.ebuild
@@ -16,16 +16,18 @@ SLOT="0"
 KEYWORD="~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-python/python-ptrace-0.4.1
-	app-misc/hachoir-subfile
+RDEPEND="
+	dev-python/pcapy
+	dev-python/impacket
+	dev-python/pygtk
+	>=dev-python/python-ptrace-0.4.1
 	dev-python/matplotlib
 	dev-util/strace
 	sys-process/lsof
 	>=dev-python/lxml-2.3
 	dev-python/bitarray
-	dev-python/impacket
-	net-libs/nfqueue-bindings[python]"
-# python-pcapy
+	net-libs/nfqueue-bindings[python]
+"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
@@ -34,13 +36,26 @@ RESTRICT_PYTHON_ABIS="3.*"
 S="${WORKDIR}/${MY_P}"
 DOCS="README.txt AUTHORS.txt NEWS.txt COPYING.txt"
 
+src_prepare() {
+	distutils_src_prepare
+	sed -i "s;resources/static;/usr/share/netzob;" src/netzob/NetzobResources.py || die
+}
+
 src_compile() {
 	distutils_src_compile
 
 	if use doc; then
 		einfo "Generation of documentation"
-		pushd docs >/dev/null
-		#emake html || die "Generation of documentation failed"
+		pushd doc/documentation >/dev/null
+		sphinx-build -b html source html || die "Generation of documentation failed"
 		popd >/dev/null
 	fi
 }
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r doc/documentation/html/* || die "dohtml failed"
+	fi
+}
diff --git a/dev-python/netzob/netzob-9999.ebuild b/dev-python/netzob/netzob-9999.ebuild
new file mode 100644
index 0000000..991d848
--- /dev/null
+++ b/dev-python/netzob/netzob-9999.ebuild
@@ -0,0 +1,60 @@
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils git-2
+
+MY_P="Netzob-${PV}"
+
+DESCRIPTION="Network protocol modelization by reverse engineering"
+HOMEPAGE="http://www.netzob.org/"
+EGIT_REPO_URI="https://dev.netzob.org/git/netzob.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORD="~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pcapy
+	dev-python/impacket
+	dev-python/pygtk
+	>=dev-python/python-ptrace-0.4.1
+	dev-python/matplotlib
+	dev-util/strace
+	sys-process/lsof
+	>=dev-python/lxml-2.3
+	dev-python/bitarray
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="README.txt AUTHORS.txt NEWS.txt COPYING.txt"
+
+src_prepare() {
+	distutils_src_prepare
+	sed -i "s;resources/static;/usr/share/netzob;" src/netzob/NetzobResources.py || die
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd doc/documentation >/dev/null
+		sphinx-build -b html source html || die "Generation of documentation failed"
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r doc/documentation/html/* || die "dohtml failed"
+	fi
+}
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index e088feb..d923020 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,2 +1,2 @@
 DIST pcapy-0.10.5.tar.gz 18884 RMD160 fef424f4b912ba73e95e192355a0ad2e527492ff SHA1 e7e803b423f2c2e3401ee616cddfd6ab237fc8d8 SHA256 80a763d91814836e0cd1e57b63519dc60213b42ba3c486d4794cabae30fd7a57
-EBUILD pcapy-0.10.5.ebuild 352 RMD160 7bf837dd66fbf78271552fdf5977d07c1f64cb99 SHA1 641e0bf1a17a0a67d89d6aab0d5a85ee5da089b3 SHA256 23cb5a388005e605f2ec08dab881aa46d4f0826e0b6e42b8924fa6f4bdd5d4d8
+EBUILD pcapy-0.10.5.ebuild 392 RMD160 15e7baaf8c1f1535be9a1fdec692aea48460a482 SHA1 a7d6baeb70fcec4556d530d08b8b73d1fbfe34db SHA256 d7b2540c1d4adc190cdf98afb6b726f001bf3341e4abc2eb300a3870b3c28f5d
diff --git a/dev-python/pcapy/pcapy-0.10.5.ebuild b/dev-python/pcapy/pcapy-0.10.5.ebuild
index f8ab09f..98c8ce6 100644
--- a/dev-python/pcapy/pcapy-0.10.5.ebuild
+++ b/dev-python/pcapy/pcapy-0.10.5.ebuild
@@ -5,6 +5,9 @@ PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
+RDEPEND="${DEPEND}
+	 net-libs/libpcap"
+
 inherit distutils
 
 DESCRIPTION="Python pcap extension"
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.3.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.3.ebuild
index 96f6176..2d77375 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.3.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.3.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils perl-module linux-info
 DESCRIPTION="nfqueue-bindings is a set of high-level modules for several
 languages (Python and Perl, for the moment), for libnetfilter_queue"
 HOMEPAGE="http://software.inl.fr/trac/wiki/nfqueue-bindings"
-SRC_URI="http://software.inl.fr/releases/nfqueue-bindings/${P}.tar.gz"
+SRC_URI="https://www.wzdftpd.net/redmine/attachments/download/59/${P}.tar.gz"
 
 KEYWORDS="~x86 ~amd64"
 SLOT="0"
@@ -16,7 +16,7 @@ LICENSE="GPL-3"
 IUSE="perl python examples"
 
 DEPEND="python? (
-		virtual/python
+		dev-lang/python
 		dev-python/dpkt
 	)
 	perl? ( dev-lang/perl )