remove gnome-python-extras from RDEPEND, bug #214311. Clean up old revision.

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

6 files changed, 11 insertions, 145 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index c402eae1d9ad..67c41c5b43a1 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.85 2008/05/31 14:21:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.86 2008/06/29 20:41:36 eva Exp $
+
+  29 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/deskbar-applet-2.15.3-multilib.patch, deskbar-applet-2.20.3.ebuild,
+  -deskbar-applet-2.22.0.1.ebuild, deskbar-applet-2.22.1.ebuild,
+  deskbar-applet-2.22.2.1.ebuild:
+  remove gnome-python-extras from RDEPEND, bug #214311. Clean up old
+  revision.
 
 *deskbar-applet-2.22.2.1 (31 May 2008)
 
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild
index b9f3f87e0dd8..0062b65988ad 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild,v 1.10 2008/02/15 14:49:56 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.20.3.ebuild,v 1.11 2008/06/29 20:41:36 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -19,7 +19,6 @@ RDEPEND=">=dev-lang/python-2.4
 		 >=gnome-base/gnome-desktop-2.10
 		 >=dev-python/dbus-python-0.80.2
 		 >=dev-python/gnome-python-desktop-2.14.0
-		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
 		 eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
 		 spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild
deleted file mode 100644
index fd172d992627..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild,v 1.1 2008/03/25 23:53:45 eva Exp $
-
-inherit gnome2 eutils autotools python
-
-DESCRIPTION="An Omnipresent Versatile Search Interface"
-HOMEPAGE="http://raphael.slinckx.net/deskbar/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="eds spell"
-
-# TODO: check if gnome-doc-utils doesn't imply scrollkeeper
-
-RDEPEND=">=dev-lang/python-2.4
-		 >=x11-libs/gtk+-2.10
-		 >=dev-python/pygtk-2.10
-		 >=dev-python/gnome-python-2.10
-		 >=gnome-base/gnome-desktop-2.10
-		 >=dev-python/dbus-python-0.80.2
-		 >=dev-python/gnome-python-desktop-2.14.0
-		 >=dev-python/gnome-python-extras-2.14
-		 >=gnome-base/gconf-2
-		 eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
-		 spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=sys-devel/autoconf-2.60
-		 app-text/gnome-doc-utils
-		dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable eds evolution) --exec-prefix=/usr --disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix installing libs into pythondir
-	epatch "${FILESDIR}"/${PN}-2.19.5-multilib.patch
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
-	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-
-	ebeep 5
-	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
-	ewarn "gnome-utils.  If it is not present, the dictionary plugin will "
-	ewarn "fail silently."
-	epause 5
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_version
-	python_mod_cleanup
-}
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
index 812a57998ed8..4afebc9b1be8 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild,v 1.2 2008/05/29 17:04:56 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.1.ebuild,v 1.3 2008/06/29 20:41:36 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -21,7 +21,6 @@ RDEPEND=">=dev-lang/python-2.4
 		 >=gnome-base/gnome-desktop-2.10
 		 >=dev-python/dbus-python-0.80.2
 		 >=dev-python/gnome-python-desktop-2.14.0
-		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
 		 eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
 		 spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
index 2a14269a2cce..3d3f46983b7b 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild,v 1.1 2008/05/31 14:21:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.2.1.ebuild,v 1.2 2008/06/29 20:41:36 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -21,7 +21,6 @@ RDEPEND=">=dev-lang/python-2.4
 		 >=gnome-base/gnome-desktop-2.10
 		 >=dev-python/dbus-python-0.80.2
 		 >=dev-python/gnome-python-desktop-2.14.0
-		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
 		 eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
 		 spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.15.3-multilib.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.15.3-multilib.patch
deleted file mode 100644
index 97a308cf42fa..000000000000
--- a/gnome-extra/deskbar-applet/files/deskbar-applet-2.15.3-multilib.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/evolution/Makefile.am deskbar-applet-2.15.3/deskbar/evolution/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/evolution/Makefile.am	2006-05-22 17:30:21.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/evolution/Makefile.am	2006-06-14 13:45:10.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS)
- 
--_evolutiondir = $(pythondir)/deskbar/evolution
-+_evolutiondir = $(pyexecdir)/deskbar/evolution
- _evolution_LTLIBRARIES = _evolution.la
- _evolution_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_evolution
- _evolution_la_LIBADD = $(EVOLUTION_LIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/gdmclient/Makefile.am deskbar-applet-2.15.3/deskbar/gdmclient/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/gdmclient/Makefile.am	2006-05-31 07:36:27.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/gdmclient/Makefile.am	2006-06-14 13:46:02.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_gdmclientdir = $(pythondir)/deskbar/gdmclient
-+_gdmclientdir = $(pyexecdir)/deskbar/gdmclient
- _gdmclient_LTLIBRARIES = _gdmclient.la
- _gdmclient_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gdmclient
- _gdmclient_la_LIBADD = $(DESKBAR_LIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/gnomedesktop/Makefile.am deskbar-applet-2.15.3/deskbar/gnomedesktop/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/gnomedesktop/Makefile.am	2006-05-22 17:30:21.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/gnomedesktop/Makefile.am	2006-06-14 13:45:10.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_gnomedesktopdir = $(pythondir)/deskbar/gnomedesktop
-+_gnomedesktopdir = $(pyexecdir)/deskbar/gnomedesktop
- _gnomedesktop_LTLIBRARIES = _gnomedesktop.la
- _gnomedesktop_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gnomedesktop
- _gnomedesktop_la_LIBADD = $(DESKBAR_LIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/iconentry/Makefile.am deskbar-applet-2.15.3/deskbar/iconentry/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/iconentry/Makefile.am	2006-05-22 17:30:22.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/iconentry/Makefile.am	2006-06-14 13:45:10.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_iconentrydir = $(pythondir)/deskbar/iconentry
-+_iconentrydir = $(pyexecdir)/deskbar/iconentry
- _iconentry_LTLIBRARIES = _iconentry.la
- _iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry
- _iconentry_la_LIBADD = $(DESKBAR_LIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/keybinder/Makefile.am deskbar-applet-2.15.3/deskbar/keybinder/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/keybinder/Makefile.am	2006-05-22 17:30:22.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/keybinder/Makefile.am	2006-06-14 13:45:10.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_keybinderdir = $(pythondir)/deskbar/keybinder
-+_keybinderdir = $(pyexecdir)/deskbar/keybinder
- _keybinder_LTLIBRARIES = _keybinder.la
- _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder
- _keybinder_la_LIBADD = $(DESKBAR_LIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN deskbar-applet-2.15.3.orig/deskbar/osutils/Makefile.am deskbar-applet-2.15.3/deskbar/osutils/Makefile.am
---- deskbar-applet-2.15.3.orig/deskbar/osutils/Makefile.am	2006-05-22 17:30:22.000000000 -0400
-+++ deskbar-applet-2.15.3/deskbar/osutils/Makefile.am	2006-06-14 13:45:10.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_osutilsdir = $(pythondir)/deskbar/osutils
-+_osutilsdir = $(pyexecdir)/deskbar/osutils
- _osutils_LTLIBRARIES = _osutils.la
- _osutils_la_LDFLAGS = -module -avoid-version init_osutils
- _osutils_la_LIBADD = $(DESKBAR_LIBS)