bump version pcapy & impacket and upgrade distutils eclassHEADmaster

6 files changed, 69 insertions, 55 deletions

diff --git a/dev-python/impacket/Manifest b/dev-python/impacket/Manifest
index 5093cff..726026c 100644
--- a/dev-python/impacket/Manifest
+++ b/dev-python/impacket/Manifest
@@ -1,2 +1,2 @@
-DIST Impacket-0.9.6.0.tar.gz 241509 RMD160 76f381a0d6be7fdfe8d810395bbe60f6d2f2202f SHA1 bc6979205868e66db8ccbc4d8cc4230894aa3346 SHA256 31d51acda423889fe498a3c81256269620780c2af6378509def695e4e69c58df
-EBUILD impacket-0.9.6.0.ebuild 555 RMD160 95fab4c6dfd11fabf6925c968b3529ed31921718 SHA1 2c205aeaa254ac837f92511264c9c7c927e5df1c SHA256 9ab0e51f658ea9bf7b60de4a77d376e529d4eaad8ca1eacdb69d50cea43294eb
+DIST impacket-0.9.15.tar.gz 1088369 SHA256 ff7dbded698f8e7a106ee6411fa4c4e874a50cdd31250df9d9f14bd3fc6df8a3 SHA512 31b1b059d01071319bccfc9a57b23eed175bfba61961ec425553916e7d1940ff6ef53d79ef5e43963e1b4f6037f50489ad22cd6935a53f2cd82bc5b2c6d741ce WHIRLPOOL 15ab296c4c3c18ed0dcd493552b8b44ba527bf35a9e53de36f7eb93f297236c73a9e72258a90b00c47f4edf241ab81e255b928a2fc080b998527c71ca5b7b398
+EBUILD impacket-0.9.15.ebuild 1104 SHA256 9a9e6ddf0789084d58431e965202c8b914b23e53108da93805f28c689a4aa13c SHA512 27eb6a4cde8a6a627d24ee39c3c2a16d81c1ec07ee683096f70b2b783397be98f7aca2832b190bc6651254f8074960e4fac9dad38f475d6721e9a9fc556a6c9f WHIRLPOOL f9c6a8a0b8ba4cd02ea24ecb4f6372e27ecc047fc7eca3a33df78c7df5fd92ba00f472b318dae890925afdeaec8bb05e6cd7c7a2d7cba28d160491b720b15e14
diff --git a/dev-python/impacket/impacket-0.9.15.ebuild b/dev-python/impacket/impacket-0.9.15.ebuild
new file mode 100644
index 0000000..3454812
--- /dev/null
+++ b/dev-python/impacket/impacket-0.9.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python classes focused on providing access to network packets"
+HOMEPAGE="https://github.com/CoreSecurity/impacket"
+SRC_URI=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
+	inherit versionator
+	S="${WORKDIR}"/${PN}-${PN}_$(replace_all_version_separators _)
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	pushd impacket/testcases/dot11
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+	pushd impacket/testcases/ImpactPacket
+	for test in $(ls *.py); do
+		${PYTHON} ${test} || die "Tests fail with ${EPYTHON}"
+	done
+	popd
+}
diff --git a/dev-python/impacket/impacket-0.9.6.0.ebuild b/dev-python/impacket/impacket-0.9.6.0.ebuild
deleted file mode 100644
index 1539b2b..0000000
--- a/dev-python/impacket/impacket-0.9.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Python Impacket extension"
-HOMEPAGE="http://oss.coresecurity.com/projects/impacket.html"
-MY_PN="Impacket"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	http://oss.coresecurity.com/repo/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index e7bfde0..459b37a 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,4 +1,2 @@
-DIST pcapy-0.10.5.tar.gz 18884 SHA256 80a763d91814836e0cd1e57b63519dc60213b42ba3c486d4794cabae30fd7a57 SHA512 295e2720cef35e203f774dea00c5de251c4ae3d1bffea0bf5c200dd2913fc3284f59e56df4c9539a6f8801362fa132cf0c0356ad25d147969d16bf5b663ee5ca WHIRLPOOL 42803d484ad4fe0f2e10d709b8179d41d1b2d603c54af85dcbcc2c9751163686e74445a076a2ddf357c04e8750a3c35012af72985ee6963636f9093154236fd0
-DIST pcapy-0.10.8.tar.gz 26134 SHA256 b0a3b97e84489f4f0cac82a8cdb2ccdbbd5279dc0b55d3ef4866f7df3e7d4bd3 SHA512 94d5ef53d069df938205770223a03d4ae753e7c53a1905687b8cb3b308d58c01cf22b340ff6b9f77225b0c733ad5f2d9d0b57a766163832efbaf216b0125554b WHIRLPOOL 0894947503b3bb31837c769e1e885168d1f4f15d889dbe9b98e4b9fdc4f9db3b0eb2b1912bf2384cb2a8b7f0309a1dc74f6c555c76525bbb02a36ac407b11b4e
-EBUILD pcapy-0.10.5.ebuild 513 SHA256 ed2e6ad41227a09f49223979f72321b01e804385daeb7e1d44e31f839a53d872 SHA512 05d448d07d51a3be9ddda58a0ccdb212512d15f3a354f3fad59534c1a45c1d69d65ac2933022070799bafbf8346cfb33f0e1a010fd78ea3080c55faf86511887 WHIRLPOOL cd19e1b5c7e001387c3248131f8abd48740d008532bcb37aea740323d36a0f04eeea243a0308a7d1a4b93b4476ca89f99cdee6a5ebfc9f35efd4e469974931da
-EBUILD pcapy-0.10.8.ebuild 513 SHA256 ed2e6ad41227a09f49223979f72321b01e804385daeb7e1d44e31f839a53d872 SHA512 05d448d07d51a3be9ddda58a0ccdb212512d15f3a354f3fad59534c1a45c1d69d65ac2933022070799bafbf8346cfb33f0e1a010fd78ea3080c55faf86511887 WHIRLPOOL cd19e1b5c7e001387c3248131f8abd48740d008532bcb37aea740323d36a0f04eeea243a0308a7d1a4b93b4476ca89f99cdee6a5ebfc9f35efd4e469974931da
+DIST pcapy-0.10.10.tgz 93492 SHA256 06f0261b8f34e9ac617ab8923a10e3327009fb0ed6b8b4f08eda6acb829d8be6 SHA512 5ac6b56467ff0d6fc2bb940d862de0875ad6012e1fa8cb75f9158befb020917f2ed4743144c57a54a127b11e25a2961cb73c52f17e50bc81db745f6731485ab3 WHIRLPOOL 74253159d40a69313cb2202c91ec49a82206e74f044af637d167e812cb6c53acffbd27983fdf2615882b7f4eb25f9749c1455510853f33716de4661b62ceb5f2
+EBUILD pcapy-0.10.10.ebuild 465 SHA256 e8ced24482457e2c5f8f155c22f9629b03364f89290fe67d1d26e351b7e217af SHA512 d0a8275bb7395db523652bf592adcc75b404cd8b4c48946dd4afcdfbf806e56ee0bf3793ae305ae2926c5f08c67486649a1368df78d12599319c375e5ae5df93 WHIRLPOOL 5090201b33fe9f85e8bb3ac10a691d4cb9b7e907a494624b4a4fed086026c354ce0bc578bf5804167b4cf9df4846ceb63e1118ba93af7e1114e262b6c70fd7f6
diff --git a/dev-python/pcapy/pcapy-0.10.10.ebuild b/dev-python/pcapy/pcapy-0.10.10.ebuild
new file mode 100644
index 0000000..a98577c
--- /dev/null
+++ b/dev-python/pcapy/pcapy-0.10.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Python pcap extension"
+HOMEPAGE="https://github.com/CoreSecurity/pcapy"
+SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	net-libs/libpcap"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-python/pcapy/pcapy-0.10.8.ebuild b/dev-python/pcapy/pcapy-0.10.8.ebuild
deleted file mode 100644
index c2f2bef..0000000
--- a/dev-python/pcapy/pcapy-0.10.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-RDEPEND="${DEPEND}
-	 net-libs/libpcap"
-
-inherit distutils
-
-DESCRIPTION="Python pcap extension"
-HOMEPAGE="http://oss.coresecurity.com/projects/pcapy.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	http://oss.coresecurity.com/repo/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""