Use more correct distutils-r1 conversion with SRC_URI fix by mm1ke, https://github...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/net-wireless/python-wifi/ChangeLog b/net-wireless/python-wifi/ChangeLog
index 003d1e9f599682a237bc5f1f28f7133cef28be5c..93d9da57cac1c7c0a8d1b2b7963af61860e58be4 100644 (file)
--- a/net-wireless/python-wifi/ChangeLog
+++ b/net-wireless/python-wifi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/python-wifi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/python-wifi/ChangeLog,v 1.15 2015/03/28 03:55:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/python-wifi/ChangeLog,v 1.16 2015/04/03 20:53:28 mgorny Exp $
+
+*python-wifi-0.5.0-r3 (03 Apr 2015)
+
+  03 Apr 2015; Michał Górny <mgorny@gentoo.org> +python-wifi-0.5.0-r3.ebuild,
+  -python-wifi-0.5.0-r2.ebuild:
+  Use more correct distutils-r1 conversion with SRC_URI fix by mm1ke,
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/66.
 
 *python-wifi-0.5.0-r2 (28 Mar 2015)
 

diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
index 49f8d229c1e1206e2483dda77c9860d69e65c4a0..335e2019ba556d985067ddeb39ea2d0b4264c502 100644 (file)
--- a/net-wireless/python-wifi/Manifest
+++ b/net-wireless/python-wifi/Manifest
@@ -3,13 +3,25 @@ Hash: SHA256
 
 DIST python-wifi-0.5.0.tar.bz2 69113 SHA256 3e3f645d37ab20450f60c785cec5f21b330f28a6c46c7c1b0898305dd7a34b26 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8 WHIRLPOOL d31688208976d8b5e3ea44211fc9e752238723d86aeb3aae5e28ba2e977881cd2bd6be8267dcd1507ee0681fba3aa65d6dfdc8cb84226aef391461e225a37406
 EBUILD python-wifi-0.5.0-r1.ebuild 1091 SHA256 f35af1aac03c311b1b4bddfced4a6a088abb6500aded2b5e7dfd5ee8ca3b8107 SHA512 2e6a73a667d567a6b157c718f339771280ed1b4a7e2c029437a6b065b23b6524f07edcbf33422078dac9d6404dcc57542a1786885cb1cedadb34426ed9ae165b WHIRLPOOL 4fb9e875717d0dc4dce47de8adcb7eafa3a597230cae63280b3de95eba74e76f83ef351df5d6082e759c2d4be73daa82f6adc909ce0dc5db61d50a96adb3a376
-EBUILD python-wifi-0.5.0-r2.ebuild 1382 SHA256 90d831861c28cc31e81bb59d61b7849d66a87ba413c8e3934d87a5d0947d0eb1 SHA512 b94ba6834ef13c13475e4bfd30250ec3722e8dbf92aab14c677a4134d449c72384da8015c9bb27a9cd69eaa1b4510c960680d7236729adebabf2db24061622c3 WHIRLPOOL 07df33397d2c88011af357269d216948941f1658091d8c277afd528344933a8b5526b229d796bbe56c5f9d4f3d466f0a93450112861cab576a5577054d0d7807
-MISC ChangeLog 2350 SHA256 bf1685d8d3af5e0b2b30471537c3129714ba122bd5573b3ea4044ea7ba96da20 SHA512 59f68bc7c9296803ebf84ca8544362c4a347834575b437112be3d7548766121df86eb1d822ae87cca4dd06f5ef03ec50faf7d5b00204d5570be1e04b79eaacfd WHIRLPOOL 52abfa23dffb5fe4de9d2723994bffcd33a66c22f6454fd722e0d0c631b3cdc78a523a0d4943fe81e9e262f28da1618d54f248a8fe34a6ab854ad8396ae116f6
+EBUILD python-wifi-0.5.0-r3.ebuild 1009 SHA256 f45abd2ffacf640423abe6bf2de3ef10392f0c3ba92ffa17dda117f0bf343988 SHA512 d0eeae294a3d099fc7a8e3e35a27ce33a622f5825879fd9eded2feedac4002bd8aac50cea605d2bc4bb94950df445894f997529e6e8ae54d9bd8a2f4e8a5d3c8 WHIRLPOOL 375ec5ee59c3007f7ea8e535a7321f4c71a862dc182d5d2d44ecaff6ee63b130e826938a6b8428fbbc71dcb776b014440b52894b0a2acc14a2a41ca1b36b6220
+MISC ChangeLog 2634 SHA256 2f1a92889b6d465064e27e638c79b4612f09915bfc034ccec7bffb0c74a9181c SHA512 5b1aec73e3cfe9ca7941fb67449db9f9a4d0f35034fffbb02514e56a6bb69245a9e048b3abc4beac748aed8c14684ce043daba33d1ea0e81b993c304130a1d57 WHIRLPOOL 2b4270a3f4f81196110dae63bdd37c54e7c464a780d95ee252ec0180c3083ea12cfe841977ff56dba83fe807e244afa3cdfcabca304a282916dc46b0141a8710
 MISC metadata.xml 223 SHA256 6d5d8094238401519be30fb6cc94df85aa34d9c2a7477fb899c69025bd550483 SHA512 08b9d44ba58b371f946b53fe52992150b8db47950ce49a79b09dabbb50701d5123b2288adc9f30df65a566e161e609507f190a40209cc44e2806ab699c87a611 WHIRLPOOL c670274d36a1802c41c81bee4c64d1db4c1442cab0ef199218995bcfc056194772401a77d4a12da65aebfb98de9d065d0954e797af9f691a5357c186045e203b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUWJlQACgkQso7CE7gHKw0wQQCgxneHOR6ix6/fOkFX1hAPoVkn
