[gentoo-commits] repo/gentoo:master commit in: dev-python/dnspython/

[Justin Lecher]

commit:     455634fa7080a3aa5437871558552d722efbfe70
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 10:05:55 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 12:03:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455634fa

dev-python/dnspython: Conver to py ABI slotted ebuilds

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=484954

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/dnspython/dnspython-1.11.1.ebuild       |  5 +-
 dev-python/dnspython/dnspython-1.12.0-r1.ebuild    | 73 ----------------------
 ...-1.12.0.ebuild => dnspython-1.12.0-r200.ebuild} | 17 ++---
 ...-1.12.0.ebuild => dnspython-1.12.0-r300.ebuild} | 26 +++++---
 4 files changed, 31 insertions(+), 90 deletions(-)

diff --git a/dev-python/dnspython/dnspython-1.11.1.ebuild b/dev-python/dnspython/dnspython-1.11.1.ebuild
index ea07615..3969929 100644
--- a/dev-python/dnspython/dnspython-1.11.1.ebuild
+++ b/dev-python/dnspython/dnspython-1.11.1.ebuild
@@ -17,7 +17,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd
 IUSE="examples test"
 
 DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3
+"
 
 DOCS=( ChangeLog README )
 

diff --git a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild b/dev-python/dnspython/dnspython-1.12.0-r1.ebuild
deleted file mode 100644
index 450cb03..0000000
--- a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 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 multilib
-
-PN3="${PN}3"
-P3="${PN3}-${PV}"
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
-SRC_URI="
-	http://www.dnspython.org/kits/${PV}/${P}.tar.gz
-	http://www.dnspython.org/kits3/${PV}/${P3}.zip"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-S2="${S}"
-S3="${WORKDIR}/${P3}"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-s_locator() {
-	if python_is_python3; then
-		einfo "Setting \${S} to ${S3}"
-		S="${S3}" $@
-	else
-		einfo "Setting \${S} to ${S2}"
-		S="${S2}" $@
-	fi
-}
-
-python_prepare() {
-	s_locator distutils-r1_python_prepare
-}
-
-python_compile() {
-	s_locator distutils-r1_python_compile
-}
-
-python_install(){
-	s_locator distutils-r1_python_install
-}
-
-my_test() {
-	pushd tests &> /dev/null
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_test() {
-	s_locator my_test
-}
-
-python_install() {
-	s_locator distutils-r1_python_install
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/dnspython/dnspython-1.12.0.ebuild b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
similarity index 77%
copy from dev-python/dnspython/dnspython-1.12.0.ebuild
copy to dev-python/dnspython/dnspython-1.12.0-r200.ebuild
index 9edf38a..6bb0c4b 100644
--- a/dev-python/dnspython/dnspython-1.12.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -12,21 +13,23 @@ HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
 SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
-SLOT="0"
+SLOT="py2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	!dev-python/dnspython:0
+	app-arch/unzip"
 
-# For tests
+# For testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
-	pushd "${BUILD_DIR}"/../tests &> /dev/null
+	cd tests || die
 	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
 	einfo "Testsuite passed under ${EPYTHON}"
-	popd &> /dev/null
 }
 
 python_install_all() {

diff --git a/dev-python/dnspython/dnspython-1.12.0.ebuild b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
similarity index 63%
rename from dev-python/dnspython/dnspython-1.12.0.ebuild
rename to dev-python/dnspython/dnspython-1.12.0-r300.ebuild
index 9edf38a..a32c94a 100644
--- a/dev-python/dnspython/dnspython-1.12.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+
+PYTHON_COMPAT=( python3_{3,4} )
 
 inherit distutils-r1
 
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="DNS toolkit for Python"
 HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
-SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
+SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip"
 
 LICENSE="ISC"
-SLOT="0"
+SLOT="py3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	!dev-python/dnspython:0
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
 
-# For tests
+# For testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
-	pushd "${BUILD_DIR}"/../tests &> /dev/null
+	cd tests || die
 	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
 	einfo "Testsuite passed under ${EPYTHON}"
-	popd &> /dev/null
 }
 
 python_install_all() {