use ecvs_clean; Bump to python-single-r1.eclass

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

4 files changed, 48 insertions, 46 deletions

diff --git a/net-wireless/airpwn/ChangeLog b/net-wireless/airpwn/ChangeLog
index e92dbdb59981..e3e4c10f8dc6 100644
--- a/net-wireless/airpwn/ChangeLog
+++ b/net-wireless/airpwn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/airpwn
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airpwn/ChangeLog,v 1.3 2014/04/02 20:37:01 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airpwn/ChangeLog,v 1.4 2015/03/21 14:05:54 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> airpwn-1.4-r2.ebuild,
+  metadata.xml:
+  use ecvs_clean; Bump to python-single-r1.eclass
 
 *airpwn-1.4-r2 (02 Apr 2014)
 
diff --git a/net-wireless/airpwn/Manifest b/net-wireless/airpwn/Manifest
index e4cd747b5a1c..3ab5252ca02b 100644
--- a/net-wireless/airpwn/Manifest
+++ b/net-wireless/airpwn/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA512
 
 DIST airpwn-1.4.tgz 910109 SHA256 f689cd5a9038832cb0aaefa18cae0c282a6bfbeea38819cf47f306f14344e164 SHA512 c849740848289005eb2a72b09bbfade6bf078a3ff93d39300f6a65d328c527bbafbb2a325f2813064612f91a2da20a2daacb8508497e8410ad0befc4e28331e5 WHIRLPOOL f3e7f18578e8c19dd033567851abd9af3a5bd9b0c76bc60010b654735d8632fa02eb942350afbd9015b4b8ef25e9b3dd9e01f30c38358658e5b22a89a3c9b259
-EBUILD airpwn-1.4-r2.ebuild 1134 SHA256 55a23fbe3fee744068089c3ee9c0f0484c5f2fcd4390548905695395be53566c SHA512 bfb33453bac117ca9a90d6e819cd9b6f17755325a4b84e03e218fae4f33d3999ebb061eeadcc9ba20a998d85e9aadffbde4abf55f1b352d0dc95bbfdce0985df WHIRLPOOL 9eb76d19a7d181eba19b360466771861af15d2e45bc5f6c43b2fb6610447e9c2221454b059b5a1e8db82c638b9b386447f842817f15a1c52a24ebc8813f280e3
-MISC ChangeLog 718 SHA256 7e7cd415bab59d1a82b9fe61dea1e83d99302a2a83bc3f01e5661b92d8961cf0 SHA512 d38a7dd27bfebc520af5a748cb5eb36f4c4472ef66325b5a4213f294f358a0acbe58a788b6482a1c0d73a2304f0830bf204390b85bcf78b7c7bc6a3952cfd170 WHIRLPOOL 3fc588b9bcf54800c404362ef63741e0497c05d6bc34268a140585c212d172af9d169c390aa651999cf704b98e5bb89b1a73df531cce95cf6ae78bba9fd1cb30
-MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
+EBUILD airpwn-1.4-r2.ebuild 1066 SHA256 76072dc67d890009cbdce36b2f52d08a9de9efee316e7645f570470163f14388 SHA512 d74cbac7900692c4712cd6f0ffd4d636bb9abf4a57d2f6b7daee88d46d4fadbcdd1d34886ea72dabeb13748e563d26a3d19f66b9509aa6557f311b756e706ce2 WHIRLPOOL 81eb4dbee1ecf0cd2ee588198091b7d26b668a91dfb44e1e3f1f59d07eb610893017b8f38cfa0af28a65b7f50ce9c8930721a7ace307d3a2a7c2933c5790df75
+MISC ChangeLog 849 SHA256 dbd438aaaef1f2ad4a538bea36ec5e703c7d196ff6625a8d307bc602ca170505 SHA512 c8b5cbdfe59f4ca449de39f14f95bc2a5548fdf6388a2dff6129abdf70a756fdd639d11de7ac0491f4b507ba74f64b3a4d8e95d78c4ee15f2e795f683b663569 WHIRLPOOL 06e30203778fccd4495b45ec8bbc970ba33853b1f86c714ef4489324c4e596be13c90f893322b5fd905e68ee902268f44564c49a6244d91c09583642bdb7c5de
+MISC metadata.xml 288 SHA256 32e3f9a0d3f9f55d54ecb8fcdcc411b24c7e862aab5bebf7755ca2a979d59f41 SHA512 f53176d364c1f78eb366931830519b4d2eaf579055c907f0307abd9b80467586a5f8cb2eaa5892bdf7e79f6aed743fb5dfc9324d9c661936d341693ec153d00d WHIRLPOOL a02c22ce3c5a443be7d2a89c0ceb8aeb41d44067da45b06bef5986917ac0a09941a682a73ce0d5f2e40136231b4296f7f9f0e97faef339caa99e9322bdad56e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJTPHVNAAoJEKXdFCfdEflKWlYQAJ+Ax7+gJ6PkkB4/N1sMpnik
-42+7T84NPIFOpHNDS2Zw7Vl7tDjju75BfMtokgb2fxsZfA9xP0FbeCUJKhj4OGSQ
-9GxkqVfbN1Spt5As3vdZt4j9zz2CF420rnj1cwGJTTgpxyih6O2cETvLlH8mY2bO
-87/jUt7VnzOLhT2/H4qmSHBx85ISWc+ShZuBOv7gpEfsvFPJUoZc/5d8VMZCfG7s
-OgCA2GIYVaPQIB2+YJl5OEvYMhecmsoabTXNCqPsUgR7on7mtzT6QbTup1MVO8Ke
-phMTeJ9BFhBiKxq/Ga47PPa2IzUVMrr3ZgdEGEFue/dkp2tqIfoXaEGn5AMGOFEk
-KD891PDxLO7PCsEzi1Ra07gX9h2vkw4TEd3LOiCjIaGzlUhaGC6/rnFnoMNTXTTK
-wvls14hg2zzixGaoPdH8sutYx/jM9vRjgIwMTV00quKiwyhNLOKrviLkizms9Sjy
-Q9qcLmufAOnq0WibPIEmCOaHWJwKypKCywMF32BMRHhgb0ovgfpSzwZ0lHyHZQer
-oFPN7gAhuEMeYrE06qeY/yk/pnC9tDNmz1AjLot8Sk84zQ3bV8E/I8Ht7qFxjEyy
-pcYVzut0dBwz9bBdVZnUMJ5s9aToRdPGJAqHmSA7DrzwwgKQct6O6+sl+ODSbp8g
-DMTifMfPT6Ze972qXhD7
-=TvTV
+iQJ8BAEBCgBmBQJVDXrDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrRMP/i0e+V/IRsaCY6kJIw7Q8yTz
+HQp67KsUfNXY4BUM/FCJNwNO7Wi30FdfU+qJseCWMSqWzj/H1NUdiJv01yXQRnOV
+gDpaIr7lgiDcbMQm78S6LJEa2M8WwVsyE4oynz5H+I26XUHWk0KHCASCMTTM3pAG
+sE1+wo3zCtUjGaqw4cr9lJtLGl4BAEklY+UU4S3dpYbWhV7NyB+MQb4VyJG9Ve7Z
+NdOiFak/wcCQJJQXxZgdWY6s58JKS4du+2KQLdJHoEXaWIDtT2e9x7eZn3sASkgw
+IRuaayqpwmro2UsZnXwSliH64sApsbv6/dINnB2UNkDUiAR6NxJrl6oiaIDpuujk
+DQkolONYkdpDL+TcRWL3u/2IoWogtoAi61aKNZRsiQbNt/V1E/SkmU9kG6YcgUKY
+l+ZtL7GLuY5MotbPwdZO00pS3LKE8ZNghOO9/Sq9XWv+q5slIbJuUmDzWNVzyIhx
+OEJ2EWiznRrFjhgcfyHNbGBNG9uB5Ixh+p+DOI5lyPzJnO9MzpPP5vwMTOlSFhUP
+IMWuAKkiB9plge1tY+WVztdXJ8K+PsBSXtWhOH4reICU6/13+OqJHMm3TdvzR3Ys
+EjOYL7q8o/sAtyQQqLzZhr2ds/jupHe2Wo2YWUXHdG1GtaPWYLtTYnXAqKlossRw
+m9giCOiCOAjci9KkArnS
+=MLC6
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/airpwn/airpwn-1.4-r2.ebuild b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
index 81bcbe3d0d8e..2da157717a61 100644
--- a/net-wireless/airpwn/airpwn-1.4-r2.ebuild
+++ b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airpwn/airpwn-1.4-r2.ebuild,v 1.1 2014/04/02 20:37:01 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airpwn/airpwn-1.4-r2.ebuild,v 1.2 2015/03/21 14:05:54 jlec Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="2:2.4"
+PYTHON_COMPAT=( python2_7 )
 
