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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 27 insertions, 85 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/Manifest b/gnome-extra/gucharmap/Manifest
index 3624e211306b..97d2063007bf 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gucharmap-2.24.2-nogconf.patch 387 RMD160 57fe6d65044eb678c960e508261ac64a4fefe00c SHA1 2b767793d0c0506b90dbbcb1539972cc9d8cf404 SHA256 9aaa125af9a8245b3cfd285f484c865a89e364b470f1297714ef970a779919f4
 DIST gucharmap-1.10.2.tar.bz2 2514969 RMD160 de189901ea4f2e9eabfbd475cea402e2125f57db SHA1 b9f1f1eddfce148e733f6a2b43f3108e8edbb26b SHA256 586d55f1c61b5daa2237159aa8e7c80a397dcd3c4b7f4fdab4cd6356af808dc6
 DIST gucharmap-2.22.3.tar.bz2 2634874 RMD160 a9abf6ef64125edbf079d83113dd6ae99b2fcf70 SHA1 b4d46d813596e2c77612c374267a63a3a45ca040 SHA256 5d8a15ce45551e073bbaa7ef7b55b3ee259c19ebec14990f4305dfd765106c62
-DIST gucharmap-2.24.2.tar.bz2 2922955 RMD160 8707a190f31e814b38d2e4cd65d9a6407797a2d6 SHA1 c5184c4cc8bf086548521c7653aa508883c2bdba SHA256 1774b37cf529c5320e93de5e327fd7c716d84a99b959fa1ef2e8dcf72c5ee23c
 DIST gucharmap-2.24.3.tar.bz2 2923913 RMD160 eda9ab11f5ddb5446f5d85b7e551836bab4a857f SHA1 bf622acdbc1e682193532cc2b3a1e09c05af7bfa SHA256 6d9cbe1b581bd75eda9947000d8dd10503cc543ce3d49c202fb044236bd6b60a
-EBUILD gucharmap-1.10.2.ebuild 1063 RMD160 ca7c6124bd7c9860b2c004d3066715e45f35a473 SHA1 566826cce3bb1c5c3f4380fe8a01a03b65d74853 SHA256 bc5d5e92906c9c579526c84b27e2e082d200cc36f1c22783f0508396fd16d2ff
-EBUILD gucharmap-2.22.3.ebuild 1150 RMD160 f67ed7807648a685b048b330af6582eb2fa7ed02 SHA1 c8c7745ae78278f04f6fbac35ab39ca74dd2864f SHA256 f18f99b87a2a6ed5d280a5507ee2387e541ea224c8d96afbd2cda96d423e6691
-EBUILD gucharmap-2.24.2.ebuild 1417 RMD160 4c40c192959174d6b89dc79cf8c3a794520cdac9 SHA1 9f5f1b7c0829c314ca36faed79576c542ca1ba35 SHA256 b582eb651511a955809138a7728a3aa302ebf534f8464e837e2b4f041b38b542
-EBUILD gucharmap-2.24.3.ebuild 1274 RMD160 f08a3054f1f171051bd08e3500b98af50aec8708 SHA1 eed792924039f5485932319e64d3edbec008503d SHA256 9e69431d2785e2500efde7678dc2774cc37a4ea2de9fc2f68eca906246b297ec
-MISC ChangeLog 13356 RMD160 dfa9eb7da897351ced523f58deaf4035c5432bc8 SHA1 aa74c7a0e404f8abef6ae5dd810cd3cfed8e832d SHA256 de076882ac94dff09d65d9d33c5e23a6953596564f02e5c2d787d4fff26d08f7
+EBUILD gucharmap-1.10.2.ebuild 1008 RMD160 6b4fc2206b6fb69cec73e366875d874f2c900b06 SHA1 ecf651f7e3af682294d1462fd1c57ad22c242bad SHA256 b7eccacd3485ac16d15b53668ded9f51faf449086242b9d4e0364149c1dd705e
+EBUILD gucharmap-2.22.3.ebuild 1195 RMD160 9c1c0a71acef83481b33d5a25814ea6783040e39 SHA1 a3ad533595e55ebae04fa5ae3bfb07cd97239a31 SHA256 5cae1f6e428ea012f86686e9a53419af9484e4241d9ee8a84e2771d8ff979cab
+EBUILD gucharmap-2.24.3.ebuild 1322 RMD160 aff6fc3a1385a71e2e973576ad0a0ff075706bc3 SHA1 82313098e546a51329c4524cb19e836babf43a66 SHA256 f0c48e796987fd9d0abcd5d32f6ff29e29b9fe9b45ac910f2b3d9f1f5161b210
+MISC ChangeLog 13604 RMD160 a4fad81934259e5951994d667a864c1ec5aa754b SHA1 1762bf04dcb4ddced9e180140e1fc4346bf0fb36 SHA256 adc67ab3eceaea06c104c308186cc94d94d2ed3c83cec067081f29e2b47b2431
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkl+QmUACgkQ1fmVwcYIWAZsmwCg3LuiuJWbhtYra06JsZ6vLpn0
-+KQAn2Lmm1pbfkS9UpntI2O4LJfULpRd
-=98kU
+iEYEARECAAYFAkml1bAACgkQ1fmVwcYIWAbYDgCg77DdVtcuwqdSc3LdrMK7nMC8
+AdIAnjtZmnvXPRRGCCwsNaTRrCdzLcd4
+=ETVF
 -----END PGP SIGNATURE-----
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"