Install catalogs in the global SGML system. See bug #116350.

(Portage version: 2.1_pre3-r1)

10 files changed, 269 insertions, 11 deletions

diff --git a/app-text/docbook-xml-dtd/ChangeLog b/app-text/docbook-xml-dtd/ChangeLog
index 7639a8bdfc60..0e7a2ec4de0b 100644
--- a/app-text/docbook-xml-dtd/ChangeLog
+++ b/app-text/docbook-xml-dtd/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-text/docbook-xml-dtd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.39 2006/01/03 16:14:18 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.40 2006/01/13 14:34:32 leonardop Exp $
+
+*docbook-xml-dtd-4.4-r1 (13 Jan 2006)
+*docbook-xml-dtd-4.3-r1 (13 Jan 2006)
+*docbook-xml-dtd-4.2-r2 (13 Jan 2006)
+*docbook-xml-dtd-4.1.2-r6 (13 Jan 2006)
+
+  13 Jan 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +docbook-xml-dtd-4.1.2-r6.ebuild, +docbook-xml-dtd-4.2-r2.ebuild,
+  +docbook-xml-dtd-4.3-r1.ebuild, +docbook-xml-dtd-4.4-r1.ebuild:
+  Install the catalogs in the global SGML catalog system too. Added the
+  OVERRIDE directive to the catalogs. This should fix the problems that
+  usually come up when trying to process DocBook XML files with SGML tools
+  (e.g. openjade).  See bug #116350.
 
   03 Jan 2006; Luis Medinas <metalgod@gentoo.org>
   docbook-xml-dtd-4.4.ebuild:
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index c8802cfba5cd..c797ea6781bb 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -1,20 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 a7b6a1bf9937bad2b316eb5423510024 .docbook-xml-dtd-4.1.2-r6.ebuild.swp 12288
 MD5 d303692b18e29107f1d41a6e3e52d566 ChangeLog 5253
 MD5 9c8d7439f4fd321f6a480e6325b1b6d1 docbook-xml-dtd-4.1.2-r5.ebuild 998
+MD5 e6c2a1ce5bbb9a7785e35ce19fe5b864 docbook-xml-dtd-4.1.2-r6.ebuild 1369
 MD5 6bd47fe661187527f9547dbb0d681fec docbook-xml-dtd-4.2-r1.ebuild 1002
+MD5 847254e04e1727ce3c79dd82eb0fb368 docbook-xml-dtd-4.2-r2.ebuild 1373
+MD5 18c782dad1c31cbce39f459a6b0d5820 docbook-xml-dtd-4.3-r1.ebuild 1341
 MD5 c0d0c6f1be296af1044b411b0dca56c5 docbook-xml-dtd-4.3.ebuild 970
+MD5 bbfbcb0073f4aaf980c3f5b94950e5da docbook-xml-dtd-4.4-r1.ebuild 1391
 MD5 a9eeec6fc4f2b203115bc3764475fcf4 docbook-xml-dtd-4.4.ebuild 1019
 MD5 638b516b8fd6ca78aec687eaa944bcec files/digest-docbook-xml-dtd-4.1.2-r5 57
+MD5 638b516b8fd6ca78aec687eaa944bcec files/digest-docbook-xml-dtd-4.1.2-r6 57
 MD5 093e6f1d9b42e82da8879d652cd8939f files/digest-docbook-xml-dtd-4.2-r1 63
+MD5 093e6f1d9b42e82da8879d652cd8939f files/digest-docbook-xml-dtd-4.2-r2 63
 MD5 0c4ee65a9b4e3f4aad82e13ac2f82ec9 files/digest-docbook-xml-dtd-4.3 63
+MD5 0c4ee65a9b4e3f4aad82e13ac2f82ec9 files/digest-docbook-xml-dtd-4.3-r1 63
 MD5 82b9f85711797b60107e18e6f299176c files/digest-docbook-xml-dtd-4.4 63
+MD5 82b9f85711797b60107e18e6f299176c files/digest-docbook-xml-dtd-4.4-r1 63
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuwZD2+ySkm8kpY0RAkcYAJ90nw42Pjor6fOuTCz843howcQJnACfeF0x
-s+y92xRsiw1xNGGOy5HBsaQ=
-=fHJS
------END PGP SIGNATURE-----
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
new file mode 100644
index 000000000000..1b8b48616cdd
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 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.1.2-r6.ebuild,v 1.1 2006/01/13 14:34:32 leonardop Exp $
+
+inherit sgml-catalog
+
+MY_P="docbkx412"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${MY_P}.zip"
+
+LICENSE="X11"
+SLOT="4.1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+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"
+
+
+src_unpack() {
+	mkdir "${S}"
+	cd "${S}"
+	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 *.dtd *.mod
+	doins docbook.cat
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent
+
+	dodoc ChangeLog *.txt
+}
+
+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.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
new file mode 100644
index 000000000000..e038a942db11
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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.2-r2.ebuild,v 1.1 2006/01/13 14:34:32 leonardop Exp $
+
+inherit sgml-catalog
+
+MY_P="docbook-xml-4.2"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${MY_P}.zip"
+
+LICENSE="X11"
+SLOT="4.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+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"
+
+
+src_unpack() {
+	mkdir "${S}"
+	cd "${S}"
+	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 *.dtd *.mod
+	doins docbook.cat
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.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.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
new file mode 100644
index 000000000000..0f5a52b17a54
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/01/13 14:34:32 leonardop 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="4.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+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"
+
+
+src_unpack() {
+	mkdir "${S}"
+	cd "${S}"
+	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 *.dtd *.mod
+	doins docbook.cat
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.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.4-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
new file mode 100644
index 000000000000..60dfbc66dc99
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/01/13 14:34:32 leonardop Exp $
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/xml/index.html"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="X11"
+SLOT="4.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+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"
+
+RDEPEND=""
+
+
+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"
+
+
+src_unpack() {
+	mkdir "${S}"
+	cd "${S}"
+	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 *.dtd *.mod
+	doins docbook.cat
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent
+
+	mv 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/files/digest-docbook-xml-dtd-4.1.2-r6 b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2-r6
new file mode 100644
index 000000000000..a78e28f532e6
--- /dev/null
+++ b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2-r6
@@ -0,0 +1 @@
+MD5 900d7609fb7e6d78901b357e4acfbc17 docbkx412.zip 75683
diff --git a/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.2-r2 b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.2-r2
new file mode 100644
index 000000000000..fa78528f0e4b
--- /dev/null
+++ b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.2-r2
@@ -0,0 +1 @@
+MD5 73fe50dfe74ca631c1602f558ed8961f docbook-xml-4.2.zip 78428
diff --git a/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.3-r1 b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.3-r1
new file mode 100644
index 000000000000..5c1b9b79bf78
--- /dev/null
+++ b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.3-r1
@@ -0,0 +1 @@
+MD5 ab200202b9e136a144db1e0864c45074 docbook-xml-4.3.zip 83865
diff --git a/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.4-r1 b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.4-r1
new file mode 100644
index 000000000000..8b715824c8ad
--- /dev/null
+++ b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.4-r1
@@ -0,0 +1 @@
+MD5 cbb04e9a700955d88c50962ef22c1634 docbook-xml-4.4.zip 96107