Add gnome-panel to RDEPEND, bug #253164.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64

6 files changed, 49 insertions, 98 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index ba7bde60e680..36b4a2e97bb6 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/alacarte
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.60 2008/11/13 19:25:14 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.61 2009/01/03 15:21:40 eva Exp $
+
+  03 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/alacarte-0.11.3-python-2.5.patch, -alacarte-0.11.4.ebuild,
+  alacarte-0.11.5.ebuild, alacarte-0.11.6.ebuild:
+  Add gnome-panel to RDEPEND, bug #253164.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> alacarte-0.11.5.ebuild:
   Marking alacarte-0.11.5 ppc64 stable for bug 236971
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index b2712e065ad7..5d28de7f2c9e 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,10 +1,17 @@
-AUX alacarte-0.11.3-python-2.5.patch 524 RMD160 a69623b5668391d213060e883aa011ca0b515de8 SHA1 84e0770274ec1ec64c27bf94aa46aa85547c0bf2 SHA256 869ad68a1ca709305eaa0cbdd07d5637e91b9151f389bd9fb5e95513c3f09bb2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alacarte-0.11.5-python-2.6.patch 448 RMD160 db11ef6e261fa0b72af5eeb02a810834288898fb SHA1 e7c0dfed53e4ef4ce06342dea5c8b675b516a703 SHA256 ea7a0b5962de081766809268ce226bd6b606e15d76110b32157af6f3a0c1affa
-DIST alacarte-0.11.4.tar.bz2 204278 RMD160 6c1241a7e463f50981369e32268aca2363064420 SHA1 9aa2294dd7d2429e1cd3ac66608b11c102a6d7e3 SHA256 3238358221c4e8c436b731bfc67c6f2741578eddb28ac6b86a20d1559fd84f99
 DIST alacarte-0.11.5.tar.bz2 204512 RMD160 de4c66b0c0fb5e4b49be6de7ea83f73b159a6ad4 SHA1 33ed1de8d2297226f5b055eb223789574b005dcf SHA256 1aa7fd9cb1947987c3d047a53fe7bdeeafb31d046a6fcda02cfc5ef95ed6f7fa
 DIST alacarte-0.11.6.tar.bz2 177406 RMD160 1a887c7e6f3ac2a61d32afc6adfa4be38c52a889 SHA1 8e570b952cba1b13cce0f8dc005036a48e8e96f8 SHA256 7ca56a9f9fc1e57354d4170349d23e4db57d351b17b91f5629e0709284b49aa3
