Add docbook-xml-dtd dependency, bug #258553.

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

6 files changed, 19 insertions, 74 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 19ef7568fe86..38ad51b033b3 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.109 2009/01/26 22:08:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.110 2009/02/25 23:35:05 eva Exp $
+
+  25 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gucharmap-2.24.2-nogconf.patch, gucharmap-1.10.2.ebuild,
+  gucharmap-2.22.3.ebuild, -gucharmap-2.24.2.ebuild,
+  gucharmap-2.24.3.ebuild:
+  Add docbook-xml-dtd dependency, bug #258553.
 
 *gucharmap-2.24.3 (26 Jan 2009)
 
diff --git a/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch b/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch
deleted file mode 100644
index b7eb50881e7a..000000000000
--- a/gnome-extra/gucharmap/files/gucharmap-2.24.2-nogconf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/gucharmap/gucharmap-settings.c	2008-12-02 00:55:20.000000000 +0100
-+++ b/gucharmap/gucharmap-settings.c	2008-12-02 00:57:50.000000000 +0100
-@@ -238,13 +238,7 @@
-   return FALSE;
- }
- 
--void
--gucharmap_settings_set_chapter (gchar *chapter)
--{
--  return;
--}
--
--ChaptersMode
-+GucharmapChaptersMode
- gucharmap_settings_get_chapters_mode (void)
- {
-   return get_default_chapters_mode();
diff --git a/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild b/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild
index 3c75ddceea32..b068b1042335 100644
--- a/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-1.10.2.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/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild,v 1.8 2008/04/20 02:10:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.10.2.ebuild,v 1.9 2009/02/25 23:35:05 eva Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gucharmap.sourceforge.net/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="cjk gnome"
 
 RDEPEND=">=dev-libs/glib-2.3
diff --git a/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild b/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild
index e223acf17fab..4128f6a6ca64 100644
--- a/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.22.3.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/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild,v 1.7 2008/11/13 19:16:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.22.3.ebuild,v 1.8 2009/02/25 23:35:05 eva Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://gucharmap.sourceforge.net/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="cjk gnome"
+IUSE="cjk gnome test"
 
 # gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
 # would probably prefer non-working help button over a libgnome dependency, while
@@ -24,7 +24,8 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
 
 DOCS="ChangeLog NEWS README TODO"
 
diff --git a/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild b/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild
deleted file mode 100644
index 15aed93b4fdc..000000000000
--- a/gnome-extra/gucharmap/gucharmap-2.24.2.ebuild
+++ /dev/null
@@ -1,46 +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/gucharmap/gucharmap-2.24.2.ebuild,v 1.1 2008/12/14 16:00:16 eva Exp $
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Unicode character map viewer"
-HOMEPAGE="http://gucharmap.sourceforge.net/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk doc gnome python"
-
-# gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
-# would probably prefer non-working help button over a libgnome dependency, while
-# GNOME will have libgnome pulled in by other stuff still either way. Reconsider
-# once libgnome can truely die (gnome 2.24 material)
-RDEPEND=">=dev-libs/glib-2.16.3
-	>=x11-libs/pango-1.2.1
-	>=x11-libs/gtk+-2.13.6
-	gnome? ( gnome-base/gconf )
-	python? ( >=dev-python/pygtk-2.7.1 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-DOCS="ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		$(use_enable gnome gconf)
-		$(use_enable cjk unihan)
-		$(use_enable python python-bindings)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation with USE="-gnome", bug #248289
-	epatch "${FILESDIR}/${P}-nogconf.patch"
-}
diff --git a/gnome-extra/gucharmap/gucharmap-2.24.3.ebuild b/gnome-extra/gucharmap/gucharmap-2.24.3.ebuild
index b31e19e1121c..6a671a560f8c 100644
--- a/gnome-extra/gucharmap/gucharmap-2.24.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-2.24.3.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/gucharmap/gucharmap-2.24.3.ebuild,v 1.1 2009/01/26 22:08:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.24.3.ebuild,v 1.2 2009/02/25 23:35:05 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://gucharmap.sourceforge.net/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk doc gnome python"
+IUSE="cjk doc gnome python test"
 
 # gnome-base/libgnome is still used as "exec gnome-open", but our non-GNOME friends
 # would probably prefer non-working help button over a libgnome dependency, while
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40
 	>=app-text/gnome-doc-utils-0.9.0
-	doc? ( >=dev-util/gtk-doc-1.0 )"
+	doc? ( >=dev-util/gtk-doc-1.0 )
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
 
 DOCS="ChangeLog NEWS README TODO"