-inherit python flag-o-matic
+inherit flag-o-matic python-single-r1
 
-DESCRIPTION="a tool for generic packet injection on 802.11"
+DESCRIPTION="Tool for generic packet injection on 802.11"
 HOMEPAGE="http://airpwn.sf.net"
 SRC_URI="mirror://sourceforge/airpwn/$P.tgz"
 
@@ -17,32 +17,29 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+examples"
 
-DEPEND="dev-libs/libpcre
-	dev-libs/openssl
-	net-libs/libnet
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/libpcre
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1=
 	net-libs/libpcap
 	net-wireless/lorcon-old"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_configure() {
 	econf
-	sed -i "s/python2.4/python$(python_get_version)/g" conf.h
-	sed -i "s|-lorcon -lpthread -lpcre -lpcap -lnet|-lorcon -lpthread -lpcre -lpcap -lnet -lcrypto -lpython$(python_get_version)|g" Makefile
+	sed -i "s/python2.4/${EPYTHON}/g" conf.h || die
+	sed -i "s|-lorcon -lpthread -lpcre -lpcap -lnet|-lorcon -lpthread -lpcre -lpcap -lnet -lcrypto -l${EPYTHON}|g" Makefile  || die
 }
 
 src_install() {
-	DESTDIR="${D}" emake install
-	dodoc README
+	default
+
 	if use examples; then
 		insinto /usr/share/${PN}
-		rm -rf conf/CVS content/CVS
-		sed -i "s#content/#/usr/share/${PN}/content/#" conf/*
-		doins -r conf/
-		doins -r content/
+		ecvs_clean
+		sed -i "s#content/#/usr/share/${PN}/content/#" conf/* || die
+		doins -r conf content
 	fi
 }
diff --git a/net-wireless/airpwn/metadata.xml b/net-wireless/airpwn/metadata.xml
index 5fcbf8e1851a..bcf4a5d96082 100644
--- a/net-wireless/airpwn/metadata.xml
+++ b/net-wireless/airpwn/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-