Migrate to python-r1

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

3 files changed, 27 insertions, 34 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 88b32f507afe..6d89f2eff159 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.43 2014/04/03 20:48:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.44 2014/04/03 21:32:53 idl0r Exp $
+
+  03 Apr 2014; Christian Ruppert <idl0r@gentoo.org>
+  nagstamon-0.9.12_p20140402.ebuild:
+  Migrate to python-r1
 
 *nagstamon-0.9.12_p20140402 (03 Apr 2014)
 
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 7c05e7be6fd5..be9aead6c8cc 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -6,17 +6,17 @@ AUX nagstamon.desktop 284 SHA256 f339017716aebaca3f75b0ff395809823d8ac0c0c488038
 DIST Nagstamon-0.9.11rc1-20130729.tar.gz 399264 SHA256 feecfab9aa1f91599ccc9c1a948aee20ee65f6fb7852c3ef47a3849d053e0011 SHA512 5b1cf20059d3f3145743e25732a5a93969dd96328c0404efbc7cb540bd596d8d2b307b00c3a2435a047da4ea64f2b03f204be1cb90da60bb42df8fc25831c24d WHIRLPOOL 0eeb334afdd39de3409ff47710d2d4d8301ecf77c53b75a366105d69fea760c79f79b0147c4808525874cd82058a78a2ad1d28a7b3af48111192ba141639ee0b
 DIST nagstamon-0.9.12_p20140402.tar.bz2 378893 SHA256 e34ed71cf4634c3f31166810ed482639466572c4fff8cde1e1cbcf428c3588aa SHA512 fb9d287081c9f40eb8de522c0c9bcf052df14977c0489683f32f4ec99eb4d78543b26b9595d1b021fc82847b5b25a51ad07ff2e84d78bca1ddcf4fffc3885dc9 WHIRLPOOL f4a412e091213b26622a6cd8ac0825b813cd3fcb71c312cf953753ba50ad8b43c41398d3a149b4b899016bd9d886543cc75fddc8e2d89e0a1f77825c9e07d375
 EBUILD nagstamon-0.9.11_rc1.ebuild 1799 SHA256 7739baa4eda90b583d91e3ddc787494b7ebf47f474921bafbdaac02a2811df9d SHA512 6ea1d76b284621774b25dc4ecf3408681eb60be78130da0d7afbc8fa9da1614eade76b20a63bcaa8372bea5949b6a9810ea9bceab90a174a4332b2863b967cc8 WHIRLPOOL c7e4221ee1a52ff208c266500094abef42c0ff91a1de949bed3bd8525a18517394438943cf0f0d57ce54e3440570ce4b3600e969a87ff645817284ff516d7c05
-EBUILD nagstamon-0.9.12_p20140402.ebuild 1808 SHA256 34e06d40c2e2e442677d0062980e4172aae207fbe418c877e3e9bd3d9c8f9968 SHA512 90e2dec44da95bcd8766d124604c6c416ee0e4f856a25fcc9e4e4129ce0b781172b6487525636f6740bc243ad7d27a13cc2f02a3dd4d8527ceb8efd7db1abfc9 WHIRLPOOL 280e7cd2d11147e5bcc13c245236cabe933655ef4cd029dc5f2ef1897be00c6bd7cbb6a43b8858882a5fdbcc842a7223093fa8f7839969ef58a854b803164336
-MISC ChangeLog 8040 SHA256 6827311cbdced1e157f0c5119fd6311b283213ce50e9ed71fab8ce012ef9e2ac SHA512 e352bf6d40ae1ceaad9b554a37db0ca1ebd5e6faccbf59aed31d81b305b8b1239e46a3c20cde50f4c5e54cc5091101b9651bff11dc85e0507535c934c20fc260 WHIRLPOOL e74a75b6dde153d5ef22548504d20f962b8a3bdb6893f66e1ff60fe7fb92f2829b8c8a3cc0b3b777430ce3c0ce50abed5e3f1225aada6d6ed0972d6e4ad5547c
+EBUILD nagstamon-0.9.12_p20140402.ebuild 1557 SHA256 9c8cbfcdc3c5fd328fe28aa1c30d3bb87ff4095fd5bfc8dbc4755403e599be3c SHA512 c2ef47a7d5864f3f31dfe7d39a183689bf9223ad48227ab1665d1b74d6871c2b4363035d8fbbe88ff90782ea047de32e3671e8a947b58a90f0dab3932f952296 WHIRLPOOL 188b1153aef12e9619382ef2cdb2d04e5a3c0b7374b58e1ac1384b79b71e09bac7133e14beb6e79867cd1c61db087074cbec39ab0b12725b60db04ee2c60fad6
+MISC ChangeLog 8153 SHA256 3853ec5672674c776c3bf94cd05e07b57622ec19d1796e859f8fbae5a9413d57 SHA512 90bb58d73ca42a5e8160d8f5c81f8c4c2c5b568d2d6a26f0fc1c63706f2634a1aa42fd652dbab86c587d9e71dbf80326f436307d31e4b9cd73647b3762e63545 WHIRLPOOL 909796620a3d164d8638b4e6db8eb191878b592dad56b1b3b383178690cd0d3ec8f23d83e2d58cd14c9f7cfb0d0d7d9d0fa27d20aef34d542245db39468cff95
 MISC metadata.xml 265 SHA256 5862fedb203791f215a21669c93e952afb5118962bc8d1ba4114305cde746084 SHA512 89cd4e9182dacecb21d1e24da00ea7d10b4e236fa432ca26341fb9ed4d96f90acf392b68809d2b4a8b2e944cad5bc32ec40826ee8105a7af489571e5b8400c35 WHIRLPOOL 79c559365aac4f8ce4c270b2d2362df345155a8524be6d4d8319bbb032045b0331d664b953c4ab01bfafed235f0209e0244dd4dee1256749511abd24afc49ffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPckpAAoJEMOx0zmdw4Z1C/EIAJ8fBwZwlM6urB8fDRZTSPlE
