Remove dev-python/py3dns; duplicate of dev-python/pydns:3.

7 files changed, 6 insertions, 139 deletions

diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
index bd7318861492..e7b7e1355d9d 100644
--- a/dev-python/astng/Manifest
+++ b/dev-python/astng/Manifest
@@ -9,6 +9,4 @@ EBUILD astng-0.21.1.ebuild 2297 RMD160 a2be0db6e88621d6bdde5227505878884cd46d70
 EBUILD astng-0.22.0.ebuild 1933 RMD160 462598f8b89d5a6d612fac3aba1aede9d08f2909 SHA1 b76600af6a9e51d8f906afd11d83577973d20c7e SHA256 c03e0f262188d17c99871364c4c12c9aef5ce011e86b9c2081f8f0e4bc6e82c1
 EBUILD astng-0.23.1.ebuild 2441 RMD160 59834b9b599c925012c48c9c31590453cf645022 SHA1 4b7e3f486526d951d6285d56076bb375f852f1b6 SHA256 1e256a4e8c6574c1252cd6fa9458b93f1f37d160ef0d9a5f1491f8a9935d1192
 MISC ChangeLog 7299 RMD160 f4d58ccab18c2cd6aa0115fdcaa7d95d304b780f SHA1 d5fd1e1c25a060686599228c53f65e64ee531ccd SHA256 03dfcae1868786b69c9ace0d372175b92a805a157510047844c4feb7ccf8f041
-MISC astng-0.23.1.ebuild.orig 1933 RMD160 462598f8b89d5a6d612fac3aba1aede9d08f2909 SHA1 b76600af6a9e51d8f906afd11d83577973d20c7e SHA256 c03e0f262188d17c99871364c4c12c9aef5ce011e86b9c2081f8f0e4bc6e82c1
-MISC astng-0.23.1.ebuild.rej 732 RMD160 a3eb5ce6912f4e8088d7c071e233507797914a0e SHA1 fc0e3a967995740beeaf8327732654c2dd0ec888 SHA256 181a57210f0a4bc699673586eb57ee32f1dab34c7ae4fbb32df18086306edd97
 MISC metadata.xml 977 RMD160 b282dc87c0058e7da53c827ff043099a5d356eb8 SHA1 a6713710c31c6fa335bd07f747f5c8443ec2640b SHA256 5eb8114b349efc7a2c741eeea56299cd585b687515fb2ec0d37690fabf63e5a7
diff --git a/dev-python/astng/astng-0.23.1.ebuild b/dev-python/astng/astng-0.23.1.ebuild
index d20bb0f9c44d..b987554935e0 100644
--- a/dev-python/astng/astng-0.23.1.ebuild
+++ b/dev-python/astng/astng-0.23.1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.23.1.ebuild,v 1.1 2012/04/19 06:45:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.23.1.ebuild,v 1.2 2012/04/20 00:45:12 floppym Exp $
 
 EAPI="4"
-PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.* *-jython"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
 
 inherit distutils
 
@@ -23,25 +21,12 @@ IUSE="test"
 RDEPEND=">=dev-python/logilab-common-0.53.0"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	test? ( >=dev-python/egenix-mx-base-3.0.0 )
-	( dev-python/unittest2 )"
+	test? ( >=dev-python/egenix-mx-base-3.0.0 )"
 
 S="${WORKDIR}/logilab-${P}"
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
 PYTHON_MODNAME="logilab/astng"
 
