Added patch to update docbook files to XML V4.2-Based Variant. Fixes bug 335023

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 245 insertions, 2 deletions

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index e57e78486160..d0cb37546ee0 100644
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/kphotoalbum
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.46 2010/07/15 10:00:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.47 2010/11/11 23:22:46 dilfridge Exp $
+
+  11 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  kphotoalbum-4.1.1.ebuild, +files/kphotoalbum-4.1.1-docbook_fix.patch:
+  Added patch to update docbook files to XML V4.2-Based Variant. Fixes bug
+  335023
 
   15 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   kphotoalbum-4.1.1.ebuild:
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch
new file mode 100644
index 000000000000..575a4271ebfe
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.1.1-docbook_fix.patch
@@ -0,0 +1,236 @@
+diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
+--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
++++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 13:03:02.815174744 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
+   <!ENTITY kappname "&kphotoalbum;">
+   <!ENTITY package "kdeextragear-2">
+@@ -41,12 +41,6 @@
+     <date>2004-08-06</date>
+     <releaseinfo>2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword>KDE</keyword>
+-      <keyword>kdeextragear-2</keyword>
+-      <keyword>KPhotoAlbum</keyword>
+-      <keyword>Image Database</keyword>
+-    </keywordset>
+     <abstract><para>
+   This is the user manual for &kphotoalbum;. If you are
+   not the type who likes reading documentation, but rather just want to try
+@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
+ on long HTML document at <ulink
+ url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Image Database</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:10:06.145165665 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Bilddatenbank</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
+@@ -102,6 +92,12 @@
+ >HTML</acronym
+ >-Dokument zum Herunterladen.</para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Bilddatenbank</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:11:18.860165964 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Piltide andmebaas</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >&kphotoalbum;i koduleheküljelt</ulink
+ >.</para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Piltide andmebaas</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:00.978165382 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Banca dati immagini</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >homepage di &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++       <keyword>KDE</keyword>
++       <keyword>kdeextragear-2</keyword>
++       <keyword>KPhotoAlbum</keyword>
++       <keyword>Banca dati immagini</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:45.765165840 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->Kfotoalbum</keyword>
+-      <keyword
+->Bilddatabas</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >Kfotoalbums hemsida</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>Kfotoalbum</keyword>
++      <keyword>Bilddatabas</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:13:28.217166055 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->База даних зображень</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >домашній сторінці &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>База даних зображень</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild
index ae3873942a9c..cd069c26c8b9 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.1.1.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/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild,v 1.3 2010/07/15 10:00:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.1.1.ebuild,v 1.4 2010/11/11 23:22:46 dilfridge Exp $
 
 EAPI=2
 KDE_LINGUAS="ar be bg ca cs da de el en_GB eo es et fi fr ga gl hi hne is it ja
@@ -39,3 +39,5 @@ src_configure() {
 }
 
 DOCS="ChangeLog README TODO"
+
+PATCHES=( "${FILESDIR}/${P}-docbook_fix.patch" )