migrate to distutils-r1 thanks to much help from mgorny

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 62 insertions, 65 deletions

diff --git a/net-wireless/lorcon/ChangeLog b/net-wireless/lorcon/ChangeLog
index f60d8a15c692..4061da7603ce 100644
--- a/net-wireless/lorcon/ChangeLog
+++ b/net-wireless/lorcon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/lorcon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/ChangeLog,v 1.4 2013/05/28 05:05:22 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/ChangeLog,v 1.5 2014/04/17 21:21:19 zerochaos Exp $
+
+*lorcon-0.0_p20130212-r1 (17 Apr 2014)
+
+  17 Apr 2014; Rick Farina <zerochaos@gentoo.org>
+  +lorcon-0.0_p20130212-r1.ebuild, -lorcon-0.0_p20130212.ebuild,
+  lorcon-9999.ebuild:
+  migrate to distutils-r1 thanks to much help from mgorny
 
   28 May 2013; Rick Farina <zerochaos@gentoo.org> lorcon-0.0_p20130212.ebuild,
   lorcon-9999.ebuild:
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 5667a234acda..bde0007b76ad 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA512
 
 DIST lorcon-0.0_p20130212.tar.xz 956024 SHA256 1266bbd53e483456aca3031a49ea47fe3bd004e3e109b86a61672c881801742b SHA512 d7c33d9e8b5678e0b8b9513b6a132ab1b13045503e884d077474745a4a9731fa609ba8dc9c35f344ad93b65eb0ddc038919a6349d32187b6c6c92a020155b34f WHIRLPOOL b5e6af7977fd742b34a0f394eb443cc1aca95f9c44177b7353e8a19e1593bca4ccf7e72cf1fc2f05eb4fc5d77303bb162440462957fcc37a7f8a69443f1f4df5
