Revision bump: EAPI 5, port to distutils-r1 eclass, fix bug #473632. Drop old revision

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 74 insertions, 50 deletions

diff --git a/net-analyzer/namebench/ChangeLog b/net-analyzer/namebench/ChangeLog
index 9f42731850ef..089faedb32c6 100644
--- a/net-analyzer/namebench/ChangeLog
+++ b/net-analyzer/namebench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/namebench
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/ChangeLog,v 1.7 2012/10/08 12:36:43 pinkbyte Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/ChangeLog,v 1.8 2013/08/03 08:25:33 pinkbyte Exp $
+
+*namebench-1.3.1-r1 (03 Aug 2013)
+
+  03 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> -namebench-1.3.1.ebuild,
+  +namebench-1.3.1-r1.ebuild:
+  Revision bump: EAPI 5, port to distutils-r1 eclass, fix bug #473632. Drop old
+  revision
 
   08 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
   Assigning package to netmon herd
diff --git a/net-analyzer/namebench/Manifest b/net-analyzer/namebench/Manifest
index bafc5346d81a..0fb15445fc2d 100644
--- a/net-analyzer/namebench/Manifest
+++ b/net-analyzer/namebench/Manifest
@@ -1,4 +1,18 @@
-DIST namebench-1.3.1-source.tgz 1118505 SHA256 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425
-EBUILD namebench-1.3.1.ebuild 988 SHA256 3ce8a330f047c75f2a9a8c12eccdb2ca5cd5d848a24151b54c6d11809731b3b9 SHA512 656dc5efd6571afac89cc974eb0ff3ba7b1c0158d94d2ea598a1b887b4f10ed56863671851152be17a40c91338f5928ab876513523155dadd53eff1d4fb01e44 WHIRLPOOL 33ac0dd1c5f50181dfcd1db6b6975eef55485971c587b7829c7581cbc439eb9aabb8868164991777542fa059f8cd786ece4e2c4b42cc4b5ea13b42d1f7e8c7a5
-MISC ChangeLog 1175 SHA256 028e241f11b6c801be699f4e91c101ef2168b7e0a5b46f7a6a188d04b1311ba9 SHA512 09f53c811e5f803973a9f8efd8c6fc1f8cbbed144fa4fe3f8ddea0e439e28cdec68834ed8b4c3a569c6cdf19ebb3d14829ef16a9dc6845453f7acf849cfbae26 WHIRLPOOL a722a3916983eefcc0dec29a671c720705510c6295197ac29d19420d69ebcd2e34340eb36222b2ec7644f7651eb1fb512447c00e91acd1b0e15946afc0da069d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST namebench-1.3.1-source.tgz 1118505 SHA256 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425 SHA512 df9d120bf9f0bcbb5e3d41d2257b2c594e99b7e69b33435b59587e99dac6dca29e4ae81f51838946bc1955540109da6296abc6b69d411af2b91e05b58367bb3b WHIRLPOOL 808977fd3e9e2f906350d104be91f0aa80b5df29953a92e00953013b33ce8473fcbc955ceb3d1dc1b71d6491816d6a7e04a0244a12fbd039fd304c7b874cf462
+EBUILD namebench-1.3.1-r1.ebuild 1300 SHA256 7cfe44d858f24a0b77f7e37a978adf98fa8e594bd657f802544d56a37c532fa7 SHA512 cc116759a8d524325838be7b058e2f31438dccce40d8f22ba2b515c94e0113e315557c929d6ff5032260e01372f68b3976bb35346617d0deebda4d17afdcdd3f WHIRLPOOL f12941d0f0b85373db7d32c0e2187b1bf5458b82526b6991cd001324f82421402513210d084735266ca578ef64f7f5e632ce9d6e545e0d743a0f326fcdc75710
+MISC ChangeLog 1407 SHA256 3ea30f9d19597384eb31c681d9a18a6207ca85ef7203dff4274da7b3ee9c1f47 SHA512 d9ab2268b9f6d2b89d204b83bcfbb25e97dd02b77b8c866484ed812ee7955a53e97ea1ab210ca4e136001e0fe9fa9bdc36d8d51c344e9049042f6b238a9dab9a WHIRLPOOL 487dae7fcd45fe9ee236ea00aa76c180620d33307ffa7671fb5a5fa4b602c39497da11a139d071b43ba81721ca1480a5dd7bd6c3323006b91db8bba99b9661e6
 MISC metadata.xml 239 SHA256 3b19d9dbb502fcb22efce4fc6d3250b2c35e2ec707480ff12793774c85a02edd SHA512 3d0594c39dc82a2f45185f4e7b79becf51b1ede05b338e1b09cf073375b79281f4bb326653e0c798a788e027164b0b0202b18e4109c18eb6eccdd68f0c0e444b WHIRLPOOL bf6af6a64a708c6b8e1010fbf454905ea98e5dbee08e58de94a0fe5bb7e287d67ea113079255c528518b5bf631a4a26e911733ed0048d8d9c17579a588dd76f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR/L5+AAoJECo/aRed9267hRAH/RIisFSJOyAc9OGzP5y4WlTk
