Workaround entity parsing issue with openjade #238785 by Robert Wohlrab.

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

4 files changed, 136 insertions, 5 deletions

diff --git a/app-text/docbook-xml-dtd/ChangeLog b/app-text/docbook-xml-dtd/ChangeLog
index 8fe4c38c7922..abe7aaa873d9 100644
--- a/app-text/docbook-xml-dtd/ChangeLog
+++ b/app-text/docbook-xml-dtd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/docbook-xml-dtd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.71 2009/12/21 03:06:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.72 2009/12/21 03:16:55 vapier Exp $
+
+*docbook-xml-dtd-4.5-r1 (21 Dec 2009)
+*docbook-xml-dtd-4.4-r2 (21 Dec 2009)
+
+  21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  +docbook-xml-dtd-4.4-r2.ebuild, +docbook-xml-dtd-4.5-r1.ebuild:
+  Workaround entity parsing issue with openjade #238785 by Robert Wohlrab.
 
   21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
   docbook-xml-dtd-4.1.2-r6.ebuild, docbook-xml-dtd-4.2-r2.ebuild,
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 09dd9c98a8bc..367753c57e5e 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -10,13 +10,15 @@ EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1359 RMD160 5e49cf5366fdf83cf2c49b26d7635
 EBUILD docbook-xml-dtd-4.2-r2.ebuild 1357 RMD160 b842a61289514bc852d0e8461f10e667e0247236 SHA1 550a794be3a25c77e5830cf9b71d4641d3acdfe2 SHA256 1be8195cf5f0e3cc1324d342f09710dc9c92b18bed8fb8ec0be3e241ba14d836
 EBUILD docbook-xml-dtd-4.3-r1.ebuild 1345 RMD160 cfe1680c3a3ba94f1bc6742f0965b5790096f975 SHA1 ed7f4f5ef0392cf7c931a1e6385799da9aa1b47e SHA256 188353ba2df475a677ebf09b6ee3713cb8c4c122a6d10cb84ee3972fb6abeed7
 EBUILD docbook-xml-dtd-4.4-r1.ebuild 1384 RMD160 52d523152610903e22edac96710bf7af12dce021 SHA1 c9cff76dca55f9e63d6439a803ed477c0d3d0390 SHA256 6ecf802517f61b1d2197927f8e4cc00316835b290e48c3cc64c5e72e07bd7120
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1574 RMD160 eb14f6012d2e7ded85b07e580215f7b169d25fda SHA1 ba7ba1fcb1bc7399f8a2498698d23ae840c715de SHA256 e36b07fade8f5f61e64d955c3a26726b59677269a9ece0878945f30ba914e7e9
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1574 RMD160 fa58fbc61244ccaaf49bd58c90449787632ddd57 SHA1 14d9c5008ed74cad6be2871892bbbbc94a0f7c13 SHA256 2871d003c7dd8c93d869ce0dc0fb2e9f8ec6c007a1a95eed2c3fc39951a2d699
 EBUILD docbook-xml-dtd-4.5.ebuild 1387 RMD160 b2ada245d8d0be34b28e7ebc38baa6c165273a4b SHA1 aeea4ef51b78ed9e7c244fbe1e60f03c1221a102 SHA256 8a75792b2b1f06b412ae390a9e9a6b7cceed00ca7535ff5e991746621f84363e
-MISC ChangeLog 10333 RMD160 8f134e96b5527813e428cbf4b078ee23157aed0d SHA1 8c10ee549a0638243dab17a7785d0e28680193ad SHA256 b7947e337cbe6fb41508adb3f147f1e1021f646028135bfbef141e8ea99f56c8
+MISC ChangeLog 10602 RMD160 f98a8f1ab75dad94dca23244a859a66db355efdc SHA1 d3811295684a1e9f376b909831ed2316267276f3 SHA256 a15459e086746cf0d8ca1fdd8ef7606527c9428f87567fc5064bc28a2e46b455
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iF4EAREIAAYFAksu5oAACgkQTwhj9JtAlp69tQEAr+WHoL9tCJ/KFK59+tt3hfCr
-kN1gLjN1IDLzo5UcZdwA/RhCA7NUDZgFonns0DaGDveIG47ZpzhH1WhMW0SJo65x
-=JNze
+iF4EAREIAAYFAksu6OkACgkQTwhj9JtAlp46gQEAsMVWFA4D+PWF7HLC5tbsShsy
+twlqv3ODhEfrE5nspegBALhBOEFOlCn26eGgU+i1+JE07gc2Ric3mg4sEky4HifO
+=jPIG
 -----END PGP SIGNATURE-----
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
new file mode 100644
index 000000000000..3ab4464ca2e2
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild,v 1.1 2009/12/21 03:16:55 vapier Exp $
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="X11"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	>=dev-libs/libxml2-2.4
+	>=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	# work around unicode parser issues #238785
+	ln -sf ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
+		"${D}"/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
new file mode 100644
index 000000000000..c8e5da9ec502
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild,v 1.1 2009/12/21 03:16:55 vapier Exp $
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="X11"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	>=dev-libs/libxml2-2.4
+	>=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	# work around unicode parser issues #238785
+	ln -sf ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
+		"${D}"/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}