-EBUILD lorcon-0.0_p20130212.ebuild 2512 SHA256 1e91f5e6361f86db236cc0a9bc8e3270d8d5295959bfa546b7daadd91723411d SHA512 55946b5156fd6726a847b045b2148dcddc93f17abb834afaacfcfc663b5359fe71b83a1a84aa695d62d7aa8f7ef1cd6df280de58cba8ee8ca94981e472e94047 WHIRLPOOL b186adf70fd48ee471fa22beed1313e2ecefa94c551c58ad1ebecde909a05abd0723b601b1bcbedaa454d3a98dac3252c784f8a30f0e6412c133c58a0b2b619f
-EBUILD lorcon-9999.ebuild 2503 SHA256 7866f3990689ee00961589dd54e35c2cf656f0623064d58ad97ce870d4c41959 SHA512 43f9ca046984677ddcdd9a00f530e4697e5a670f40d8456e25ed0af4c3ea2c9ef87166feb670ffe05e4ffd31f024a5dd433931d2ef532f6a23a4c757897852eb WHIRLPOOL 6c7a9f4dfe772279c425e97f9381abdc1687475d19eb62243f606b3cd34eb7216598fc3216e4fc7c3c97a05a4f4b10b875c3b670d3a9e99aa5b7d4d49c0616ab
-MISC ChangeLog 825 SHA256 d4e4779896361a5c12a7753b369b9b6911001a4697d9adb3845f5af591f6eb4d SHA512 225961b36310fa2b9d140d536a2f09e8fbac15aa693707ee83aa44411f72daee17416cb9518789f9abbb7195d5045fe8c56b7d29c34ab17844b5a90f04865008 WHIRLPOOL 0eed87a7d145fa3522cdafa05afc18110b61b6c962c5e20a9856293625519df1b0752aff0cd982b7e1ff1967c5bc64cc16756d178a89a24ed9428ff12f652ad6
+EBUILD lorcon-0.0_p20130212-r1.ebuild 2421 SHA256 c24757fdd8f9ace9037886fb3d11825ddab40440dc4690a4f7e16306e6f31bce SHA512 c158bfe6155415490d1125ba224ef293111f2635d964b9cc0a5ee8be849f58c5484fea23fb779b290abbf70eb5c12e1ec32ee34bada63a5f826ba63492ecffe9 WHIRLPOOL bc365d1a5b1c60933b91fc72ffb590c3562d20d96c47278081e971edf574387f6ba35e1c569f9f395e3baa8d6de29c6d41fd734b20fae31984397742fa9948e5
+EBUILD lorcon-9999.ebuild 2409 SHA256 f0326527e53d01bb24ddf4363605ce1681096d601aedf668ae818e8e9a170c39 SHA512 b55b0d7e61bed51f53a24f4a30502b4650a3c9a0512719e30b71abc9e4b7e7d9556c30802b721c1f3b5e339159c5452445ce46f18739f216757be682d5733be2 WHIRLPOOL 02ae00e3a6141b572d8b8fa23b5f0b87deb3a65edc14978dfed394831a82253abc912055d0be2bed3c9910dcf91ca53aa7ce14ac5dddd41bbc724881a4cb0c84
+MISC ChangeLog 1061 SHA256 c81f40f67ac140d06a35a78e7b19d3828b6f9e98c0827f97e44346cad546ca6d SHA512 14f7d126b3d9f6ad2e32e742c6b28e0a237f2b3e8d2e76e8e205a8617f0338cb63b460bb021420209af275f7078d908ca73e4cc2e315aaa3fbb475f1f675da9e WHIRLPOOL 96fc17ba824518a5212eeb2523c7cc9261a6dcbc5cf66486c685d03dafee7d7751373501ffc24d809845818fa71799c651f84e59566ee7279e0a45a509368438
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRpDs3AAoJEKXdFCfdEflK1VoP/2HHnoXB0ewUu9ORFJBY412b
-zRZ0Ji/94blb/heCrCzcIpnDkahuVuh+4in0RBZJPhF8gTvOaZZudGZdAp0nNT2/
-9Xq7kZ/sxWpZpQLrHsewuW2pcdWdaaxNduirvdmkLcL8WbpVyCVqcZII3ZgEjQEZ
-3FqQzHW0nLbMmf1vGJmdFC5mH4TOZmPXjmMaC5HWGgtX4phRu58aIX1/uOa/T6zA
-wBVjEhRQwmcAfTrNzD5zGR/52EM3MIavXE8OvMAMjvjeE2B6rECn27vmAnYMYXrg
-OnWNHEzaOD4pqcs0SO9wLSvlhLvRDpkAiZrQ33QzygxAAnUm9roiKRlvjQaSTnFt
-+UVoPtAO697yjbxPDSGnveZnbbOhIVFF2K0aRGhdv4u1jJQaKs0xHYlAY3OL0h3+
-ULsM7X4vbYUh9SlsaM09116r8I7pgV82Aq1ptVg+6hj5rOsL0DyBEh1WoA4TiFlT
-w9U/vhMCvRPufHF8QXCntySGthyg32THab8FB8NqVTO0+8GJQe8+UG6K5VKduFOp
-S+C3oQB7Vmv3gvpwPpnx+7g7S5R5ItZlsnumJi9Ra+pSnl8g7arGtCP+74oRqW1o
-widEOOGNmeyufoX1f6GU3f5umIk0dodpKpKDG7t141Rg9j1kkgFq2Q5wHQioLfu1
-YVRh4opORV6chbHRDpdM
-=p80u
+iQIcBAEBCgAGBQJTUEZKAAoJEKXdFCfdEflKs1EP/jp2sXIBcatgqDWC1HniV1Sz
+vh7Kplod8FQzqMeBrnVBqzuuedSXn9roNyVoyduzMiuvIKszsweI29MYSH4PNJXS
+JfCyfFh1KOn3SI3vu2QKEOee6oGlG/4GCO83lUMeKXR/3fbv0yP42U115llmHOfi
+xpXQZXHLoDnuqJFnlr68dYhsW4BHZwKgGueo06YuIn29PfADQ72HDEq0zOgV2mrh
+BhsLkdZggtSbfZbIGWTh5zNm80VI+PYoxsbcRJqLj7V9TxFOaa/hE5+Q1EAL/hht
+0f2NE+t20+GzU16CSdqvHSys5wbgFAUaq8XO6ec+WQkQ959w971AIMRAq6RKxu/z
+NQTHN1j/Nd+gY/jn4C+0jsG8epady2M74L4M4HrzlHkY5PFl7nrt1JRV7xgvK+hH
+qHYMNSUQ8iR12Zpzk0tj+YVpFwjpFY3iYocKztToJza17IG21mo83rMlWuPBk+/i
+xVcVF/bS/3xWWz5jmKQHgmToDz1eUuHrc82jgCciw9guO20XBo8676af1BIycjWY
+cTDNmBW0W51MtlJ/6UsvNAQvxPncC3yaXklHxmLVo5jaKrfCRnywsIcyNvBfMXCg
+b+V2GBam98+mLQ7+hEpI1458xu+me4gEZz0Tbk121LZsQHFWfL05ex4XfgSx/Yx5
+/O1WW6/opBmGHXm5W82E
+=zFJV
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild b/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild
index d43e2e80ecef..e099b314ffee 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild,v 1.2 2013/05/28 05:05:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild,v 1.1 2014/04/17 21:21:19 zerochaos Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 RUBY_OPTIONAL=yes
 
