migrate -> distutils-r1, remove old

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 18 insertions, 61 deletions

diff --git a/dev-python/netaddr/ChangeLog b/dev-python/netaddr/ChangeLog
index 8aac1f3aaa46..66617e7b6b8a 100644
--- a/dev-python/netaddr/ChangeLog
+++ b/dev-python/netaddr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/netaddr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/ChangeLog,v 1.13 2012/11/22 10:04:47 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/ChangeLog,v 1.14 2013/07/27 08:12:14 idella4 Exp $
+
+*netaddr-0.7.10-r1 (27 Jul 2013)
+
+  27 Jul 2013; Ian Delaney <idella4@gentoo.org> +netaddr-0.7.10-r1.ebuild,
+  -netaddr-0.7.6-r1.ebuild, -netaddr-0.7.7.ebuild:
+  migrate -> distutils-r1, remove old
 
   22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> netaddr-0.7.10.ebuild:
   Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index f39b75f61ad1..2865ef4814dc 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,8 +1,5 @@
 DIST netaddr-0.7.10.tar.gz 1313043 SHA256 9b79763141a855079b0589717696a4ccb5c56c0b807b6e584bfe12333399e0b7 SHA512 28d51e81151c96df37adf3466de451fc7375624eee6cd4b5d5587c25fd82d23b2dbba0fac38938ca760b28e220fbf147d2e5fa326869b2500de036bf02b042ab WHIRLPOOL 5a57518a57ca4ea803ba3bb6537e58cc256b2972c76f78d196dd042a98aeedb47c171857a4633e3696f8697123384ecd2c83323abfd5b86249098721d726c359
-DIST netaddr-0.7.6.tar.gz 1211697 SHA256 d8abb9e2fdf17e8ff3e238a8e175a3f34e8fce3ec1bee899c81eb47b377e4d72 SHA512 da410c612359e20227c14b60a70a45ee5020d3ec2ecfd388423ee0a0a694e5b62b202469fced536a5a1c7a6d335bc9eeb27eb3da067818aa9db33a0da538775a WHIRLPOOL e2e03892349835085c88eb23c73bea33f8c9af049e8ca1313727b37e582ff7688aead5c35d33a821a8bb2ebac32ff6b754ba480431fdf2c76cbedafc4633d670
-DIST netaddr-0.7.7.tar.gz 1303385 SHA256 64bb6ad22b4d715ae94d67bc0c9f5ddd1ce2cd071c29bcaa77fd5f9d3ceb81c7 SHA512 17a5ddc4c4631a3d66268d4f8463cde7d60ee56c3b960cf733c30e80b3705f938890445e2c50db112eb8e226c0254b985fd0f597f3b728c772712f3a1d8bad8e WHIRLPOOL e33831fd48c68362549c681bfdd5458bd0102abece1426ba731d3cda198854889655b51153d0f3b7a98998182c7280c3a01d11ab19adda4276a445f9fd7bfb3c
+EBUILD netaddr-0.7.10-r1.ebuild 834 SHA256 fa379bf3bf39f19f1374184532e5e0eae90e75fc5c49c06dc4b219c323d76bf3 SHA512 b4872cc6ffb26c7760a3375733bb78ffe5e3cdb412de185e0bb95d4e0261ad74b8abab1a455367e49263aba7c5368454d2189ec10097cec8af322e9170ef55c4 WHIRLPOOL 384730c5dfe2ab1275b7c5ba2d16ca30de7db4063fcb04a3f7db68e292864d5961b562ee9a57278c8af8ebaf7cbf9091cd17ec10c1981411162e2c99bc9e289a
 EBUILD netaddr-0.7.10.ebuild 915 SHA256 6a792aa0e417ec27105e2f8fbb5e76279328530e9bcaf32b899e3f7f5fb2179b SHA512 ff7c68e7c9271d9ee14af2ccdd357bf8e8eedb611e7d54b311cdb52b19bc1475c4d285bd3850973b5bdd5c8435225c8df7acaa378c80ce534fa7f5a8d629a9aa WHIRLPOOL 8fa9ad68e7c843b17c0174086a353036a8d73eda7b80cefa2615cc43ee07406a338fbc898d206274f4f9ae49cafea16ce74f19680098e283b0a9d860447a05ce
