Modified patches to use DTDDECL instead of SGMLDECL. Rev-bumped all SLOTs to propagate changes.

(Portage version: 2.0.51.22-r1)

20 files changed, 91 insertions, 110 deletions

diff --git a/app-text/docbook-sgml-dtd/ChangeLog b/app-text/docbook-sgml-dtd/ChangeLog
index 372e1ad9e81a..db7b58a7b647 100644
--- a/app-text/docbook-sgml-dtd/ChangeLog
+++ b/app-text/docbook-sgml-dtd/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-text/docbook-sgml-dtd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.36 2005/06/18 13:59:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.37 2005/07/11 13:49:09 leonardop Exp $
+
+*docbook-sgml-dtd-4.3-r2 (11 Jul 2005)
+
+  11 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  docbook-sgml-dtd-3.0-r3.ebuild, docbook-sgml-dtd-3.1-r3.ebuild,
+  docbook-sgml-dtd-4.0-r3.ebuild, docbook-sgml-dtd-4.1-r3.ebuild,
+  docbook-sgml-dtd-4.2-r2.ebuild, docbook-sgml-dtd-4.3-r2.ebuild,
+  files/docbook-sgml-dtd-{3.0,3.1,4.0,4.1,4.2,4.3}-catalog.diff:
+  Updated HOMEPAGE. Modified patches to use DTDDECL instead of SGMLDECL.
+  Using SGMLDECL in a multi-catalog setup like ours is very problematic
+  since the first of those entries take precedence regardless of the type of
+  document being processed. Current tools (opensp) can handle DTDDECL, which
+  is a much better solution. Rev-bumped all SLOTs to propagate changes.
 
   18 Jun 2005; Markus Rothe <corsair@gentoo.org>
   docbook-sgml-dtd-4.3-r1.ebuild:
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 1bd3d89ed182..00cc97a1855b 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -1,30 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 c849eeb4128f8d31055e43bc72990555 docbook-sgml-dtd-4.0-r2.ebuild 1048
-MD5 829cf3c20e14182995935141d52f4094 docbook-sgml-dtd-3.1-r2.ebuild 1049
-MD5 d17f25f3dc24e0d04fa5d5b5b3d441ea docbook-sgml-dtd-4.1-r2.ebuild 1048
-MD5 98751dcc984abbbee1e670e248011954 docbook-sgml-dtd-4.3-r1.ebuild 1048
 MD5 6225a13e50735b6fa24c007c75829b8f ChangeLog 5449
-MD5 c24a0b52e8787bc13c5a2751b39b5b44 docbook-sgml-dtd-3.0-r2.ebuild 1049
-MD5 fbf88b7e68317f90d0034613b4d951ee docbook-sgml-dtd-4.2-r1.ebuild 1063
-MD5 8a7ef27d1b638e5861db84a17234f0cb files/digest-docbook-sgml-dtd-4.1-r2 55
-MD5 850c55e93dee03c8286d4ef44de9cc1b files/digest-docbook-sgml-dtd-3.1-r2 55
+MD5 8858b16e93fd0f633f0c874adb0d7711 docbook-sgml-dtd-3.1-r3.ebuild 1052
+MD5 2bcb310eec5de27cf5cffcc94a970f5b docbook-sgml-dtd-4.1-r3.ebuild 1051
+MD5 34bc153a92643b0e0b06bdb482341a06 docbook-sgml-dtd-4.2-r2.ebuild 1066
+MD5 a062b06c8a73c6e4c7a3753cbf5a2180 docbook-sgml-dtd-4.3-r2.ebuild 1062
+MD5 98751dcc984abbbee1e670e248011954 docbook-sgml-dtd-4.3-r1.ebuild 1048
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 1db274cac87acceef94992f4f2f97856 docbook-sgml-dtd-3.0-r3.ebuild 1067
+MD5 cc16e37a3d844c290b85383bae3c5067 docbook-sgml-dtd-4.0-r3.ebuild 1051
+MD5 850c55e93dee03c8286d4ef44de9cc1b files/digest-docbook-sgml-dtd-3.1-r3 55
+MD5 43112d7839b3a299ce611d4e7a77b2c0 files/digest-docbook-sgml-dtd-4.0-r3 55
+MD5 bbc8190e79fca907241532e691e285f5 files/digest-docbook-sgml-dtd-4.2-r2 59
+MD5 4a8412adeb070623acd79a095a508aaf files/digest-docbook-sgml-dtd-4.3-r2 59
 MD5 4a8412adeb070623acd79a095a508aaf files/digest-docbook-sgml-dtd-4.3-r1 59