-inherit distutils ruby-ng
+inherit distutils-r1 ruby-ng
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="http://802.11ninja.net/lorcon"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
-	inherit git-2
+	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
@@ -30,23 +29,22 @@ SLOT="0"
 IUSE="python ruby"
 
 DEPEND="ruby? ( $(ruby_implementations_depend) )
+	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
-	if use python; then
-		python_pkg_setup;
-		DISTUTILS_SETUP_FILES=("${S}/pylorcon2|setup.py")
-	fi
 	use ruby && ruby-ng_pkg_setup
 }
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		cp -R "${S}/" "${WORKDIR}/all"
 	fi
 	default_src_unpack
@@ -58,7 +56,7 @@ src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
 	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	use python && distutils_src_prepare
+	use python && distutils-r1_src_prepare
 	use ruby && ruby-ng_src_prepare
 }
 
@@ -71,27 +69,24 @@ src_compile() {
 	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
-		distutils_src_compile
+		cd pylorcon2 || die
+		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${ED}" install
-	use python && distutils_src_install
 	use ruby && ruby-ng_src_install
+	if use python; then
+		cd pylorcon2 || die
+		distutils-r1_src_install
+	fi
 }
 
 src_test() {
 	:
 }
 
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
-
 each_ruby_compile() {
 	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
 	"${RUBY}" -C ruby-lorcon extconf.rb || die
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index def1016af7b2..508a9e788517 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild,v 1.3 2013/05/28 05:05:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild,v 1.4 2014/04/17 21:21:19 zerochaos Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 RUBY_OPTIONAL=yes
 
-inherit distutils ruby-ng
+inherit distutils-r1 ruby-ng
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="http://802.11ninja.net/lorcon"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
-	inherit git-2
+	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
@@ -30,23 +29,22 @@ SLOT="0"
 IUSE="python ruby"
 
 DEPEND="ruby? ( $(ruby_implementations_depend) )
+	python? ( ${PYTHON_DEPS} )
 	dev-libs/libnl
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
-	if use python; then
-		python_pkg_setup;
-		DISTUTILS_SETUP_FILES=("${S}/pylorcon2|setup.py")
-	fi
 	use ruby && ruby-ng_pkg_setup
 }
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+		git-r3_src_unpack
 		cp -R "${S}/" "${WORKDIR}/all"
 	fi
 	default_src_unpack
@@ -58,7 +56,7 @@ src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
 	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	use python && distutils_src_prepare
+	use python && distutils-r1_src_prepare
 	use ruby && ruby-ng_src_prepare
 }
 
@@ -71,27 +69,24 @@ src_compile() {
 	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
-		distutils_src_compile
+		cd pylorcon2 || die
+		distutils-r1_src_compile
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${ED}" install
-	use python && distutils_src_install
 	use ruby && ruby-ng_src_install
+	if use python; then
+		cd pylorcon2 || die
+		distutils-r1_src_install
+	fi
 }
 
 src_test() {
 	:
 }
 
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
-
 each_ruby_compile() {
 	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
 	"${RUBY}" -C ruby-lorcon extconf.rb || die