DTD is actually needed for build, bug #296717. Clean up old revision.

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

5 files changed, 22 insertions, 105 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index cc9f421bd53d..0293a5a4f6b2 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.129 2010/01/18 00:02:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.130 2010/02/14 23:39:38 eva Exp $
+
+  14 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.24.3.ebuild, deskbar-applet-2.26.2.ebuild,
+  deskbar-applet-2.26.2-r1.ebuild, deskbar-applet-2.28.0.ebuild:
+  DTD is actually needed for build, bug #296717. Clean up old revision.
+
+  14 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.24.3.ebuild, deskbar-applet-2.26.2.ebuild,
+  deskbar-applet-2.26.2-r1.ebuild, deskbar-applet-2.28.0.ebuild:
+  DTD is actually needed for build, bug #296717. Clean up old revision.
 
   18 Jan 2010; Jeroen Roovers <jer@gentoo.org> deskbar-applet-2.26.2.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild
deleted file mode 100644
index 56f27be11132..000000000000
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.24.3.ebuild
+++ /dev/null
@@ -1,93 +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.24.3.ebuild,v 1.11 2009/05/22 22:40:45 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit autotools 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
-	>=dev-python/dbus-python-0.80.2
-
-	>=dev-python/pygtk-2.12
-	>=dev-python/pygobject-2.12
-	>=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/gnome-vfs-python-2.22.1
-	>=dev-python/libwnck-python-2.22.0
-
-	>=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
-	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
-
-	# Fix installing libs into pythondir
-	epatch "${FILESDIR}/${PN}-2.24.1-multilib.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# needed to build on a libtool-1 system, bug #243822
-	rm m4/lt* m4/libtool.m4 ltmain.sh
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	# Needed for import gnomedesktop in configure, bug #270524
-	addpredict "$(unset HOME; echo ~)/.gnome2"
-
-	gnome2_src_compile
-}
-
-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-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-r1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
index 3b7a04c0147c..61a2305d4832 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild,v 1.4 2009/10/30 16:19:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.26.2-r1.ebuild,v 1.5 2010/02/14 23:39:38 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -12,7 +12,7 @@ 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"
+IUSE="eds spell"
 
 RDEPEND=">=dev-lang/python-2.4
 	>=x11-libs/gtk+-2.12
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.2 )"
+	~app-text/docbook-xml-dtd-4.2"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
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 84cf2e852ee0..93666f7ae0cf 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-2010 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.8 2010/01/18 00:02:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.26.2.ebuild,v 1.9 2010/02/14 23:39:38 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -12,7 +12,7 @@ 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"
+IUSE="eds spell"
 
 RDEPEND=">=dev-lang/python-2.4
 	>=x11-libs/gtk+-2.12
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.2 )"
+	~app-text/docbook-xml-dtd-4.2"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild
index 1cee346292b4..9f5f373a1f9d 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild
@@ -1,6 +1,6 @@
-# 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/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild,v 1.1 2009/10/29 21:56:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.28.0.ebuild,v 1.2 2010/02/14 23:39:38 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -12,7 +12,7 @@ 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"
+IUSE="eds spell"
 
 RDEPEND=">=dev-lang/python-2.4
 	>=x11-libs/gtk+-2.12
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.2 )"
+	~app-text/docbook-xml-dtd-4.2"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"