+FXP3UcsaFcgnIIEHDyDRRm08jmz4ttvIgPkq2IOFvivxx9ldbp5S2eGaz7t36pzi
+0ainHB7EIfxtgMhQrsvNqZVs1hfuprOefceVLPMnRtX8aURRkqttycgyscFCZhVZ
+O9zPrtUTAKo1Z973eUW0+n8pLWAeGilRMaYTFz1fofaz+TQCePQop5M6hVGxmTHQ
+kDYH4Q5iq/MZKUNllphVx1/8idwb6y3rI9JOn3R+T9/G/m8QKIW/i3TYSVX081qI
+HD/ExTBksy1dKLPRiS/qVPB5aR3XQ5BaV0K4HTq5J0KGdGPiPKi5uOR5N27K1Wg=
+=zwcp
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..4072e6cdd33c
--- /dev/null
+++ b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1-r1.ebuild,v 1.1 2013/08/03 08:25:33 pinkbyte Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS Benchmark Utility"
+HOMEPAGE="http://code.google.com/p/namebench/"
+SRC_URI="http://namebench.googlecode.com/files/${P}-source.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# PYTHON_REQ_USE does not support X? ( tk ) syntax yet
+DEPEND="X? (
+		python_targets_python2_5? ( dev-lang/python:2.5[tk] )
+		python_targets_python2_6? ( dev-lang/python:2.6[tk] )
+		python_targets_python2_7? ( dev-lang/python:2.7[tk] )
+	)"
+RDEPEND="${DEPEND}
+	>=dev-python/dnspython-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
+	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# don't include bundled libraries
+	export NO_THIRD_PARTY=1
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	#set prefix
+	distutils-r1_python_install --install-data=/usr/share
+}
+
+python_install_all() {
+	dosym ${PN}.py /usr/bin/${PN}
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/namebench/namebench-1.3.1.ebuild b/net-analyzer/namebench/namebench-1.3.1.ebuild
deleted file mode 100644
index 738e94a8bef5..000000000000
--- a/net-analyzer/namebench/namebench-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1.ebuild,v 1.2 2012/02/10 03:16:07 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH_OPT="X"
-PYTHON_USE_WITH="tk"
-
-inherit distutils
-
-DESCRIPTION="DNS Benchmark Utility"
-HOMEPAGE="http://code.google.com/p/namebench/"
-SRC_URI="http://namebench.googlecode.com/files/${P}-source.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/dnspython-1.8.0
-	>=dev-python/httplib2-0.6
-	>=dev-python/graphy-1.0
-	>=dev-python/jinja-2.2.1
-	>=dev-python/simplejson-2.1.2"
-
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	# don't include bundled libraries
-	export NO_THIRD_PARTY=1
-}
-
-src_install() {
-	distutils_src_install --install-data=/usr/share
-
-	dosym ${PN}.py /usr/bin/${PN} || die
-}