Bump to 0.12.1. Clean up revisions.

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

4 files changed, 12 insertions, 114 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index ab7c89b3e907..c28bbc3cf218 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.83 2009/05/10 15:01:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.84 2009/05/14 23:19:01 eva Exp $
+
+*alacarte-0.12.1 (14 May 2009)
+
+  14 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -alacarte-0.11.6.ebuild, -alacarte-0.11.8.ebuild, -alacarte-0.11.9.ebuild,
+  +alacarte-0.12.1.ebuild:
+  Bump to 0.12.1. Clean up revisions.
 
   10 May 2009; Jeroen Roovers <jer@gentoo.org> alacarte-0.11.10.ebuild:
   Stable for HPPA (bug #266717).
diff --git a/x11-misc/alacarte/alacarte-0.11.6.ebuild b/x11-misc/alacarte/alacarte-0.11.6.ebuild
deleted file mode 100644
index e43f530bafb3..000000000000
--- a/x11-misc/alacarte/alacarte-0.11.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.6.ebuild,v 1.8 2009/02/07 00:54:55 jer Exp $
-
-inherit gnome2 python eutils
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://www.realistanew.com/projects/alacarte"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-SLOT=0
-
-common_depends=">=dev-lang/python-2.4
-	>=dev-python/pygtk-2.8
-	>=gnome-base/gnome-menus-2.18
-	>=dev-python/gnome-python-2.18"
-
-RDEPEND="${common_depends}
-	>=gnome-base/gnome-panel-2.16"
-
-DEPEND="${common_depends}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	if ! built_with_use gnome-base/gnome-menus python ; then
-		eerror "You must emerge gnome-base/gnome-menus with the python USE flag"
-		die "alacarte needs python support in gnome-base/gnome-menus"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.11.8.ebuild b/x11-misc/alacarte/alacarte-0.11.8.ebuild
deleted file mode 100644
index 40113fb646d7..000000000000
--- a/x11-misc/alacarte/alacarte-0.11.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.8.ebuild,v 1.7 2009/04/12 21:01:29 bluebird Exp $
-
-inherit gnome2 python eutils
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://www.realistanew.com/projects/alacarte"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-SLOT=0
-
-common_depends=">=dev-lang/python-2.4
-	>=dev-python/pygobject-2.15.1
-	>=dev-python/pygtk-2.8
-	>=gnome-base/gnome-menus-2.22.2
-	>=dev-python/libgnome-python-2.18"
-
-RDEPEND="${common_depends}
-	>=gnome-base/gnome-panel-2.16"
-
-DEPEND="${common_depends}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	if ! built_with_use gnome-base/gnome-menus python ; then
-		eerror "You must emerge gnome-base/gnome-menus with the python USE flag"
-		die "alacarte needs python support in gnome-base/gnome-menus"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.11.9.ebuild b/x11-misc/alacarte/alacarte-0.12.1.ebuild
index 9aa99e888f54..3966828c4c99 100644
--- a/x11-misc/alacarte/alacarte-0.11.9.ebuild
+++ b/x11-misc/alacarte/alacarte-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.9.ebuild,v 1.2 2009/03/21 11:13:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.12.1.ebuild,v 1.1 2009/05/14 23:19:01 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -31,6 +31,8 @@ DEPEND="${common_depends}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
+	gnome2_src_prepare
+
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
@@ -38,9 +40,8 @@ src_prepare() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_version
 	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/Alacarte
+	python_mod_optimize $(python_get_sitedir)/Alacarte
 }
 
 pkg_postrm() {