-EBUILD alacarte-0.11.4.ebuild 1354 RMD160 c7af218f09c490b8ff515ebc8fca0ed4044874d7 SHA1 eabad84fdbd50bbd734872935f07ce258e6d6569 SHA256 e4b9221d58ec678aa1221f5608eb6c64645c05be7035b7ca8a5bf77e68a52401
-EBUILD alacarte-0.11.5.ebuild 1356 RMD160 2f44943d02d353845f2e884e3cf08aa1eb5464ec SHA1 e6831e3e91c67e2f5203fb3389d941f9f97b26a9 SHA256 9db2bb7425bfd59bbdc18f3b8b5cac7c08b5097a3c3d39d6f1dd81ec0516c05b
-EBUILD alacarte-0.11.6.ebuild 1263 RMD160 73f745d66bbf24caaab2cecd0038fb2e68deaebb SHA1 7d79a89c2ee7688019e9f69a1e4fa2e4e29abc1b SHA256 7919280dc06142873517f5c98dfb5ceae43fb622c48d2eca2ccd003797f0c6f4
-MISC ChangeLog 7397 RMD160 7633ce204b1e7310e1dab88f49eb6d2149d071b5 SHA1 9b06f4470e710f4ccf53f2b67e66e7d22282aad4 SHA256 3fea4e384028904e8780e9bc61a142b1269f5d62feaa7db43fe66dc819e88a05
+EBUILD alacarte-0.11.5.ebuild 1417 RMD160 c824a8915698bd96736bed4f87a3f2a3e8cad05a SHA1 d51889f627d1aba95333a3c54fc8572ed927727c SHA256 020052c088421d7eb588a839c71e429d850b08def4d84d265a07e495e330bec9
+EBUILD alacarte-0.11.6.ebuild 1361 RMD160 b4f9497db2def1f5282ed2cd3ef3d93b2d2b7993 SHA1 4b669c6111b7618744a4f3d4824ccf0f9b74c9f1 SHA256 a13a17fccf7de447f763573a7dab4716a3b62bd5bbb6965bd9755e3842c745f0
+MISC ChangeLog 7610 RMD160 ac72de3dc2a8a0db8ce345408f9873a159b48f80 SHA1 673cf325a3938b3a63e31b0477107c6f66fe5111 SHA256 ab6d5373c0d590b44dd4b90c5cbf438af3e5b1d57d740643739d5367f24ff20d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklfgooACgkQ1fmVwcYIWAak9ACdHpaQgcMskNZZ48vLlnP+wL4B
+Ca0An1GBMXaF5kjFHju+twvvrC+oNBop
+=zFeN
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/alacarte/alacarte-0.11.4.ebuild b/x11-misc/alacarte/alacarte-0.11.4.ebuild
deleted file mode 100644
index 4a6801969c25..000000000000
--- a/x11-misc/alacarte/alacarte-0.11.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.4.ebuild,v 1.7 2008/03/22 03:46:37 dang Exp $
-
-inherit gnome2 python eutils autotools
-
-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
-
-RDEPEND=">=dev-lang/python-2.4
-		 >=dev-python/pygtk-2.8
-		 >=gnome-base/gnome-menus-2.18
-		 >=dev-python/gnome-python-2.18"
-DEPEND="${RDEPEND}
-		  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
-
-	epatch "${FILESDIR}"/${PN}-0.11.3-python-2.5.patch
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	eautoreconf
-	intltoolize --force
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup
-}
diff --git a/x11-misc/alacarte/alacarte-0.11.5.ebuild b/x11-misc/alacarte/alacarte-0.11.5.ebuild
index c45d44c9a353..003f54577412 100644
--- a/x11-misc/alacarte/alacarte-0.11.5.ebuild
+++ b/x11-misc/alacarte/alacarte-0.11.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5.ebuild,v 1.8 2008/11/13 19:25:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.5.ebuild,v 1.9 2009/01/03 15:21:40 eva Exp $
 
 inherit gnome2 python eutils autotools
 
@@ -12,14 +12,18 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 SLOT=0
 
-RDEPEND=">=dev-lang/python-2.4
-		 >=dev-python/pygtk-2.8
-		 >=gnome-base/gnome-menus-2.18
-		 >=dev-python/gnome-python-2.18"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19"
+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"
 
diff --git a/x11-misc/alacarte/alacarte-0.11.6.ebuild b/x11-misc/alacarte/alacarte-0.11.6.ebuild
index f4665136de93..6b2ea3b2f0ab 100644
--- a/x11-misc/alacarte/alacarte-0.11.6.ebuild
+++ b/x11-misc/alacarte/alacarte-0.11.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/09/27 16:00:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.6.ebuild,v 1.2 2009/01/03 15:21:40 eva Exp $
 
 inherit gnome2 python eutils
 
@@ -12,14 +12,18 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 SLOT=0
 
-RDEPEND=">=dev-lang/python-2.4
-		 >=dev-python/pygtk-2.8
-		 >=gnome-base/gnome-menus-2.18
-		 >=dev-python/gnome-python-2.18"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19"
+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"
 
@@ -46,6 +50,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
 }
diff --git a/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch b/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch
deleted file mode 100644
index 62308643279c..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN alacarte-0.11.3.orig/configure.ac alacarte-0.11.3/configure.ac
---- alacarte-0.11.3.orig/configure.ac	2007-02-12 16:16:54.000000000 -0500
-+++ alacarte-0.11.3/configure.ac	2007-06-11 13:34:23.000000000 -0400
-@@ -19,7 +19,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
- AM_GLIB_GNU_GETTEXT
- IT_PROG_INTLTOOL([0.35.0])
- 
--AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0)
-+AM_PATH_PYTHON_VERSION(2.5, 2.5.0, 2.4, 2.4.0)
- 
- PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15)
-