Update EAPI. Unset PYTHON_MODNAME variable, which is used only by distutils.eclass, which isn't inherited here. Fix calls to python_mod_optimize() and python_mod_cleanup() (bug #329141).

(Portage version: 2.2_rc97/cvs/Linux x86_64)

8 files changed, 40 insertions, 46 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 4b7a0624e1c6..3fc823e4f6e0 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.64 2010/07/11 11:48:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.65 2010/10/16 14:50:34 arfrever Exp $
+
+  16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  xen-tools-3.4.0.ebuild, xen-tools-3.4.0-r1.ebuild, xen-tools-3.4.1.ebuild,
+  xen-tools-3.4.1-r1.ebuild, xen-tools-3.4.2.ebuild, xen-tools-3.4.3.ebuild,
+  xen-tools-4.0.0.ebuild:
+  Update EAPI. Unset PYTHON_MODNAME variable, which is used only by
+  distutils.eclass, which isn't inherited here. Fix calls to
+  python_mod_optimize() and python_mod_cleanup() (bug #329141).
 
 *xen-tools-3.4.3 (11 Jul 2010)
 
diff --git a/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild
index 0f04707b2bdc..8f89ccdcea43 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild,v 1.2 2009/06/27 07:12:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild,v 1.3 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -53,8 +53,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -231,9 +229,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-3.4.0.ebuild b/app-emulation/xen-tools/xen-tools-3.4.0.ebuild
index 49925b78de88..eda282b9b9ae 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.0.ebuild,v 1.2 2009/06/27 07:12:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.0.ebuild,v 1.3 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -53,8 +53,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -228,9 +226,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild
index b738b214c63b..bb5254861e21 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild,v 1.3 2009/11/05 23:15:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.1-r1.ebuild,v 1.4 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -54,8 +54,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -232,9 +230,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-3.4.1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.1.ebuild
index e83adb251224..5dc11bb2a9c2 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.1.ebuild,v 1.2 2009/08/19 15:06:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.1.ebuild,v 1.3 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -53,8 +53,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -231,9 +229,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2.ebuild
index e30362476553..16c6798cde1b 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2.ebuild,v 1.4 2010/06/24 01:39:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2.ebuild,v 1.5 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -54,8 +54,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -235,9 +233,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-3.4.3.ebuild b/app-emulation/xen-tools/xen-tools-3.4.3.ebuild
index 92cbe736cfb8..87956dced19d 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.3.ebuild,v 1.1 2010/07/11 11:48:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.3.ebuild,v 1.2 2010/10/16 14:50:34 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic eutils multilib python
 
@@ -54,8 +54,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -235,9 +233,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }
diff --git a/app-emulation/xen-tools/xen-tools-4.0.0.ebuild b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild
index 12857efa4008..bee1f57c620a 100644
--- a/app-emulation/xen-tools/xen-tools-4.0.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.0.0.ebuild,v 1.4 2010/06/25 16:43:55 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.0.0.ebuild,v 1.5 2010/10/16 14:50:34 arfrever Exp $
 
 EAPI="3"
 
@@ -51,8 +51,6 @@ RDEPEND="${CDEPEND}
 	)
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-PYTHON_MODNAME="xen grub"
-
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
 QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
@@ -263,9 +261,9 @@ pkg_postinst() {
 		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
 	fi
 
-	python_mod_optimize
+	python_mod_optimize $(use pygrub && echo grub) xen
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(use pygrub && echo grub) xen
 }