move to EAPI=4, byte compile python code, #398625

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 54 insertions, 39 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index b61c72c2443f..bc22c971084f 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.63 2012/01/18 22:37:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.64 2012/01/20 09:33:31 jlec Exp $
+
+  20 Jan 2012; Justin Lecher <jlec@gentoo.org> virt-manager-0.9.0-r3.ebuild,
+  virt-manager-9999.ebuild:
+  move to EAPI=4, byte compile python code, #398625
 
   18 Jan 2012; Doug Goldstein <cardoe@gentoo.org> virt-manager-0.9.0-r3.ebuild:
   Remove doins that's no longer necessary.
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 84c8897cfbcf..7832d8ff60e9 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX virt-manager-0.8.7-vcpu-stats.patch 876 RMD160 f77163cf34423675130f1c8368261b1ccfc77715 SHA1 0f30def046c2407e8c1ea2cf45aebb9cfd6f71c5 SHA256 43dd7dec0e01d7c82085d8f97767f0a7403554d1cea9f132fe4af5f01b0315a3
 DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5
 DIST virt-manager-0.9.0-bp-1.tar.bz2 707 RMD160 e4614dd36bd1a334080dcb712d731665944ef705 SHA1 dc007460bb721eb385c02de671045820926626b6 SHA256 823ae2aea4515e47db9791e3edda78530223a48ba2fa0bdb33a328e85e64f284
@@ -6,8 +9,15 @@ DIST virt-manager-0.9.0.tar.gz 1951176 RMD160 f3af53591babe3d95c4017d19a292fd6c1
 EBUILD virt-manager-0.8.7-r3.ebuild 2926 RMD160 79022b8089c4d9145906ddd390d9c3d0e844ea66 SHA1 6a39b37c1f3c518953017242976a4307e7b1e47f SHA256 5cc419c5e08b03c7067e42042eb679b595555dff620b87ab322fa51b7ae19628
 EBUILD virt-manager-0.8.7.ebuild 2063 RMD160 cfe31b764bd7b073a322ae63041dbb70535838a7 SHA1 81c542cc778c600a262a281fc0e3558b6c881603 SHA256 5e46b8dcd6b068ec66b99bbc0e5b5e958340e21b6a4770a246e36f29af1449da
 EBUILD virt-manager-0.9.0-r1.ebuild 2944 RMD160 3c04187ac6ee91335d7ca78654e27bc5b0de22a4 SHA1 2cefc600b311b42545150aca6cafae552510bc1a SHA256 a09248a57e6001f478a60e8254087cbe28ccdabeafeb107d40d39a2f6369b839
-EBUILD virt-manager-0.9.0-r3.ebuild 2355 RMD160 f9575567cae67f71ffe568da203989e28d02a988 SHA1 dfc913e5291f74d85f87e30d73c7ea5982eba545 SHA256 cce4bda86c2859cacfd647b7e0c0d43f87fbf2891288362e18cec5882dfe11d7
+EBUILD virt-manager-0.9.0-r3.ebuild 2542 RMD160 7c06475faeae3e6a22c3d0318cd789eff95d145f SHA1 213e402b047147ac33a36c66daff66a57b70dd15 SHA256 9bf46eab64d19016cc75ec920be66a6da807434e13e385df3c677b88de6c019c
 EBUILD virt-manager-0.9.0.ebuild 2878 RMD160 35e153b4ad10b8211eaed44e1ed2a716ed0a80cd SHA1 6fbb81de4337951ebfde840eb122b63ccd20f7b8 SHA256 d5f3c0520ac8b711b1233a4bd64d00c7d5e01b8a3214e5222d73471cbf8bc279
