Use more correct distutils-r1 conversion with SRC_URI fix by mm1ke, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/66.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 42 insertions, 45 deletions

diff --git a/net-wireless/python-wifi/ChangeLog b/net-wireless/python-wifi/ChangeLog
index 003d1e9f5996..93d9da57cac1 100644
--- 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/python-wifi-0.5.0-r2.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r2.ebuild
deleted file mode 100644
index 5581568d283c..000000000000
--- 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
index 000000000000..7a60f7d11d8a
--- /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
+}