Make it build with >=gnome-doc-utils-0.9.x. It's more picky, requiring a maintainer role.

Package-Manager: portage-2.1.2-r9

4 files changed, 45 insertions, 11 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index 15fbe2ea9e92..9ca44ed5946f 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.75 2007/02/09 23:34:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.76 2007/02/14 19:58:38 dang Exp $
+
+  14 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gucharmap-1.8.0-gnome-doc-utils.patch, gucharmap-1.8.0.ebuild:
+  Make it build with >=gnome-doc-utils-0.9.x. It's more picky, requiring a
+  maintainer role.
 
   09 Feb 2007; Roy Marples <uberlord@gentoo.org> gucharmap-1.8.0.ebuild:
   Added ~x86-fbsd keyword.
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 4c2c5d18b3c3..1c41b613a74f 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gucharmap-1.8.0-gnome-doc-utils.patch 482 RMD160 04f9e2a54b907b8249b618134d07509d26c6f987 SHA1 6f6cd644d6c2cbf07ca026965d3473f7d6f2ca46 SHA256 b6472354f01fcabdb877a0faeeda01dde694441f9f183550afcda575070b2433
+MD5 f6de2bd966ea40288cb1271e818b1d12 files/gucharmap-1.8.0-gnome-doc-utils.patch 482
+RMD160 04f9e2a54b907b8249b618134d07509d26c6f987 files/gucharmap-1.8.0-gnome-doc-utils.patch 482
+SHA256 b6472354f01fcabdb877a0faeeda01dde694441f9f183550afcda575070b2433 files/gucharmap-1.8.0-gnome-doc-utils.patch 482
 DIST gucharmap-1.6.0.tar.bz2 2131883 RMD160 1ea02510705bd213e633224686f4a896feec88d5 SHA1 9ca21c29e489ad4ec4378ab70b9a7d72add95f82 SHA256 b27f201b58ec077ebe6f97ffc040c9f1e171b9595d5a917052345f711c6d2107
 DIST gucharmap-1.8.0.tar.bz2 2542413 RMD160 366426537ffa5b3e24e31b474d6755bd37d73cb1 SHA1 eaaabf11c4fa7f897af5ea2d1b4072debc6ff717 SHA256 54ca751dda9e187bab19a609d42159a656c2bb933a15024b27841bf08a2185ab
 EBUILD gucharmap-1.6.0.ebuild 1065 RMD160 ec67a6bc7c8b4014c0b3392b24fd9ea3dff0fba2 SHA1 d10a39a6623e79053f003a53d1a93d4b43c13444 SHA256 2c516a0532f16c7c1613bc49fd15c3c5f0ab15207f05a53330d7ce7d909ee0a2
 MD5 0cdff13e27a0c897cb4e15a6f5646079 gucharmap-1.6.0.ebuild 1065
 RMD160 ec67a6bc7c8b4014c0b3392b24fd9ea3dff0fba2 gucharmap-1.6.0.ebuild 1065
 SHA256 2c516a0532f16c7c1613bc49fd15c3c5f0ab15207f05a53330d7ce7d909ee0a2 gucharmap-1.6.0.ebuild 1065
