Rev bump to avoid in places EAPI change, bug #476166

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 60 insertions, 23 deletions

diff --git a/dev-python/libnatpmp/ChangeLog b/dev-python/libnatpmp/ChangeLog
index bcfb150da81e..69df0317759e 100644
--- a/dev-python/libnatpmp/ChangeLog
+++ b/dev-python/libnatpmp/ChangeLog
@@ -1,7 +1,14 @@
 
+
+*libnatpmp-20120821-r1 (09 Jul 2013)
+
+  09 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
+  libnatpmp-20120821.ebuild, +libnatpmp-20120821-r1.ebuild:
+  Rev bump to avoid in places EAPI change, bug #476166
+
   09 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
   libnatpmp-20120821.ebuild:
-  Convert to distutils-r1
+  Convert to distutils-r1, bug #476166
 
 *libnatpmp-20120821 (27 Aug 2012)
 
diff --git a/dev-python/libnatpmp/Manifest b/dev-python/libnatpmp/Manifest
index 67de8269ac72..7b8e80ef6737 100644
--- a/dev-python/libnatpmp/Manifest
+++ b/dev-python/libnatpmp/Manifest
@@ -7,23 +7,24 @@ DIST libnatpmp-20110808.tar.gz 17762 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb
 DIST libnatpmp-20120821.tar.gz 17832 SHA256 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8 SHA512 2f3edaa3db8e7382cc9a622f35965a45ebbe75666d42584521c7fa71cae9b31b8fdc5304bbdf4dd7fc64df3d7bbe03e1606782c9bfb5f008bc7edde040168ef2 WHIRLPOOL 03cf9b8938c5ee5cdf4b0288e7bca993e669a4ae89cee122757639dd5c142e4d57eecc8f946f339206fae96826a67149fbde5ef36dfeea3bbb7a57931245af5a
 EBUILD libnatpmp-20110715.ebuild 801 SHA256 029499d993d0668920dc8ff7a3117a25bdf2fcd4d1b4f336580f6e2c71880079 SHA512 aa91f38fb15e6452e464343e1891fec9b0e994c2d4910728ad5ca70b1558b768f1271e77d8af47fc1aef9ae1402c3a34d88217f8d35a6b4bac1d1f8abdb638fe WHIRLPOOL 39053fea7c98a2aed2ffae554abb9bb18265273f45dddea8484c25c58f7ed0b4fc8f23a13477dbe0f210c9dc88c8ce94629265291611f0d031e13e398943830a
 EBUILD libnatpmp-20110808.ebuild 801 SHA256 4e512d69c6decba000938b972ed40b797a9bc8a152e1728ff966b0025414146a SHA512 39e70cbc949946cd73aca9c2a434b9850be4b90ea942ee7a8c1fc3d7a5330e707281406101279a1eb221ebacb118ae148b50b2855a8486b814aa493aa3cf11c0 WHIRLPOOL 35464a1dd1b356dda027b1020445abc6b4ce69b3cf7b701f00901130e83df1019d54f279e12eef1a4629f9c213a0fed0d354edbcc6efc363edb3a16121928570