-MD5 35d694d581e6f4a9bfaf171255d2cb5e files/docbook-sgml-dtd-4.0-catalog.diff 2518
-MD5 43112d7839b3a299ce611d4e7a77b2c0 files/digest-docbook-sgml-dtd-4.0-r2 55
-MD5 158017fa77836ad01012af61629ed2c9 files/docbook-sgml-dtd-3.0-catalog.diff 2578
-MD5 76d53f45afb968ea0724d75ed2e83afb files/digest-docbook-sgml-dtd-3.0-r2 55
-MD5 2d9d2574f3c330b971bb59d7050b703a files/docbook-sgml-dtd-4.2-catalog.diff 2496
-MD5 bbc8190e79fca907241532e691e285f5 files/digest-docbook-sgml-dtd-4.2-r1 59
-MD5 a241deeadd491695c185d9d75713e6ac files/docbook-sgml-dtd-4.3-catalog.diff 2439
-MD5 b7d89004561264c5299e7d2d0947eac2 files/docbook-sgml-dtd-4.1-catalog.diff 2518
-MD5 5d8fd1d6f4f9d649bf07e48410b129c6 files/docbook-sgml-dtd-3.1-catalog.diff 2555
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD4DBQFCzLbTgIKl8Uu19MoRAoGGAJY7BL0rFbXunylelpRyg7bpfgMJAJ9bJAhG
-UDue6QniJLV0+PbWqmf8Nw==
-=FBiY
------END PGP SIGNATURE-----
+MD5 62d3c1df622a6bfc25b3c69754a625ac files/docbook-sgml-dtd-3.0-catalog.diff 2144
+MD5 a8f3419d176358d518b9d9dc859a3fcc files/docbook-sgml-dtd-3.1-catalog.diff 2125
+MD5 f0e1ab2a23242f2e31d14386fb7c5dd8 files/docbook-sgml-dtd-4.0-catalog.diff 2096
+MD5 7342752ff54af2d013d5d742850c8f3e files/docbook-sgml-dtd-4.1-catalog.diff 2096
+MD5 3bd41e2920a6a2d3618a4734e269480c files/docbook-sgml-dtd-4.2-catalog.diff 2528
+MD5 aeb2b995c38dfadd675a4ba6c8ca5363 files/docbook-sgml-dtd-4.3-catalog.diff 2471
+MD5 76d53f45afb968ea0724d75ed2e83afb files/digest-docbook-sgml-dtd-3.0-r3 55
+MD5 8a7ef27d1b638e5861db84a17234f0cb files/digest-docbook-sgml-dtd-4.1-r3 55
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index 44897cfcd7a3..e6bd5fa53c1c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r2.ebuild,v 1.3 2005/01/01 20:15:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbk30"
 DESCRIPTION="Docbook SGML DTD 3.0"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+HOMEPAGE="http://www.oasis-open.org/docbook/sgml/3.0/index.html"
 SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 2189530f95fb..2836fd72a2b7 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r2.ebuild,v 1.3 2005/01/01 20:15:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbk31"
 DESCRIPTION="Docbook SGML DTD 3.1"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+HOMEPAGE="http://www.docbook.org/sgml/index.html"
 SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 92c072c308f8..788faa3d4b74 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r2.ebuild,v 1.3 2005/01/01 20:15:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbk40"
 DESCRIPTION="Docbook SGML DTD 4.0"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+HOMEPAGE="http://www.docbook.org/sgml/index.html"
 SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
 	doins *.dcl *.dtd *.mod
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 281f6531b339..66d73e515363 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r2.ebuild,v 1.3 2005/01/01 20:15:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbk41"
 DESCRIPTION="Docbook SGML DTD 4.1"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+HOMEPAGE="http://www.docbook.org/sgml/index.html"
 SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
 	doins *.dcl *.dtd *.mod
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index a81b00a605d2..2cc3ae4d1c69 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r1.ebuild,v 1.3 2005/01/01 20:15:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbook-4.2"
 DESCRIPTION="Docbook SGML DTD 4.2"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+HOMEPAGE="http://www.docbook.org/sgml/index.html"
 SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
 	doins *.dcl *.dtd *.mod
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index 34db91d29347..5ad9253e2065 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r1.ebuild,v 1.9 2005/07/07 04:59:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild,v 1.1 2005/07/11 13:49:09 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
 DESCRIPTION="Docbook SGML DTD 4.3"
