Use Python 2.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 37 insertions, 29 deletions

diff --git a/x11-misc/menumaker/ChangeLog b/x11-misc/menumaker/ChangeLog
index e3064d792189..7cbfa4a8575b 100644
--- a/x11-misc/menumaker/ChangeLog
+++ b/x11-misc/menumaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/menumaker
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/menumaker/ChangeLog,v 1.7 2009/02/25 16:28:19 neurogeek Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/menumaker/ChangeLog,v 1.8 2010/04/22 19:25:32 arfrever Exp $
+
+  22 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  menumaker-0.99.7.ebuild:
+  Use Python 2.
 
 *menumaker-0.99.7 (25 Feb 2009)
 
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 02e8338855cf..d59b55f018f6 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST MenuMaker-0.17.tar.gz 49745 RMD160 070d6381d92f63cc95064b3743ddfe88cc5f157d SHA1 3abe59454941e70de2b6b4b80bb7049fbed6f7a8 SHA256 fbfb3e53ab7f935adeaac0c33067167a87233ca9218488d5cfbb99bd4c09801d
 DIST menumaker-0.99.7.tar.gz 138857 RMD160 cc40fc4fb64373a7adef716af89989c10816001a SHA1 7ff4ccd77fac895460416115d9e0beb07e192649 SHA256 dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445
 EBUILD menumaker-0.17.ebuild 878 RMD160 c37c4e933d2c660c29be01768b3c4568898b77ad SHA1 863b7129a7c22a8ffad30a70b3d8a37f2937b738 SHA256 c5f800739868c722c9a95f4e3550e07650804f9b130486bf012ad8fee3714201
-EBUILD menumaker-0.99.7.ebuild 958 RMD160 279d329b78b38271c008c4f7c43bd413002521ea SHA1 55b5a598985ec1b31bab41d9394a67f61735f395 SHA256 9c0202ca310b0ca78e6b7bc2e75c64f3f96e512561e44ec3dcbcdfa5ff9d050b
-MISC ChangeLog 1808 RMD160 77c67dca8e18f4da945d94f49690a5a66d5553b9 SHA1 259ca515754ddfb50c01d1fde99ddeff7df4e6ca SHA256 4ae5d791c30937b11de10ef5946a52ba52d53540fa589ecdf9441300b1ebbc1b
+EBUILD menumaker-0.99.7.ebuild 1216 RMD160 7c7b3085eba40586110656cf2fbbe01c0a3cae9e SHA1 70d140bbb84ee51016a031042f94b89b9a49cce8 SHA256 60e0821b70fad7726df91f16d9576c1f94fc2afc9bfd2683563acaad94c7fd8d
+MISC ChangeLog 1924 RMD160 7c501084bc63dd1fb24298eddad2655ed0f54685 SHA1 4a7cab3f6f0b2fff3ed5f39dd27f8a6ded907696 SHA256 4d599a7df5274bf16f6294f6cfebcabff4675d0ad458858c2699f96e90eb233d
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmlccEACgkQdIssYB9vBoMgIwCeM+shmdtjRn3CJp+Fru4iCgV5
-gGYAnRJMmlRdV/Dl924relApTt9vlVzb
-=kSrY
------END PGP SIGNATURE-----
diff --git a/x11-misc/menumaker/menumaker-0.99.7.ebuild b/x11-misc/menumaker/menumaker-0.99.7.ebuild
index 76e89b8318e6..15bae75db592 100644
--- a/x11-misc/menumaker/menumaker-0.99.7.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.7.ebuild
@@ -1,8 +1,11 @@
-# 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/x11-misc/menumaker/menumaker-0.99.7.ebuild,v 1.1 2009/02/25 16:28:19 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/menumaker/menumaker-0.99.7.ebuild,v 1.2 2010/04/22 19:25:32 arfrever Exp $
 
-inherit autotools
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit python
 
 DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
 HOMEPAGE="http://menumaker.sourceforge.net/"
@@ -13,31 +16,42 @@ SLOT="0"
 KEYWORDS="~amd64 ~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc"
 
-DEPEND="virtual/python
-		doc? ( sys-apps/texinfo )"
-MAKEOPTS="-j1"
+DEPEND="doc? ( sys-apps/texinfo )"
+RDEPEND=""
+
+pkg_setup() {
+	python_set_active_version 2
+}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
+src_configure() {
+	econf PYTHON="$(PYTHON)"
 }
 
 src_compile() {
-	econf
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 	if use doc; then
-		cd "${S}/doc" && make html || die "Could not build docs"
+		cd doc
+		emake html || die "Generation of documentation failed"
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	find "${D}" "(" -name "*.pyc" -o -name "*.pyo" ")" -print0 | xargs -0 rm -fr
+
 	dodoc ChangeLog README NEWS AUTHORS INSTALL
 
 	if use doc; then
-		dohtml "${S}"/doc/mmaker.html/*
+		dohtml doc/mmaker.html/*
 	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/menumaker
+}
 
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/menumaker
 }