-EBUILD virt-manager-9999.ebuild 2877 RMD160 4552e0051034353f10674176343c5e6547072999 SHA1 6396698afcd615a57d70412cc0b7fc61226e0aff SHA256 dfbbf71b9a70d08e17ccbe8c31b065fdb736fb1a0144535466fe485dcd360b22
-MISC ChangeLog 12208 RMD160 880011bc9c824f1f4d46f9c818e16ff64a72c0ea SHA1 adc3a53999675623d7978d68004f8b662b2e3784 SHA256 381c114e9488724d07c8da031ae1ed3d25222b03bcb0d886044853718f00dd70
+EBUILD virt-manager-9999.ebuild 2474 RMD160 59bf483726e2a4491e9b8d2a165fb59115efca74 SHA1 2bd4a09f94c8ed545229a90062f9819ecfd8f726 SHA256 e9efd1dd0bb247179f9ef5b3119fe2269716415769809dd6bfd33ff4b476882b
+MISC ChangeLog 12364 RMD160 0db2906bceeb6248217366571e32dbc506b94cfe SHA1 3e0f1091800172f046c2cda44e2b329062420e4a SHA256 14736efb12d44c3a463aed05d6627803e45a6dcf1a291714a9ae55a6a5c6f0a2
 MISC metadata.xml 641 RMD160 e8662f1753b0ffab34fb8539ec9c336f2e3cd769 SHA1 09b8ce549752a40c389c0e28279c2608ed8780af SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk8ZNPEACgkQgAnW8HDreRZW/gCgqtYtcFp68/2H4CaRGn9amj+z
+/k4AnRmHXa7+csxJT/V1/Ppr2Zlekflj
+=JwDu
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild
index 6f7589843abd..bffc1a4094bb 100644
--- a/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild,v 1.2 2012/01/18 22:37:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.0-r3.ebuild,v 1.3 2012/01/20 09:33:31 jlec Exp $
 
 BACKPORTS=4
 
-EAPI=2
+EAPI=4
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="--without-tui"
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -70,17 +72,23 @@ src_prepare() {
 		# unless we do this
 		touch config.rpath
 
-		rm -rf config.status
-		intltoolize --automake --copy --force
-		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
+		rm -rf config.status || die
+		intltoolize --automake --copy --force || die
+		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
 		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
-			po/Makefile.in.in
+			po/Makefile.in.in || die
 		eautoreconf
 	fi
 
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+	gnome2_pkg_postrm
 }
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 486b2c492858..8ac09780daa3 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.7 2011/07/27 15:37:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.8 2012/01/20 09:33:31 jlec Exp $
 
 #BACKPORTS=
 
-EAPI=2
+EAPI=4
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
@@ -26,7 +26,7 @@ else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
 		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
 	KEYWORDS="~amd64 ~x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.500.6"
+	VIRTINSTDEP=">=app-emulation/virtinst-0.600.0-r2"
 fi
 
 DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
@@ -47,13 +47,16 @@ RDEPEND=">=dev-python/pygtk-1.99.12
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	policykit? ( sys-auth/polkit )
 	spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
+#	tui? ( >=dev-python/new_syrup-0.1.2 )"
 DEPEND="${RDEPEND}
 	app-text/rarian
 	dev-util/intltool"
 
-# The TUI (terminal UI) requires newt_syrup which is not packaged on
-# Gentoo. bug #356711
+pkg_setup() {
 G2CONF="--without-tui"
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_prepare() {
 	sed -e "s/python/python2/" -i src/virt-manager.in || \
@@ -68,33 +71,23 @@ src_prepare() {
 		# unless we do this
 		touch config.rpath
 
-		rm -rf config.status
-		intltoolize --automake --copy --force
-		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
+		rm -rf config.status || die
+		intltoolize --automake --copy --force || die
+		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
 		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
-			po/Makefile.in.in
+			po/Makefile.in.in || die
 		eautoreconf
 	fi
 
 	gnome2_src_prepare
 }
 
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/virt-manager/pixmaps/
-	doins "${S}"/pixmaps/*.png
-	doins "${S}"/pixmaps/*.svg
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
-	doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
-	doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
-
-	insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
-	doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+	gnome2_pkg_postinst
+}
 
-	insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
-	doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+	gnome2_pkg_postrm
 }