-HOMEPAGE="http://www.docbook.org/sgml/${PV}/index.html"
+HOMEPAGE="http://www.docbook.org/sgml/index.html"
 SRC_URI="http://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="${PV}"
+SLOT="4.3"
 KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
@@ -19,16 +19,18 @@ RDEPEND="app-text/sgml-common"
 
 S=${WORKDIR}
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+	sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+		"/etc/sgml/sgml-docbook.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-catalog.diff || die
 }
 
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
-	"/etc/sgml/sgml-docbook.cat"
-
 src_install () {
 
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r2 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r3
index d34c8f7dd35e..d34c8f7dd35e 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r2
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r3
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r2 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r3
index ce053a206f86..ce053a206f86 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r2
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r3
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r2 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r3
index 52456dc15d9d..52456dc15d9d 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r2
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r3
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r2 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r3
index 4cd776d3de1f..4cd776d3de1f 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r2
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r3
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.2-r1 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.2-r2
index fedba3a7c16c..fedba3a7c16c 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.2-r1
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.2-r2
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.3-r1 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.3-r2
index ce27f7e591bd..ce27f7e591bd 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.3-r1
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.3-r2
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
index 6319fecfc9a3..224f98ca59c9 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
@@ -1,14 +1,5 @@
 --- docbook.cat	Tue Dec 10 16:35:22 1996
 +++ catalog	Mon Jun  5 11:08:34 2000
-@@ -27,7 +27,7 @@
-   -- ...................................................................... --

-   -- SGML declaration associated with DocBook ............................. --

- 

--DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"

-+SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-   -- DocBook driver file .................................................. --

 @@ -41,29 +41,6 @@
  PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"

  PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
index 7e52e89a9386..51afa752ad2c 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
@@ -1,14 +1,5 @@
 --- docbook.cat	Tue Feb  2 06:53:32 1999
 +++ catalog	Thu May 25 11:45:01 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --

-   -- SGML declaration associated with DocBook ............................. --

- 

--DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"

-+SGMLDECL "docbook.dcl"

- 

-   -- ...................................................................... --

-   -- DocBook driver file .................................................. --

 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"

  PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
index d8125b752c6d..dd83fdf12b52 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
@@ -1,14 +1,5 @@
 --- docbook.cat	Mon May 22 22:38:05 2000
 +++ catalog	Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
- 
--DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
index c08243a574fd..656ee333f45f 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
@@ -1,14 +1,5 @@
 --- docbook.cat	Mon May 22 22:38:05 2000
 +++ catalog	Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
- 
--DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
- 
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
index aedfbd539b90..d9b232fd8115 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
@@ -5,7 +5,7 @@ diff -uNr 4.2/docbook.cat 4.2-gentoo/docbook.cat
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
  
-+SGMLDECL "docbook.dcl"
++DTDDECL "-//OASIS//DTD DocBook V4.2//EN" "docbook.dcl"
 +
  PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
         "docbook.dtd"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
index ab440ff312fb..ce532355e4a7 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
@@ -4,7 +4,7 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
  
-+SGMLDECL "docbook.dcl"
++DTDDECL "-//OASIS//DTD DocBook V4.3//EN" "docbook.dcl"
 +
  PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
         "docbook.dtd"