-/jQAmwYQDef+fdMXAqBWUuO8EBzeXL3c
-=LCjv
+iQJ8BAEBCABmBQJVHv3NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOdRwP/i2/TSEASa1rGsquouV3z759
+PS8lRtHd2h8/DvD7dG8HPCypmGMIwqZAlTMWatZgXFNdhRvZvU0eYzIZz7KlxpvP
+3UZdsRIloaME921ixETWVZHIrbPES6JKk2Ux8A67OZXTMv1u1SbF4ESx84ar/hvn
+Tr9tLk3NYnWeuDNRA+WRWndxbIZ0jXcZz+cEMevAoBZIvYp9HoiRIRsL19AU8eRX
+hBGJPPz+dQxM7+ww07lPFbLpYx3k0xBgH8ka9tZ6ZD4tm1l15HL5y1cATKNPI0zy
+H77XF43SFpXSY6PSEEP2nOfL0fArHpIAHXPfxLclcbdaFayTibGDMEr6lE2YLxpd
+4L6/bcVSL0cR0VWZbMZArYg5fon64Cb7yW81bvLoteJePk8y4zpZPJcTbdl7Yinv
+f70CpNb2NrVF87I1qcCkL8JRdvF/Rhl3DBbSZh1zcAkOGqHxmerlRJDhCipUgYRO
+WxqL9NuS6EaTL7dmoKOkdV7YbR5SCVdhNwcbbyl7U/6yGABs6gT1CHAzih0LfpiM
+Z+a3gohd9puLPPp8NgvqlKCra0gz8k77Jqc/IYg/FRb9bQ3HEKrWeefvaPZ4FTnR
+FkJTwFSQslwyb/55cjXdhjh5qx2YZXM2D+0sKb+0Atj9oC2xzpYRzvSLtqurRlSR
+xdU4Xtw5BzHRh35/G/yZ
+=jyOV
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r2.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r2.ebuild
deleted file mode 100644 (file)
index 5581568..0000000
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/python-wifi/python-wifi-0.5.0-r2.ebuild,v 1.1 2015/03/28 03:55:49 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Provides r/w access to a wireless network card's capabilities using Linux Wireless Extensions"
-HOMEPAGE="http://pypi.python.org/pypi/python-wifi https://developer.berlios.de/projects/pythonwifi"
-SRC_URI="mirror://berlios/${PN/-}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="LGPL-2.1 examples? ( GPL-2 )"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="docs/AUTHORS docs/BUGS docs/DEVEL.txt docs/TODO"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-}
-
-src_install() {
-       # The section data_files=[ in setup.py competes with the elcass awfully.
-       # Without patching a setup.py from 2102 we have to manually adjust post install
-
-       use examples & local EXAMPLES=( examples/. )
-
-       distutils-r1_src_install
-
-       # NEVER before has it been necessary to code for both use and non use of this use flag
-       if ! use examples; then
-               rm -rf "${D}"/usr/share/doc/${PF}/examples/ || die
-       fi
-       rm -rvf "${D}"usr/{docs,examples,INSTALL,README} || die
-       mv -v "${D}"usr{,/share}/man || die
-}

diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
new file mode 100644 (file)
index 0000000..7a60f7d
--- /dev/null
+++ b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild,v 1.1 2015/04/03 20:53:28 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides r/w access to a wireless network card's capabilities using the Linux Wireless Extensions"
+HOMEPAGE="http://pypi.python.org/pypi/python-wifi"
+SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="LGPL-2.1 examples? ( GPL-2 )"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/AUTHORS docs/BUGS docs/DEVEL.txt docs/TODO )
+
+src_install() {
+       distutils-r1_src_install
+       use examples && dodoc -r examples
+       rm -rv "${ED}"/usr/{docs,examples,INSTALL,README} || die
+       if use examples; then
+               mv -v "${ED}"/usr{,/share}/man || die
+       else
+               rm -rv "${ED}"/usr/man || die
+       fi
+}