-rX+fx8D8U6hCOKdIF1OMRl9/4jgGe+SqMF9cnhygFsnRL3VGhH+xlSz0xVgZlG6E
-SmOOL2md3BPtGTbe49ScxuBrrj66/ALwUa4YlpKo3TVddNuFwL/7kahyi77pdMow
-aT8Hp+TuSXg9GriNbw8MyTLcjDi3jgBWPao49mwV3YRfVxckkH+NrBR9q2VaafQP
-Rl/PwDzx9s8QaNIqz0peM/zZ27SiJFfuhdICX0MhEJXkYb7UicL/oFxx9Wz7codj
-qQ7RVmnAxJnBmd5bYKO9ArDfp5Vg9ujU+Hatv3WZS1MKprVfxRdt3tsnkul0IF8=
-=Uj4x
+iQEcBAEBCAAGBQJTPdOKAAoJEMOx0zmdw4Z1TPoH/0H8r+HBbXA7e0kUS4VRdCYi
+GW79bfq7VGqUztflg2fSb6NrM9qANRdeUb1tRBrMUh84RO3GgPfJuPh3pTUQth/y
+RukF0Ra2p3TY4/K4rT91IVIdEDTiaA02YB2/CUaiZjqvbxEJlT8+oa5e9AgHZ4md
+YhQi4K3x5tO9mTnSRyShrZr9Qlnu1qKiNoykNJMiExzlDr6IhJnXjR5Q1KKs3Zdr
+Y1ypB7B1xYgJgc/Trw2M8s57hRFUka3DpqMJ2s1cnUCJ+C4+0zVeovcecjUnDIj0
+kc60rrknEgdW3FtuHSeCXysMIEGu8mbhqX7r0hHFeODmGqVebrIHipicLzXfoXc=
+=cfBp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild
index ff0c3347c6ef..1b9f7c350604 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v 1.1 2014/04/03 20:48:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v 1.2 2014/04/03 21:32:53 idl0r Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+PYTHON_COMPAT=( python2_6 python2_7 )
 
-inherit eutils python
+inherit eutils python-r1
 
 MY_PN="Nagstamon"
 #MY_P="${MY_PN}-${PV/_/}-20130729"
@@ -28,6 +26,7 @@ RDEPEND="dev-python/pygobject:2
 	dev-python/lxml
 	dev-python/beautifulsoup:python-2
 	gnome-base/librsvg
+	dev-python/keyring
 	gnome? ( dev-python/egg-python )
 	sound? ( media-sound/sox )"
 
@@ -36,8 +35,6 @@ S="${WORKDIR}/${MY_PN}"
 src_prepare() {
 	epatch "${FILESDIR}/nagstamon-0.9.11_rc1-resources.patch"
 
-	python_convert_shebangs 2 nagstamon.py
-
 	rm Nagstamon/resources/LICENSE
 	rm Nagstamon/BeautifulSoup.py
 }
@@ -46,32 +43,24 @@ src_install() {
 	# setup.py is broken
 	cd Nagstamon/
 
-	doman resources/nagstamon.1 || die
+	doman resources/nagstamon.1
 	rm resources/nagstamon.1
 
-	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${MY_PN}
-		doexe ../nagstamon.py || die
-		dosym $(python_get_sitedir)/${MY_PN}/${PN}.py /usr/bin/${PN} || die
+	newbin ../nagstamon.py nagstamon
 
+	nagstamon_install() {
 		insinto $(python_get_sitedir)/${MY_PN}
-		doins {GUI,Config,Objects,Custom,Actions}.py || die
+		doins {GUI,Config,Objects,Custom,Actions}.py
 		touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
-		doins -r Server/ || die
+		doins -r Server/
 
 		insinto /usr/share/${PN}/resources
-		doins resources/* || die
+		doins resources/*
 
-		domenu "${FILESDIR}"/${PN}.desktop || die
+		domenu "${FILESDIR}"/${PN}.desktop
 	}
 
-	python_execute_function nagstamon_install
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}
-}
+	python_foreach_impl nagstamon_install
 
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}
+	python_replicate_script "${D}/usr/bin/nagstamon"
 }