-EBUILD netaddr-0.7.6-r1.ebuild 1133 SHA256 70991d6968b624ef5c00d8a41c0927f1c5fe38b69b998ec57bcb9ca05bf6f010 SHA512 9adf070c0242913ba51faefc35c1292d4327236732404ebf6dda3edaa7fc047a10ef38c04e2cd0347c754b4a3d1c81b95637fe73e9f6649a541e32ea73832b23 WHIRLPOOL e7280bbdff441630d28c48043c29b91fb93c6441e7eb45613c46f43670162228f7079cb69494453b6e5c9c2bddeeaffdd12b358bffff58ab6ef737c4083fa90f
-EBUILD netaddr-0.7.7.ebuild 922 SHA256 e3a7f3f4950e62c4ae438a0a5adfe5747ed0450b25bc0489ffbd68b9efc074c3 SHA512 202c53886ee2b42d2532b89429decb9ee6d59b0a0718deea78aca9e4783c321c6fe96da31a7f69a1c52b283e24c3d7e9076ace7f2bb73a1c36c1d2ccd5f411d7 WHIRLPOOL c8ba7bc6c30a9d5ab6f39e42179c0237c3df087d4cb3cbb98d60433f569e4e18c2cc47f45379976fb3541f044a80d62ae4a6b151165b8bba1dbc80b29778c9ba
-MISC ChangeLog 2170 SHA256 be9861d27c4c4529702920684e6dc8cc7abd15abcb533f76aea93565704a622e SHA512 97a1b9e412fe9506c4002b388ccc40b49f45a64cac83d5400e6d49365e033871be616bba9398b9a4bb8de19ee62fcba242e459e71f09aa441f4a99120ebcab32 WHIRLPOOL 4ef9825bc878cf36ec8336a81846422f07833737600234f1f57e42e070c12b459f5237b6c1324d0f1cd0d78f6bb829729699828beacd03f45dfc966f70be2ab2
+MISC ChangeLog 2373 SHA256 9a104db63077adecd1d2afca8c38ccb3a0b874e4c4b1f62c3cd649fb269e70be SHA512 468a18d1a52bd43034479f9757cb9538df2a9f9504f6533b413a98432fc2005b5446bae29196ea7267ae18b192bf93ea304528e89dd3b0137420c0baf61003a6 WHIRLPOOL 6bff336b8e6b32b3632200f2281aec970f931a7b9f7f585cc43d977dc44c9966aa2bf0994558de50b66394e85944fd0df7a5805970facb7ce1b6e602f4f3989f
 MISC metadata.xml 429 SHA256 ceb42df22c67d4190c494c8f8f2490ff2023ab3a6eeff1a689a23ff9daeec235 SHA512 0bb741c328a0ea5601b9273264c13963c105adc711a85a6eda31bad2bd26fff5eb8a1dd4015527b8b5e4361fcc5a128bfcf3ea63af86babd778dbbe62f4492a9 WHIRLPOOL 9b97420079bebb2edbf77e97dcf961df5b65351e4c2e36af794afec1b0e5fe15b8a39cc4f29e3535bdbd66add0a8d533f478616738b123c0a1bec384a0e6b3ed
diff --git a/dev-python/netaddr/netaddr-0.7.7.ebuild b/dev-python/netaddr/netaddr-0.7.10-r1.ebuild
index a986a0e6681f..a1224b1149fe 100644
--- a/dev-python/netaddr/netaddr-0.7.7.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.10-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.7.ebuild,v 1.2 2012/06/23 22:50:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netaddr/netaddr-0.7.10-r1.ebuild,v 1.1 2013/07/27 08:12:14 idella4 Exp $
 
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
 HOMEPAGE="https://github.com/drkjam/netaddr http://pypi.python.org/pypi/netaddr"
@@ -18,13 +17,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cli"
 
 DEPEND=""
-RDEPEND="cli? ( dev-python/ipython )"
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
 
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" netaddr/tests/__init__.py
-	}
-	python_execute_function testing
+python_test() {
+	"${PYTHON}" netaddr/tests/__init__.py
 }
 
 pkg_postinst() {
diff --git a/dev-python/netaddr/netaddr-0.7.6-r1.ebuild b/dev-python/netaddr/netaddr-0.7.6-r1.ebuild
deleted file mode 100644
index d7c7cdf2ca71..000000000000
--- a/dev-python/netaddr/netaddr-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,42 +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/netaddr/netaddr-0.7.6-r1.ebuild,v 1.4 2012/06/17 07:06:45 jdhore Exp $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
-
-inherit distutils
-
-DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr http://pypi.python.org/pypi/netaddr"
-SRC_URI="mirror://github/drkjam/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli"
-
-DEPEND=""
-RDEPEND="cli? ( dev-python/ipython )"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# https://github.com/drkjam/netaddr/issues/20
-	sed -e "s/AddrFormatError/netaddr.core.AddrFormatError/" -i netaddr/tests/3.x/ip/{platform_linux2.txt,platform_win32.txt}
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" netaddr/tests/__init__.py
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	if ! use cli; then
-		ewarn "If you intend to use netaddr shell in terminal, enable cli USE flag"
-	fi
-}