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, 229 insertions, 16 deletions

diff --git a/net-analyzer/gnome-netstatus/ChangeLog b/net-analyzer/gnome-netstatus/ChangeLog
index 88793d81b627..86fedf3921b2 100644
--- a/net-analyzer/gnome-netstatus/ChangeLog
+++ b/net-analyzer/gnome-netstatus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/gnome-netstatus
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/ChangeLog,v 1.65 2006/11/20 04:29:58 leio Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/ChangeLog,v 1.66 2007/02/16 21:30:58 dang Exp $
+
+  16 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-netstatus-2.12.0-gnome-doc-utils.patch,
+  gnome-netstatus-2.12.0.ebuild:
+  Make it build with >=gnome-doc-utils-0.9.x. It's more picky, requiring a
+  maintainer role
 
   20 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   -files/gnome-netstatus-2.10.0-fbsd.patch,
diff --git a/net-analyzer/gnome-netstatus/Manifest b/net-analyzer/gnome-netstatus/Manifest
index bb15c8f827bc..a640a5e56007 100644
--- a/net-analyzer/gnome-netstatus/Manifest
+++ b/net-analyzer/gnome-netstatus/Manifest
@@ -5,15 +5,19 @@ AUX gnome-netstatus-2.10.0-amd64.patch 410 RMD160 ef85dcf2e22fa4fb4301f091e098a1
 MD5 20268c12e6447722fccaf6d5178ab2b8 files/gnome-netstatus-2.10.0-amd64.patch 410
 RMD160 ef85dcf2e22fa4fb4301f091e098a18a38dff321 files/gnome-netstatus-2.10.0-amd64.patch 410
 SHA256 0732f1a1ac6e1efd3ad34ac95e591d8421cf516c690141a90cfa041118a3311c files/gnome-netstatus-2.10.0-amd64.patch 410
+AUX gnome-netstatus-2.12.0-gnome-doc-utils.patch 11645 RMD160 58f015c48a9c18ab80d067973f5a5e24f9ed4755 SHA1 e0b054fdf1b2bb2e095397cef47d0319fbd07a5c SHA256 c80b7f080deb4e5be8c1b5c5ca36670d7b79e715d5ce68300984635c7c52418d
+MD5 fbe2e735fe2a6ef155fc5c21d48947de files/gnome-netstatus-2.12.0-gnome-doc-utils.patch 11645
+RMD160 58f015c48a9c18ab80d067973f5a5e24f9ed4755 files/gnome-netstatus-2.12.0-gnome-doc-utils.patch 11645
+SHA256 c80b7f080deb4e5be8c1b5c5ca36670d7b79e715d5ce68300984635c7c52418d files/gnome-netstatus-2.12.0-gnome-doc-utils.patch 11645
 DIST gnome-netstatus-2.12.0.tar.bz2 473226 RMD160 b4c8350d16016facbf76b240a99ce23372a765cc SHA1 10080783853cc285fd920b4d1adc4e290411a73b SHA256 14118e71b852a77b9cb8cfe290598afb4d267cac4f6606c99b16b0b2fa807dc9
-EBUILD gnome-netstatus-2.12.0.ebuild 876 RMD160 92be7c815a681c345ecf651fc6f2c36f453334a7 SHA1 c1c66f32570814e4081c711629e38c4287ac9d76 SHA256 2b5d6d1a7cffe6611da0a2b1999054adcaa3d3e8c64160e4f3c912bc471c09b7
-MD5 8de3da3ee7564892156164d85ea06452 gnome-netstatus-2.12.0.ebuild 876
-RMD160 92be7c815a681c345ecf651fc6f2c36f453334a7 gnome-netstatus-2.12.0.ebuild 876
-SHA256 2b5d6d1a7cffe6611da0a2b1999054adcaa3d3e8c64160e4f3c912bc471c09b7 gnome-netstatus-2.12.0.ebuild 876
-MISC ChangeLog 8026 RMD160 704ad372acff0b8551c8e3d46fa32b0ebb88806f SHA1 2d79327cf0edfb8e892425316d8fe8748c317794 SHA256 ab4011b72b99cd58415c332c6fa32b9d18b3df5a94e7fc68bdc517be1fea0a10
-MD5 7827d326870b1e1483130eb1786250ce ChangeLog 8026
-RMD160 704ad372acff0b8551c8e3d46fa32b0ebb88806f ChangeLog 8026
-SHA256 ab4011b72b99cd58415c332c6fa32b9d18b3df5a94e7fc68bdc517be1fea0a10 ChangeLog 8026
+EBUILD gnome-netstatus-2.12.0.ebuild 921 RMD160 c6aaae5472e3384f3cd9bbd2d05614b1d4c00abd SHA1 721cee1e9561457a8442a97dd11f134e757d6dff SHA256 70c58ae7d6b287f77b6dd0523d9ed9a4eaec6116400d6629655350cc0d3a9b98
+MD5 8df3ead4c90b2ed3a4caad3e12c2d642 gnome-netstatus-2.12.0.ebuild 921
+RMD160 c6aaae5472e3384f3cd9bbd2d05614b1d4c00abd gnome-netstatus-2.12.0.ebuild 921
+SHA256 70c58ae7d6b287f77b6dd0523d9ed9a4eaec6116400d6629655350cc0d3a9b98 gnome-netstatus-2.12.0.ebuild 921
+MISC ChangeLog 8259 RMD160 385270114048f0b3912b53783076953ff86093dc SHA1 7bb29a092285ef4825e48fd921b2f7f1d762b0cf SHA256 fa0984dcb94f6b7c482e34ac725f37f7884d8f0ea8f05e592339223188ea2df8
+MD5 06f6852f5b2ed2b01150ce77182f2071 ChangeLog 8259
+RMD160 385270114048f0b3912b53783076953ff86093dc ChangeLog 8259
+SHA256 fa0984dcb94f6b7c482e34ac725f37f7884d8f0ea8f05e592339223188ea2df8 ChangeLog 8259
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,9 +26,9 @@ MD5 bc0806b77510a09cc40b0a034dfc761f files/digest-gnome-netstatus-2.12.0 271
 RMD160 2afd38f75698dfa361e17612fbab5f5716602e31 files/digest-gnome-netstatus-2.12.0 271
 SHA256 fe5c23446e69e6f4e440cec182e0113042692608c28bdfdfa94fa45a7e64ecd5 files/digest-gnome-netstatus-2.12.0 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFYS9NkeYb6olFHJcRAjWLAJ9SamPV+RquH6toM8neLf6HYcmgvQCg07rq
