docbook-xml-dtd-4.2 is not optional, bug #271988. Fix broken intltool rules. Clean up old revision.

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

4 files changed, 11 insertions, 152 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index ecd8dab15088..f26765315c65 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.120 2009/05/22 22:40:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.121 2009/08/06 22:46:43 eva Exp $
+
+  06 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/deskbar-applet-2.19.5-multilib.patch,
+  -deskbar-applet-2.26.1.ebuild, deskbar-applet-2.26.2.ebuild:
+  docbook-xml-dtd-4.2 is not optional, bug #271988. Fix broken intltool
+  rules. Clean up old revision.
 
   22 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
   deskbar-applet-2.24.3.ebuild, deskbar-applet-2.26.1.ebuild,
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild
deleted file mode 100644
index b6e7fd70f8fd..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.26.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 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.26.1.ebuild,v 1.2 2009/05/22 22:40:45 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 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 test"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=x11-libs/gtk+-2.12
-	>=gnome-base/gnome-desktop-2.10
-	>=gnome-base/gconf-2
-
-	>=dev-python/pygtk-2.12
-	>=dev-python/pygobject-2.15.3
-	>=dev-python/dbus-python-0.80.2
-
-	>=dev-python/gconf-python-2.22.1
-	>=dev-python/libgnome-python-2.22.1
-	>=dev-python/gnome-applets-python-2.22.0
-	>=dev-python/gnome-desktop-python-2.22.0
-	>=dev-python/gnome-keyring-python-2.22.0
-	>=dev-python/libwnck-python-2.22.0
-
-	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
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable eds evolution)
-		--exec-prefix=/usr
-		--disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	# Needed for import gnomedesktop in configure, bug #270524
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/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-extra/gnome-utils.  If it is not present, the dictionary "
-	ewarn "plugin will fail silently."
-	epause 5
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/deskbar
-	python_mod_cleanup /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
-}
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild
index 8a0b79c4cdfc..a21e2b5667c7 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.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/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild,v 1.2 2009/05/22 22:40:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild,v 1.3 2009/08/06 22:46:43 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -52,6 +52,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch
deleted file mode 100644
index 8fc73d2480b9..000000000000
--- a/gnome-extra/deskbar-applet/files/deskbar-applet-2.19.5-multilib.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/core/gnomedesktop/Makefile.am deskbar-applet-2.19.5/deskbar/core/gnomedesktop/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/core/gnomedesktop/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/core/gnomedesktop/Makefile.am	2007-07-11 14:44:32.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_gnomedesktopdir = $(pythondir)/deskbar/core/gnomedesktop
-+_gnomedesktopdir = $(pyexecdir)/deskbar/core/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/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/core/keybinder/Makefile.am deskbar-applet-2.19.5/deskbar/core/keybinder/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/core/keybinder/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/core/keybinder/Makefile.am	2007-07-11 14:44:53.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_keybinderdir = $(pythondir)/deskbar/core/keybinder
-+_keybinderdir = $(pyexecdir)/deskbar/core/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/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/handlers/evolution/Makefile.am deskbar-applet-2.19.5/deskbar/handlers/evolution/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/handlers/evolution/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/handlers/evolution/Makefile.am	2007-07-11 14:45:45.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(EVOLUTION_CFLAGS)
- 
--_evolutiondir = $(pythondir)/deskbar/handlers/evolution
-+_evolutiondir = $(pyexecdir)/deskbar/handlers/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/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/handlers/gdmclient/Makefile.am deskbar-applet-2.19.5/deskbar/handlers/gdmclient/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/handlers/gdmclient/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/handlers/gdmclient/Makefile.am	2007-07-11 14:45:35.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_gdmclientdir = $(pythondir)/deskbar/handlers/gdmclient
-+_gdmclientdir = $(pyexecdir)/deskbar/handlers/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/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/osutils/Makefile.am deskbar-applet-2.19.5/deskbar/osutils/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/osutils/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/osutils/Makefile.am	2007-07-11 15:07:35.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)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN deskbar-applet-2.19.5.orig/deskbar/ui/iconentry/Makefile.am deskbar-applet-2.19.5/deskbar/ui/iconentry/Makefile.am
---- deskbar-applet-2.19.5.orig/deskbar/ui/iconentry/Makefile.am	2007-07-09 17:25:59.000000000 -0400
-+++ deskbar-applet-2.19.5/deskbar/ui/iconentry/Makefile.am	2007-07-11 14:45:19.000000000 -0400
-@@ -1,6 +1,6 @@
- INCLUDES = $(PYTHON_INCLUDES) $(DESKBAR_CFLAGS)
- 
--_iconentrydir = $(pythondir)/deskbar/ui/iconentry
-+_iconentrydir = $(pyexecdir)/deskbar/ui/iconentry
- _iconentry_LTLIBRARIES = _iconentry.la
- _iconentry_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_iconentry
- _iconentry_la_LIBADD = $(DESKBAR_LIBS)