-src_prepare() {
-	distutils_src_prepare
-
-	conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		find -name "*.py" ! -name "setup.py" -print | xargs 2to3-${PYTHON_ABI} -nw --no-diffs
-	}
-	python_execute_function -s conversion
-}
-
 src_test() {
 	testing() {
 		local tpath="${T}/test-${PYTHON_ABI}"
@@ -50,19 +35,14 @@ src_test() {
 		mkdir -p "${spath}/logilab" || return 1
 		cp -r "$(python_get_sitedir)/logilab/common" "${spath}/logilab" || return 1
 
-		"$(PYTHON)" setup.py install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation) $(python_get_version)"
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${tpath}" || die "Installation for tests failed with $(python_get_implementation_and_version)"
 
 		# pytest uses tests placed relatively to the current directory.
 		pushd "${spath}/logilab/astng" > /dev/null || return 1
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			# Support for Python 3 is experimental. Some tests are known to fail.
-			PYTHONPATH="${spath}" pytest -v
-		else
-			PYTHONPATH="${spath}" pytest -v || return 1
-		fi
+		PYTHONPATH="${spath}" pytest -v || return 1
 		popd > /dev/null || return 1
 	}
-	python_execute_function -s testing
+	python_execute_function testing
 }
 
 src_install() {
diff --git a/dev-python/py3dns/ChangeLog b/dev-python/py3dns/ChangeLog
deleted file mode 100644
index 3744ea0e30cc..000000000000
--- a/dev-python/py3dns/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChangeLog for dev-python/py3dns
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py3dns/ChangeLog,v 1.2 2012/04/19 08:42:33 patrick Exp $
-
-*py3dns-3.0.1 (19 Apr 2012)
-
-  19 Apr 2012; Patrick Lauer <patrick@gentoo.org> +py3dns-3.0.1.ebuild:
-  Bump
-
-*py3dns-3.0.0 (10 Jul 2011)
-
-  10 Jul 2011; Stefan Briesenick <sbriesen@gentoo.org> +py3dns-3.0.0.ebuild,
-  +metadata.xml:
-  initial commit
-
diff --git a/dev-python/py3dns/Manifest b/dev-python/py3dns/Manifest
deleted file mode 100644
index 8bb9a7d9f785..000000000000
--- a/dev-python/py3dns/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST py3dns-3.0.0.tar.gz 32354 RMD160 50fd2c9b50980fb8ab69a85314652782c10d2ce9 SHA1 4681eccb8fa0ad34b941650c038ae0d14fff90dd SHA256 434de3a0cc7da6f0e1164a9c2191828b6d49c8864c55c56e63811c060eb7a050
-DIST py3dns-3.0.1.tar.gz 28693 RMD160 45197730463a7b8c89fa4bb2f573d1117b15a0a6 SHA1 09831f052b26cf0688b3eca708ae88b1551c4152 SHA256 4524cdb058795108c3835bfbbfea7595cd2d8a37ee477ea9f552360f24ed63b7
-EBUILD py3dns-3.0.0.ebuild 920 RMD160 4098c89332d787a3151eb2fae109b4ced1cbf3ac SHA1 2c044f4929564aa88c7ccee241919ddf065c5271 SHA256 8c320995d0d15416b8a5d84cee6647280efa973f1acb71f51ee48cbf547d967d
-EBUILD py3dns-3.0.1.ebuild 919 RMD160 1d5d3c8f315f209336eaf91b8c603e310b834c30 SHA1 f6f0f8f17f202fcdab2c7832ef246c454b7d0d18 SHA256 a01e3aa0d6d409c8567bf51733c2ba4450b3c9df28d635e38d0b62682f239c4f
-MISC ChangeLog 458 RMD160 f1a42bd11b2788daa1f7b96189048fa521507752 SHA1 8591df819a5871a4340021cd2c389ae2c5839a71 SHA256 45785610b0fe216ebd8d2993da08fee76039e3db6c4a07dfeb7b428cc750ee41
-MISC metadata.xml 498 RMD160 3802c2d9c128d592396592db709d7e95027cc372 SHA1 ff4032734ca2a33f7dbb2eebccb58adef7ccdc2b SHA256 1ce9b6965cb0f1ef5aca76f807c84dc7469cf3b22b2a53264a6bf464a7736b0a
diff --git a/dev-python/py3dns/metadata.xml b/dev-python/py3dns/metadata.xml
deleted file mode 100644
index 83c9d6cdf295..000000000000
--- a/dev-python/py3dns/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>sbriesen@gentoo.org</email>
-		<name>Stefan Briesenick</name>
-	</maintainer>
-	<longdescription lang="en">
-		PyDNS provides a module for performing DNS queries from python
-		applications. This was originally based on Guido van Rossum's DNS
-		library code, but has drifted further and further away from it over
-		time.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/py3dns/py3dns-3.0.0.ebuild b/dev-python/py3dns/py3dns-3.0.0.ebuild
deleted file mode 100644
index cad216d5a2a8..000000000000
--- a/dev-python/py3dns/py3dns-3.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py3dns/py3dns-3.0.0.ebuild,v 1.1 2011/07/10 00:54:46 sbriesen Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python3 module for DNS (Domain Name Service)"
-HOMEPAGE="http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns"
-SRC_URI="http://downloads.sourceforge.net/project/pydns/${PN}/${P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="2.*"
-
-DOCS="CREDITS.txt"
-PYTHON_MODNAME="DNS"
-
-src_prepare() {
-	# Don't compile bytecode.
-	sed -i -e 's:^\(compile\).*:\1 = 0:g' -e 's:^\(optimize\).*:\1 = 0:g' setup.cfg
-}
-
-src_install(){
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.py tools/*.py
-	fi
-}
diff --git a/dev-python/py3dns/py3dns-3.0.1.ebuild b/dev-python/py3dns/py3dns-3.0.1.ebuild
deleted file mode 100644
index 7ac5ee0d8a40..000000000000
--- a/dev-python/py3dns/py3dns-3.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py3dns/py3dns-3.0.1.ebuild,v 1.1 2012/04/19 08:42:33 patrick Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python3 module for DNS (Domain Name Service)"
-HOMEPAGE="http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns"
-SRC_URI="http://downloads.sourceforge.net/project/pydns/${PN}/${P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="2.*"
-
-DOCS="CREDITS.txt"
-PYTHON_MODNAME="DNS"
-
-src_prepare() {
-	# Don't compile bytecode.
-	sed -i -e 's:^\(compile\).*:\1 = 0:g' -e 's:^\(optimize\).*:\1 = 0:g' setup.cfg
-}
-
-src_install(){
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.py tools/*.py
-	fi
-}