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

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 57 insertions, 47 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/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
-}