-EBUILD libnatpmp-20120821.ebuild 813 SHA256 326d7b1ce69dd1741cb42faf832a731eeaf131680df337eb08ff80eeb35c29db SHA512 ad7688eea5361ade95a67bb99f6b5697039d7da4df757d90f6692de2d90bc47ee36928b2d6aa8d42bcc1db792022bcf0c070c97bb6ebd77bd56493b11241d5bf WHIRLPOOL 55a8d076a300fd1fbb93a26406a3da16dede4516fbcb18733cbaa35b132d25aa822aec4b66d1e256754f9c3ef2fb91ffd858ed958d985cdfed8f368dd3011eac
-MISC ChangeLog 576 SHA256 f121607debbc45721c8a355075efae5e71af92d54724bcf78a0fb52adde11279 SHA512 9946ef0fd45f6592c36049bc727cbb3c56ef1e53820347c789bdbff6a8bc0564306410db09180acf32c10f97809bc2e46ae07017f49e978f873cc435edc29bc5 WHIRLPOOL 5d95e3acb5b8a20d9b88b977278f517b31152796854e1ceafdfc8ed4165fdab5565501efa9d5113dfc78548d249c5bcedb16fdfed890ec501f3313226e12635b
+EBUILD libnatpmp-20120821-r1.ebuild 816 SHA256 7629f144e6eff5f4cebfe50fe662804b128f45a5495964c562aaf5004c0ea27b SHA512 fdfef393bed7cd72a9edcb0682e5bbb3e2008b0555d153ea8e1a1a97dc6570c7b52c0d082c5e1fab0ebbf0bad5cb7245614d82d45e2ff3b34503247f92ecf0ee WHIRLPOOL 51c3b362728b2c13ee8bb037ad8c770176d0ea1301785d1b08c8ed09393d243d451aca3b90a7c1ff4540e68cf0ccd76803db7eda6b3d9db384059c876ffb55c3
+EBUILD libnatpmp-20120821.ebuild 798 SHA256 074d0750424767601454ef53310cbdb4cb713da2391e5a18dcef5f9ae38c4690 SHA512 92c501dfbdcc91ecec1c297122591d56e81e13c0984c6aa61647808404221694c0873f0311ef960bf82039be2acecdc489a5f2b233cbad7fd2028e7aeeead326 WHIRLPOOL 7eae6501036137c268e44326358c2e905707952a4365bd86ea7641fc44763ca7029ee2683bfc13cd02bf471b6f53d09b9d257d552ce12247728c39a85e4d737d
+MISC ChangeLog 799 SHA256 409a1f0a374c2a6fe90aa4526067f55ce782c8f3f44b8335c2fabce1cd62750d SHA512 99f990d37ed1a38049480bbc00ab5cb0f1832bc14c77988e976615ffeaf5af0eff9072d46aceaba77b3ebe92df0b57457ef2c0ba8c5940bf2669ed27abff0e30 WHIRLPOOL be22df480a23ef35e0a7cff7032fd483d145d07004dd21a83fe651ab15a6aa8ced75c79ec638cf435610ecf719a4bd24041ab95cd8e191a5b5f39f1f41b96e66
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR21YUAAoJEJOE+m71LUu6FaAP/2nh/156L6YvAPHRgRT4XMfv
-CS+uly8yUBOWwp8yalxVRAgbvBnnYO3EmnzgncLFPRdVIjvNOm4nahqxezmXCQUO
-2+roDX/i08VluJbVeHpIRuRgUK6ekMj1DqgN9TuWuGEvDhohb/YWCOi1+UvG3weN
-uI6of/1lFxFXrN+uVEJBFaYcSoE0dkk6Dt1crPbKOxF/b20jofPwGcxY9Zy6o01S
-eAlyTXaEmkhGK53pt4HSXk+PrZdOTdAVOyCxdGIJpCgYLPQWlaZ4YOjAVvhFOEVq
-lqhtTj1j+5Hz93EzA6cS4E9mzofCuyeCLaSn7u+XX2ZCzA9qotxAKku2w9GroGV3
-cxF17OoKA+wj5aAJ9xhiSr7aXIuv1II2pZ+Cz5SSQDjfDVw+n/mYIsVVX+GH6bWF
-+2n2u3A2SLPtaM2/ivAMOJBquu/L7PGDPhWHLx88vUhVYyrMVYxwUNj32/TdBHSj
-ll1os7QgPgUeVkqQSTmcjn5qnMbhJaT2GVSL5bJyVqTwpRHyjVh5ciHQtvrXvGG7
-8Po1HATedirS2ec2GWCXWLiIFhcwLqW6ubu5otwpaj485r2XZE4Cogr/pkjF963D
-fNdVJ8/r7+f7i+ylK1cZMzCUuqcpC9NJpgY6oFfM/wvSCMbHhAwNR6t4BLhog6Wd
-ABCJLNmYxvxFA4FyT87F
-=KIyx
+iQIcBAEBCAAGBQJR22H8AAoJEJOE+m71LUu6Wg4P/2tJ1NG3Q84LnTmvyjyndtJ0
+0OxrDii/t2ugnzNQ4hT5vNDmWdxtcVppYf6RVgkBwrXn59g28RG34XCUTrCHLij1
+8kKIrbKcQP/FVoLCRJgnzOssS4nJubDyzqgOxLdWyKksGi33xG3Hyqu+/u2XfNed
+/uNawfUICFvN3Ioy4T0/rNeMbwpFnVfCH0KPAM/GA/HIGcZ0L2y+isavWKv2+0O4
+8OP3mRMy/AcaQcB4e/X8hwAgVHOaNKLrNg7GE1P4XPQZ9y4PIf5q03AwyVKcD33q
+rpAjwdKBy9TfOCNlB7+s4mfvIcCbvoXe8lHIqYpZLiY3m0rgE89QcEbCH30jnwqa
+hXcPkuU3Bq9AR1ukt1tKlPwZy9nutFx37btVMDqfkmMo+eKnEt2P5yuE9oRkHx7G
+XzXszLu1VYYCStHd4BEiPR9noulzKbRFeR2LzLbHnTFB9IETNBdq0iPAEG3+X4EK
+6+/ZbD1XJOKH88mnigjtzuuAW2yh8czLN02k3kNS784TVHXvD5a43xQijyaqMFnO
+NwGHLUmkKwKoQtot5mVa7sr/i7LFxyTBMvWDWt3KCdQ8qya132UKWuVxv7TEhMeE
+2HYgbULXort6AT0H8UBc/U6bKWRc2FNu9sUx8aUgvSGWgQuJgsLWp6JehNW/OB0I
+NM9JXBJ9jQ0asNhY9dNL
+=lWZK
 -----END PGP SIGNATURE-----
diff --git a/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild b/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild
new file mode 100644
index 000000000000..8fc57314e96a
--- /dev/null
+++ b/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild,v 1.1 2013/07/09 01:03:56 blueness Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD."
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=net-libs/${P}"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/link-against-system-lib.patch
+
+	#These are installed by net-libs/libnatpmp
+	rm -f Changelog.txt README || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libnatpmp/libnatpmp-20120821.ebuild b/dev-python/libnatpmp/libnatpmp-20120821.ebuild
index f38b9b325b46..014aa372165b 100644
--- a/dev-python/libnatpmp/libnatpmp-20120821.ebuild
+++ b/dev-python/libnatpmp/libnatpmp-20120821.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libnatpmp/libnatpmp-20120821.ebuild,v 1.2 2013/07/09 00:13:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libnatpmp/libnatpmp-20120821.ebuild,v 1.3 2013/07/09 01:03:56 blueness Exp $
 
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+EAPI=3
+PYTHON_DEPEND=2
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils-r1
+inherit eutils distutils
 
 DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD."
 HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
@@ -16,13 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=net-libs/${P}"
+DEPEND="=net-libs/${PF}"
 RDEPEND="${DEPEND}"
 
-python_prepare_all() {
+src_prepare() {
 	epatch "${FILESDIR}"/link-against-system-lib.patch
+	distutils_src_prepare
 
 	#These are installed by net-libs/libnatpmp
 	rm -f Changelog.txt README || die
-	distutils-r1_python_prepare_all
 }