Revert to python.eclass and stabilize on Alpha.

Since python-r1.eclass provides no python_execute_nosetests() function and
coding it myself seems a waste of time, revert to using python.eclass.

Also stabilize on Alpha for bug 479342.

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCE5D54E8

3 files changed, 28 insertions, 9 deletions

diff --git a/app-admin/lib_users/ChangeLog b/app-admin/lib_users/ChangeLog
index 9549ab293370..dd8177304a85 100644
--- a/app-admin/lib_users/ChangeLog
+++ b/app-admin/lib_users/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/lib_users
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/ChangeLog,v 1.27 2013/05/31 12:01:45 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/ChangeLog,v 1.28 2013/08/01 08:20:27 klausman Exp $
+
+  01 Aug 2013; Tobias Klausmann <klausman@gentoo.org> lib_users-0.6.ebuild:
+  Revert to python.eclass and stabilize on Alpha.  Since python-r1.eclass
+  provides no python_execute_nosetests() function and coding it myself seems a
+  waste of time, revert to using python.eclass.  Also stabilize on Alpha for bug
+  479342.
 
 *lib_users-0.6 (31 May 2013)
 
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index ca70795db780..c17a63c8614e 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST lib_users-0.5.tar.gz 12067 SHA256 2d884bb8b4298918185bb71173a86d337f7647252781a325472d41504b06a206 SHA512 ae7734aeab5048b55e7229afb960c97dad7f8dfa793661af2cddde7f9f88b39e500fdf532d0a03fef3a6bffd8622017a4182b0739d989474c51c5ef0284297ba WHIRLPOOL a2e1aed7b2cf5dfef6e780ff96496762497e597797c5422dd29b0ddaf4af1903d708abffad0c8d2a1dfb0c382254f046342224a0e79609a1ddccc8fd13064421
 DIST lib_users-0.6.tar.gz 13314 SHA256 127cacaf8e108e4254401976e376b7ef9520cabc21b7b469b5cce39dd794a2dd SHA512 9f13878a309e0f879630dd45e5a27601cffc6816eec8497026815e85873e60f4991f2d412b9c82985cbc3c9088bcd6b8cb5b06bc15bbd327cfc5b002644f3db0 WHIRLPOOL 36430733778872bb18b83258c5bfe1e13c187d96d336d49fdc237ceccde662a14fb53faf9c6317194c49a943a0c32bd147797f82fcbbac2ec5a7c5f37d94c276
 EBUILD lib_users-0.5.ebuild 826 SHA256 bc02b9e6b34c2799a5ae69b14f5ce8bc708f3cdfb13b0ef96a5836867f6030bd SHA512 4811150c3828fd74c83318ab9941a77baeab9c7e4f6e1303b00511da24ac414cc16574bc20b05be6a1a3c5272e22fc2a46dc6bdf79d000ce4f193e4b4313b715 WHIRLPOOL bfef580d8603e3d43f773685b0bde0ae0d970793a0a3fa0f7fc87167268019b1a1e0961864890bc8874fc510289c5500a0708a022024bfcf3e70e312c7534557
-EBUILD lib_users-0.6.ebuild 713 SHA256 aedfd0ff3cb83ec4d67f6aafa53e526c2972365fa18efbc0b62bdd3ce2ff5b16 SHA512 ed76c3f5cc5e37cbd21049935d4620350ddc20c2bbbba1556aabd0667c184125e3e1a326d514ad973c5a5e246666f735567fea3bd8c5399122b03d87bc5bd093 WHIRLPOOL e58ce50c0dcfc93ef7000d1e45ee52604b976f9c1e7844c670c951695eb129b815f6af39b7994559871c5ab7a05157bf28509bb87e207201a8d7cd8d9e9875f9
-MISC ChangeLog 3431 SHA256 5a9acbbc157783d1a33599a7b01bfaef29b18a00833c0ee50003ec6925a048b9 SHA512 c0e78c14f41730dd24b7f0cbdcaae976933be6354498d1919b6dc8a53605b53d3d7fbac49c7de529774a2869acf75b32206b8f062a495c837177f1eee7d122a4 WHIRLPOOL f399c539b8b8aff44449ffa7d21aa87c4d01a545d4b6e17a010790c24fb4e625c0e66b94379a5dde0487de81fa57383f879c38d22fea1ea25212bc943302d3bf
+EBUILD lib_users-0.6.ebuild 871 SHA256 87bee61ba10c1bf99b445185124b11d2fc78687d62e92366dcec725e61d7331d SHA512 4683f059f2ffe3a188c5dc9a66a004e4b21ce76aa3e3ab8bf4e25cb29a103db51ebaa47ba28ce07c85b11037ee0a64c9700b8a970498a811555e307d1fbac74b WHIRLPOOL 7e071a0580367a59f23e479a3bf0950d782c8665d8e4d2b9aa40939808afdae4a63cdb00a7bb1a7de075167af1182b7585eeafc0181226e26c39caab20ecbd08
+MISC ChangeLog 3752 SHA256 ee8c8bd99de3aa4a8ebdcaf088bd736bf1d0fa11a68b65c75557b3377376fb2a SHA512 8ba82f13d4d920690c6750ad49ea065fcaf49df13839b6cbce146c5660900aa0504e7e0d9ececb560d0dae978d7ed2327edcd740e97a671e87b944740dbdd821 WHIRLPOOL c105363068184bd16a35490922a9d96612cefd614418f3594a383b3b10870d73c2db9bc98487ecc74401c5a517169201fb925f3620abd54c34d931c89e93fec3
 MISC metadata.xml 327 SHA256 43de2ffe38a278cb8c382b938e8afebde9e956543cc60653b3a9f5d236b44982 SHA512 ba489312074dcfdf9abfb75c3d8b767972899e6270df947b643e0e84f67a0fcae837b39c5e46626725a292c0a54a6e85d27762050f83016098cde7a45f928b55 WHIRLPOOL 863de22e17f08d854b11cdec17cf26ce5d487bd25432001c4dbdd12b30b7d03a32eed48a0c85219042b9d47bb17476f80828d01073ea3ec71aec67e53a3d25f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGokTAACgkQA+4Doc5dVOijugCfZC8ABk/swaQ4TzkVvy7lfd8V
-T9UAnitr7cUY8YuTzqsVXGOlaGv+7UWY
-=OEx+
+iEYEAREIAAYFAlH6GlEACgkQA+4Doc5dVOhJcQCfSzKl5ihzTItNl/rbglWJYuEh
+wnEAoJAsSLqMY3/p+txnG9nlYBQZyEYv
+=Z+AC
 -----END PGP SIGNATURE-----
diff --git a/app-admin/lib_users/lib_users-0.6.ebuild b/app-admin/lib_users/lib_users-0.6.ebuild
index 06eecd74e444..f3827b9bfd30 100644
--- a/app-admin/lib_users/lib_users-0.6.ebuild
+++ b/app-admin/lib_users/lib_users-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.6.ebuild,v 1.1 2013/05/31 12:01:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.6.ebuild,v 1.2 2013/08/01 08:20:27 klausman Exp $
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_2 )
 
-inherit python-r1
+inherit python
 
 DESCRIPTION="Goes through /proc and finds all cases of libraries being mapped
 but marked as deleted"
@@ -13,12 +13,25 @@ SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose )"
 RDEPEND=""
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
+src_test() {
+	python_execute_nosetests -P .
+}
+
 src_install() {
 	newbin lib_users.py lib_users
 	dodoc README TODO