-EBUILD gucharmap-1.8.0.ebuild 1060 RMD160 75c25b56f4f1006c772fed4aea9a51cee0cdaa57 SHA1 fea8392909c7af020e6f6344c7652ef0bdc3be4b SHA256 56d89e5bf8630485b0a9b16d82848ef9602d837510d77ab031e66cb0e6521141
-MD5 370372242c3dba71ef1f03ab76cc6bb0 gucharmap-1.8.0.ebuild 1060
-RMD160 75c25b56f4f1006c772fed4aea9a51cee0cdaa57 gucharmap-1.8.0.ebuild 1060
-SHA256 56d89e5bf8630485b0a9b16d82848ef9602d837510d77ab031e66cb0e6521141 gucharmap-1.8.0.ebuild 1060
-MISC ChangeLog 8992 RMD160 f91ed1e324975c291b55fdcfeba5be6e7a60ea59 SHA1 b0ba1d96f9f048955803945f22d427aee8b9dd19 SHA256 4912c1fde539d7038ee7b9711d62009d75335c0673b4ef1061eb16da661c15d8
-MD5 697748ed25552828495c2fe6c782c720 ChangeLog 8992
-RMD160 f91ed1e324975c291b55fdcfeba5be6e7a60ea59 ChangeLog 8992
-SHA256 4912c1fde539d7038ee7b9711d62009d75335c0673b4ef1061eb16da661c15d8 ChangeLog 8992
+EBUILD gucharmap-1.8.0.ebuild 1157 RMD160 69b6bc3b55600a5c3a06b484d472c665b0faf9b6 SHA1 e35b30f375bd9e2d85773f2e5e52f7601a3c4101 SHA256 d6d8a5e14bc811b2301cb875cdfc8869f2120e11fa6ea5797b61cfea5273fa55
+MD5 f54c903b7353e46a370dec58b27536ff gucharmap-1.8.0.ebuild 1157
+RMD160 69b6bc3b55600a5c3a06b484d472c665b0faf9b6 gucharmap-1.8.0.ebuild 1157
+SHA256 d6d8a5e14bc811b2301cb875cdfc8869f2120e11fa6ea5797b61cfea5273fa55 gucharmap-1.8.0.ebuild 1157
+MISC ChangeLog 9206 RMD160 c09953427cd70b25908c734352793807a568e4e4 SHA1 5b68ea4cc0c1dc20277045cd4398f01f2dece391 SHA256 6029b5367e9dafb4a6923332734655891df0bf905fa7bc39cf684c2681f13f12
+MD5 e59b20167483ff39eb66b9b0f7c0e534 ChangeLog 9206
+RMD160 c09953427cd70b25908c734352793807a568e4e4 ChangeLog 9206
+SHA256 6029b5367e9dafb4a6923332734655891df0bf905fa7bc39cf684c2681f13f12 ChangeLog 9206
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,3 +29,10 @@ SHA256 93f077e2a31c191dd1f62044e30f5b4c95ed619e9239fa40ce5f4b4a82693edc files/di
 MD5 3378bd8a7c491dfc7c378dce7fa65f9c files/digest-gucharmap-1.8.0 253
 RMD160 0e22a5bed9b22cdde8d9046e580acb5b9e8246cc files/digest-gucharmap-1.8.0 253
 SHA256 39d801b93665077cb092d14625fc512fbcba95cde2771020bb5e898cfb6551e9 files/digest-gucharmap-1.8.0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF02nWomPajV0RnrERAi4cAJ9zGinYQakPkXL9KpWv4zjHX+/4BwCfZlP4
+iY3FLp0BuDLJBq5qOJrL0TA=
+=19s1
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gucharmap/files/gucharmap-1.8.0-gnome-doc-utils.patch b/gnome-extra/gucharmap/files/gucharmap-1.8.0-gnome-doc-utils.patch
new file mode 100644
index 000000000000..896ff50eb553
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-1.8.0-gnome-doc-utils.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gucharmap-1.8.0.orig/help/C/gucharmap.xml gucharmap-1.8.0/help/C/gucharmap.xml
+--- gucharmap-1.8.0.orig/help/C/gucharmap.xml	2006-09-04 18:42:05.000000000 -0400
++++ gucharmap-1.8.0/help/C/gucharmap.xml	2007-02-14 14:55:49.000000000 -0500
+@@ -44,7 +44,7 @@
+     </copyright>
+ -->
+ 
+-    <publisher> 
++    <publisher role="maintainer"> 
+       <publishername>GNOME Documentation Project</publishername> 
+     </publisher> 
+ 
diff --git a/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild b/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild
index 75fe05f7dd33..133f30b4e6bf 100644
--- a/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild,v 1.14 2007/02/09 23:34:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-1.8.0.ebuild,v 1.15 2007/02/14 19:58:38 dang Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Unicode character map viewer"
 HOMEPAGE="http://gucharmap.sourceforge.net/"
@@ -37,6 +37,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Make it build with newer gnome-doc-utils
+	epatch "${FILESDIR}"/${P}-gnome-doc-utils.patch
+
 	# fix gtk-update-icon-cache generation
 	sed -i -e 's:gtk-update-icon-cache:true:' ./pixmaps/Makefile.in
 }