-ucWCfUev6WsybGtdHEeERhs=
-=zes7
+iD8DBQFF1iKJomPajV0RnrERAtDNAJ9F/dvGIIUQ4hxfZUE7D+OWrTQdhgCdHb2p
+PyOJ0KAxzhvGMPCqeRK7zqk=
+=TinO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/gnome-netstatus/files/gnome-netstatus-2.12.0-gnome-doc-utils.patch b/net-analyzer/gnome-netstatus/files/gnome-netstatus-2.12.0-gnome-doc-utils.patch
new file mode 100644
index 000000000000..86d42dec08ff
--- /dev/null
+++ b/net-analyzer/gnome-netstatus/files/gnome-netstatus-2.12.0-gnome-doc-utils.patch
@@ -0,0 +1,202 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/C/gnome-netstatus.xml gnome-netstatus-2.12.0/help/C/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/C/gnome-netstatus.xml	2005-09-06 05:24:09.000000000 -0400
++++ gnome-netstatus-2.12.0/help/C/gnome-netstatus.xml	2007-02-16 16:18:37.000000000 -0500
+@@ -33,7 +33,7 @@
+   </copyright>
+ 
+    -->
+-    <publisher> 
++    <publisher role="maintainer"> 
+       <publishername>GNOME Documentation Project</publishername> 
+     </publisher> 
+ 
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/de/gnome-netstatus.xml gnome-netstatus-2.12.0/help/de/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/de/gnome-netstatus.xml	2004-03-14 23:12:37.000000000 -0500
++++ gnome-netstatus-2.12.0/help/de/gnome-netstatus.xml	2007-02-16 16:19:05.000000000 -0500
+@@ -30,7 +30,9 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME-Dokumentationsprojekt</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"> 
++    	<publishername>GNOME-Dokumentationsprojekt</publishername>
++	</publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME Dokumentationsteam</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -270,4 +272,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/es/gnome-netstatus.xml gnome-netstatus-2.12.0/help/es/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/es/gnome-netstatus.xml	2005-09-06 05:24:09.000000000 -0400
++++ gnome-netstatus-2.12.0/help/es/gnome-netstatus.xml	2007-02-16 16:19:08.000000000 -0500
+@@ -32,7 +32,7 @@
+   </copyright>
+ 
+    -->
+-    <publisher> 
++    <publisher role="maintainer"> 
+       <publishername>Proyecto de Documentación de Gnome</publishername> 
+     </publisher> 
+ 
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/fr/gnome-netstatus.xml gnome-netstatus-2.12.0/help/fr/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/fr/gnome-netstatus.xml	2004-03-14 23:12:41.000000000 -0500
++++ gnome-netstatus-2.12.0/help/fr/gnome-netstatus.xml	2007-02-16 16:20:22.000000000 -0500
+@@ -30,7 +30,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>Projet de documentation GNOME</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>Projet de documentation GNOME</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>&Eacute;quipe de documentation GNOME</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -278,4 +278,4 @@ le bouton droit de la souris, puis chois
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/it/gnome-netstatus.xml gnome-netstatus-2.12.0/help/it/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/it/gnome-netstatus.xml	2004-03-14 23:12:42.000000000 -0500
++++ gnome-netstatus-2.12.0/help/it/gnome-netstatus.xml	2007-02-16 16:20:26.000000000 -0500
+@@ -28,7 +28,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME Documentation Project</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>GNOME Documentation Project</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME Documentation Team</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -268,4 +268,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/ja/gnome-netstatus.xml gnome-netstatus-2.12.0/help/ja/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/ja/gnome-netstatus.xml	2004-03-14 23:12:46.000000000 -0500
++++ gnome-netstatus-2.12.0/help/ja/gnome-netstatus.xml	2007-02-16 16:19:50.000000000 -0500
+@@ -27,7 +27,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME ドキュメンテーションプロジェクト</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>GNOME ドキュメンテーションプロジェクト</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME ドキュメンテーションチーム</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/ko/gnome-netstatus.xml gnome-netstatus-2.12.0/help/ko/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/ko/gnome-netstatus.xml	2004-03-14 23:12:50.000000000 -0500
++++ gnome-netstatus-2.12.0/help/ko/gnome-netstatus.xml	2007-02-16 16:19:53.000000000 -0500
+@@ -27,7 +27,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>그놈 문서 프로젝트</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>그놈 문서 프로젝트</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>그놈 문서 팀</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -269,4 +269,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/sv/gnome-netstatus.xml gnome-netstatus-2.12.0/help/sv/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/sv/gnome-netstatus.xml	2004-03-14 23:12:53.000000000 -0500
++++ gnome-netstatus-2.12.0/help/sv/gnome-netstatus.xml	2007-02-16 16:19:55.000000000 -0500
+@@ -27,7 +27,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>Dokumentationsprojekt f&ouml;r GNOME</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>Dokumentationsprojekt f&ouml;r GNOME</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Suns</firstname> <surname>GNOME-dokumentationsteam</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -268,4 +268,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/uk/gnome-netstatus.xml gnome-netstatus-2.12.0/help/uk/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/uk/gnome-netstatus.xml	2005-09-06 05:24:09.000000000 -0400
++++ gnome-netstatus-2.12.0/help/uk/gnome-netstatus.xml	2007-02-16 16:19:58.000000000 -0500
+@@ -32,7 +32,7 @@
+   </copyright>
+ 
+    -->
+-    <publisher> 
++    <publisher role="maintainer"> 
+       <publishername>Проект документування GNOME</publishername> 
+     </publisher> 
+ 
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/zh_CN/gnome-netstatus.xml gnome-netstatus-2.12.0/help/zh_CN/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/zh_CN/gnome-netstatus.xml	2004-03-14 23:12:57.000000000 -0500
++++ gnome-netstatus-2.12.0/help/zh_CN/gnome-netstatus.xml	2007-02-16 16:20:00.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME Documentation Project</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>GNOME Documentation Project</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME Documentation Team</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -268,4 +268,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/zh_HK/gnome-netstatus.xml gnome-netstatus-2.12.0/help/zh_HK/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/zh_HK/gnome-netstatus.xml	2004-03-14 23:13:00.000000000 -0500
++++ gnome-netstatus-2.12.0/help/zh_HK/gnome-netstatus.xml	2007-02-16 16:20:02.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME 文件專案</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>GNOME 文件專案</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME 文件小組</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -271,4 +271,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-netstatus-2.12.0.orig/help/zh_TW/gnome-netstatus.xml gnome-netstatus-2.12.0/help/zh_TW/gnome-netstatus.xml
+--- gnome-netstatus-2.12.0.orig/help/zh_TW/gnome-netstatus.xml	2004-03-14 23:13:03.000000000 -0500
++++ gnome-netstatus-2.12.0/help/zh_TW/gnome-netstatus.xml	2007-02-16 16:20:04.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+    -->
+ 
+-    <publisher><publishername>GNOME 文件專案</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
++    <publisher role="maintainer"><publishername>GNOME 文件專案</publishername>  </publisher><!-- This file  contains link to license for the documentation (GNU FDL), and 
+         other legal stuff such as "NO WARRANTY" statement. Please do not change 
+ 	any of this. -->&legal;  <authorgroup> 
+       <author><firstname>Sun</firstname> <surname>GNOME 文件小組</surname> <affiliation><orgname>Sun Microsystems</orgname> </affiliation>
+@@ -271,4 +271,4 @@
+    </sect2>
+ 
+  </sect1>
+-</article>
+\ No newline at end of file
++</article>
diff --git a/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild b/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild
index 5db4843b5b74..cec3b24b305b 100644
--- a/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild
+++ b/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild,v 1.12 2006/11/12 04:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild,v 1.13 2007/02/16 21:30:58 dang Exp $
 
 inherit eutils gnome2
 
@@ -33,4 +33,5 @@ src_unpack() {
 	gnome2_src_unpack
 
 	epatch ${FILESDIR}/${PN}-2.10.0-amd64.patch
+	epatch ${FILESDIR}/${P}-gnome-doc-utils.patch
 }