Oy. Tons of changes... Fixed all of these ebuilds to inherit from

sgml-catalog.eclass, and then set them all up to have proper dependencies on
the newest items, as well as use the new, more robust installation and removal
system.  This will probably have some growing pains over the next few days, but
the long range will be worth it.  All problem hints will be found at
http://www.gentoo.org/~satai/

50 files changed, 481 insertions, 655 deletions

diff --git a/app-text/docbook-dsssl-stylesheets/ChangeLog b/app-text/docbook-dsssl-stylesheets/ChangeLog
index f3fd3c1f26f1..9028c4a6e1c2 100644
--- a/app-text/docbook-dsssl-stylesheets/ChangeLog
+++ b/app-text/docbook-dsssl-stylesheets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/docbook-dsssl-stylesheets
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-dsssl-stylesheets/ChangeLog,v 1.5 2002/12/13 10:56:19 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-dsssl-stylesheets/ChangeLog,v 1.6 2002/12/31 04:36:55 satai Exp $
+
+*docbook-dsssl-stylesheets-1.77-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.77-r1.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.77-r1.ebuild
new file mode 100644
index 000000000000..928f618f99be
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.77-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.77-r1.ebuild,v 1.1 2002/12/31 04:36:55 satai Exp $
+
+inherit sgml-catalog
+
+MY_P=${P/-stylesheets/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="DSSSL Stylesheets for DocBook."
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.gz"
+HOMEPAGE="http://www.sourceforge.net/docbook/"
+
+RDEPEND="app-text/sgml-common"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc sparc alpha"
+
+sgml-catalog_cat_include "/etc/sgml/dsssl-docbook-stylesheets.cat" \
+	"/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/dsssl-docbook-stylesheets.cat"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp ${FILESDIR}/${P}.Makefile Makefile
+}
+
+src_compile() {
+	dummy="dummy"
+}
+
+src_install () {
+
+	make \
+		BINDIR="${D}/usr/bin" \
+		DESTDIR="${D}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
+		install || die
+
+}
+
diff --git a/app-text/docbook-dsssl-stylesheets/files/digest-docbook-dsssl-stylesheets-1.77-r1 b/app-text/docbook-dsssl-stylesheets/files/digest-docbook-dsssl-stylesheets-1.77-r1
new file mode 100644
index 000000000000..b763b050b291
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/files/digest-docbook-dsssl-stylesheets-1.77-r1
@@ -0,0 +1 @@
+MD5 91da3583b364cd5606b2b02e6fdd97fc docbook-dsssl-1.77.tar.gz 394813
diff --git a/app-text/docbook-sgml-dtd/ChangeLog b/app-text/docbook-sgml-dtd/ChangeLog
index dfe0fce52071..2bffb77fdee4 100644
--- a/app-text/docbook-sgml-dtd/ChangeLog
+++ b/app-text/docbook-sgml-dtd/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for app-text/docbook-sgml-dtd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.7 2002/12/13 10:56:19 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-dtd/ChangeLog,v 1.8 2002/12/31 04:36:55 satai Exp $
+
+*docbook-sgml-dtd-4.1-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
+
+*docbook-sgml-dtd-4.0-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
+
+*docbook-sgml-dtd-3.1-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
+
+*docbook-sgml-dtd-3.0-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> :
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r1.ebuild
new file mode 100644
index 000000000000..75b1c25cdfbe
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2002/12/31 04:36:55 satai Exp $
+
+inherit sgml-catalog
+
+MY_P="docbk30"
+S=${WORKDIR}/${P}
+DESCRIPTION="Docbook SGML DTD 3.0"
+SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+LICENSE="X11"
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+SLOT="3.0"
+KEYWORDS="x86 ppc sparc alpha"
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+	cp ${FILESDIR}/${P}.Makefile Makefile
+	patch -b docbook.cat ${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 () {
+
+	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild
deleted file mode 100644
index de304f8fe3da..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.13 2002/12/15 10:44:11 bjb Exp $
-
-MY_P="docbk30"
-S=${WORKDIR}/${P}
-DESCRIPTION="Docbook SGML DTD 3.0"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
-LICENSE="X11"
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-SLOT="3.0"
-KEYWORDS="x86 ppc sparc alpha"
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	cp ${FILESDIR}/${P}.Makefile Makefile
-	patch -b docbook.cat ${FILESDIR}/${P}-catalog.diff
-}
-
-src_install () {
-
-	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
-	dodoc *.txt
-}
-
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
-	fi
-}
-pkg_prerm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
-		then
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/etc/sgml/sgml-docbook.cat
-		fi
-	fi
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r1.ebuild
new file mode 100644
index 000000000000..b55e8dce86ca
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2002/12/31 04:36:55 satai Exp $
+
+inherit sgml-catalog
+
+MY_P="docbk31"
+S=${WORKDIR}/${P}
+DESCRIPTION="Docbook SGML DTD 3.1"
+SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+LICENSE="X11"
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+SLOT="3.1"
+
+KEYWORDS="x86 ppc sparc alpha"
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+	cp ${FILESDIR}/${P}.Makefile Makefile
+	patch -b docbook.cat ${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 () {
+
+	 make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
+	 dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild
deleted file mode 100644
index 26a17783b7e1..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.15 2002/12/15 10:44:11 bjb Exp $
-
-MY_P="docbk31"
-S=${WORKDIR}/${P}
-DESCRIPTION="Docbook SGML DTD 3.1"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
-LICENSE="X11"
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-SLOT="3.1"
-
-KEYWORDS="x86 ppc sparc alpha"
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	cp ${FILESDIR}/${P}.Makefile Makefile
-	patch -b docbook.cat ${FILESDIR}/${P}-catalog.diff
-}
-
-src_install () {
-
-	 make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
-	 dodoc *.txt
-}
-
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
-	fi
-}
-
-pkg_prerm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
-		then
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/etc/sgml/sgml-docbook.cat
-		fi
-	fi
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r1.ebuild
new file mode 100644
index 000000000000..b010cc204645
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2002/12/31 04:36:55 satai Exp $
+
+inherit sgml-catalog
+
+MY_P="docbk40"
+S=${WORKDIR}/${P}
+DESCRIPTION="Docbook SGML DTD 4.0"
+SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+LICENSE="X11"
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+SLOT="4.0"
+
+KEYWORDS="x86 ppc sparc alpha"
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+	cp ${FILESDIR}/${P}.Makefile Makefile
+	patch -b docbook.cat ${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 () {
+
+	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild
deleted file mode 100644
index ecaf84db1a72..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.13 2002/12/15 10:44:11 bjb Exp $
-
-MY_P="docbk40"
-S=${WORKDIR}/${P}
-DESCRIPTION="Docbook SGML DTD 4.0"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
-LICENSE="X11"
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-SLOT="4.0"
-
-KEYWORDS="x86 ppc sparc alpha"
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	cp ${FILESDIR}/${P}.Makefile Makefile
-	patch -b docbook.cat ${FILESDIR}/${P}-catalog.diff
-}
-
-src_install () {
-
-	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
-	dodoc *.txt
-}
-
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
-	fi
-}
-pkg_prerm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-        if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
-		then
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/etc/sgml/sgml-docbook.cat
-		fi
-	fi
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r1.ebuild
new file mode 100644
index 000000000000..69e141b27f58
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# 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-r1.ebuild,v 1.1 2002/12/31 04:36:55 satai Exp $
+
+inherit sgml-catalog
+
+MY_P="docbk41"
+S=${WORKDIR}/${P}
+DESCRIPTION="Docbook SGML DTD 4.1"
+SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
+LICENSE="X11"
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+SLOT="4.1"
+
+KEYWORDS="x86 ppc sparc alpha"
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+	cp ${FILESDIR}/${P}.Makefile Makefile
+	patch -b docbook.cat ${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 () {
+
+	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild
deleted file mode 100644
index 5dfa8f704a36..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.13 2002/12/15 10:44:11 bjb Exp $
-
-MY_P="docbk41"
-S=${WORKDIR}/${P}
-DESCRIPTION="Docbook SGML DTD 4.1"
-SRC_URI="http://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-HOMEPAGE="http://www.oasis-open.org/docbook/sgml/${PV}/index.html"
-LICENSE="X11"
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-SLOT="4.1"
-
-KEYWORDS="x86 ppc sparc alpha"
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	cp ${FILESDIR}/${P}.Makefile Makefile
-	patch -b docbook.cat ${FILESDIR}/${P}-catalog.diff
-}
-
-src_install () {
-
-	make DESTDIR=${D}/usr/share/sgml/docbook/sgml-dtd-${PV} install || die
-	dodoc *.txt
-}
-
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-
-		install-catalog --add \
-			/etc/sgml/sgml-docbook-${PV}.cat \
-			/etc/sgml/sgml-docbook.cat
-	fi
-}
-pkg_prerm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		if [ -e /etc/sgml/sgml-docbook-${PV}.cat ]
-		then
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog
-			install-catalog --remove \
-				/etc/sgml/sgml-docbook-${PV}.cat \
-				/etc/sgml/sgml-docbook.cat
-		fi
-	fi
-}
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r1
index d34c8f7dd35e..d34c8f7dd35e 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.0-r1
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r1
index ce053a206f86..ce053a206f86 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-3.1-r1
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r1
index 52456dc15d9d..52456dc15d9d 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.0-r1
diff --git a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1 b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r1
index 4cd776d3de1f..4cd776d3de1f 100644
--- a/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1
+++ b/app-text/docbook-sgml-dtd/files/digest-docbook-sgml-dtd-4.1-r1
diff --git a/app-text/docbook-sgml-utils/ChangeLog b/app-text/docbook-sgml-utils/ChangeLog
index f4e7acc62901..5366c280ec3c 100644
--- a/app-text/docbook-sgml-utils/ChangeLog
+++ b/app-text/docbook-sgml-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/docbook-sgml-utils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.8 2002/12/13 10:56:19 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/ChangeLog,v 1.9 2002/12/31 04:36:55 satai Exp $
+
+*docbook-sgml-utils-0.6.11-r3 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> :
+  Changed around to use new sgml-catalog.eclass.  Also ugpraded all old
+  dependencies to docbook-sgml-dtd-VERSION-r1
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild
index edc8d11f32a3..527295f3893f 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild,v 1.5 2002/12/18 15:04:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r1.ebuild,v 1.6 2002/12/31 04:36:56 satai Exp $
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -20,10 +20,10 @@ DEPEND=">=sys-devel/perl-5
 	dev-perl/SGMLSpm
 	app-text/docbook-xml-simple-dtd
 	app-text/docbook-xml-dtd
-	=app-text/docbook-sgml-dtd-3.0
-	=app-text/docbook-sgml-dtd-3.1
-	=app-text/docbook-sgml-dtd-4.0
-	=app-text/docbook-sgml-dtd-4.1
+	=app-text/docbook-sgml-dtd-3.0-r1
+	=app-text/docbook-sgml-dtd-3.1-r1
+	=app-text/docbook-sgml-dtd-4.0-r1
+	=app-text/docbook-sgml-dtd-4.1-r1
 	tetex? ( app-text/jadetex )"
 
 src_compile() {
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild
index 60ea3d33622e..55024b2b59df 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild,v 1.7 2002/12/18 15:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11-r2.ebuild,v 1.8 2002/12/31 04:36:56 satai Exp $
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -20,10 +20,10 @@ DEPEND=">=sys-devel/perl-5
 	dev-perl/SGMLSpm
 	app-text/docbook-xml-simple-dtd
 	app-text/docbook-xml-dtd
-	=app-text/docbook-sgml-dtd-3.0
-	=app-text/docbook-sgml-dtd-3.1
-	=app-text/docbook-sgml-dtd-4.0
-	=app-text/docbook-sgml-dtd-4.1
+	=app-text/docbook-sgml-dtd-3.0-r1
+	=app-text/docbook-sgml-dtd-3.1-r1
+	=app-text/docbook-sgml-dtd-4.0-r1
+	=app-text/docbook-sgml-dtd-4.1-r1
 	tetex? ( app-text/jadetex )"
 
 src_compile() {
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild
index b868965d43e2..835475a909a4 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild,v 1.12 2002/12/18 15:24:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.11.ebuild,v 1.13 2002/12/31 04:36:56 satai Exp $
 
 MY_PN=${PN/-sgml/}
 MY_P=${MY_PN}-${PV}
@@ -20,10 +20,10 @@ DEPEND=">=sys-devel/perl-5
 	dev-perl/SGMLSpm
 	app-text/docbook-xml-simple-dtd
 	app-text/docbook-xml-dtd
-	=app-text/docbook-sgml-dtd-3.0
-	=app-text/docbook-sgml-dtd-3.1
-	=app-text/docbook-sgml-dtd-4.0
-	=app-text/docbook-sgml-dtd-4.1
+	=app-text/docbook-sgml-dtd-3.0-r1
+	=app-text/docbook-sgml-dtd-3.1-r1
+	=app-text/docbook-sgml-dtd-4.0-r1
+	=app-text/docbook-sgml-dtd-4.1-r1
 	tetex? ( app-text/jadetex )"
 
 src_compile() {
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
index 0b3c356c10a6..2dcb21d9c578 100644
--- a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
+++ b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml/docbook-sgml-1.0.ebuild,v 1.12 2002/12/09 04:17:43 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-sgml/docbook-sgml-1.0.ebuild,v 1.13 2002/12/31 04:36:55 satai Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A helper package for sgml docbook"
@@ -12,7 +12,7 @@ KEYWORDS="x86 ppc sparc "
 RDEPEND="app-text/sgml-common app-text/openjade
 	>=app-text/docbook-dsssl-stylesheets-1.64
 	>=app-text/docbook-sgml-utils-0.6.6
-	=app-text/docbook-sgml-dtd-3.0
-	=app-text/docbook-sgml-dtd-3.1
-	=app-text/docbook-sgml-dtd-4.0
-	=app-text/docbook-sgml-dtd-4.1"
+	=app-text/docbook-sgml-dtd-3.0-r1
+	=app-text/docbook-sgml-dtd-3.1-r1
+	=app-text/docbook-sgml-dtd-4.0-r1
+	=app-text/docbook-sgml-dtd-4.1-r1"
diff --git a/app-text/gentoo-guide-xml-dtd/ChangeLog b/app-text/gentoo-guide-xml-dtd/ChangeLog
index 55b022c432ee..e5fe1237e058 100644
--- a/app-text/gentoo-guide-xml-dtd/ChangeLog
+++ b/app-text/gentoo-guide-xml-dtd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/gentoo-guide-xml-dtd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/gentoo-guide-xml-dtd/ChangeLog,v 1.5 2002/12/13 10:56:19 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gentoo-guide-xml-dtd/ChangeLog,v 1.6 2002/12/31 04:36:56 satai Exp $
+
+*gentoo-guide-xml-dtd-2.1-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/gentoo-guide-xml-dtd/files/digest-gentoo-guide-xml-dtd-2.1-r1 b/app-text/gentoo-guide-xml-dtd/files/digest-gentoo-guide-xml-dtd-2.1-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/digest-gentoo-guide-xml-dtd-2.1-r1
diff --git a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
new file mode 100644
index 000000000000..5f9ac24c19c1
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild,v 1.1 2002/12/31 04:36:56 satai Exp $
+
+inherit sgml-catalog
+
+S=${WORKDIR}
+DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
+HOMEPAGE="http://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc "
+
+DEPEND=">=app-text/sgml-common-0.6.1"
+
+src_install () {
+
+    cd ${FILESDIR}
+
+    insinto /usr/share/sgml/guide
+    doins catalog
+    insinto /usr/share/sgml/guide/ent
+    doins ent/*.ent
+    insinto /usr/share/sgml/guide/xml-dtd-2.1
+    newins guide/guide-2.1.dtd guide.dtd
+
+}
+
+sgml-catalog_cat_include "/etc/sgml/gentoo-guide.cat" \
+	"/usr/share/sgml/guide/catalog"
diff --git a/app-text/html401/ChangeLog b/app-text/html401/ChangeLog
index 5ad96b67c3c5..bf5709e70ad3 100644
--- a/app-text/html401/ChangeLog
+++ b/app-text/html401/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/html401
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.1 2002/12/24 04:16:54 satai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.2 2002/12/31 04:36:56 satai Exp $
+
+*html401-19991224-r1 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
+
 
 *html401-19991224 (25 Nov 2002)
 
diff --git a/app-text/html401/files/digest-html401-19991224-r1 b/app-text/html401/files/digest-html401-19991224-r1
new file mode 100644
index 000000000000..c047d8034b7b
--- /dev/null
+++ b/app-text/html401/files/digest-html401-19991224-r1
@@ -0,0 +1 @@
+MD5 1ed76627ba80816079649f67023ec7ab html40.tgz 369830
diff --git a/app-text/html401/html401-19991224-r1.ebuild b/app-text/html401/html401-19991224-r1.ebuild
new file mode 100644
index 000000000000..0710d5959c89
--- /dev/null
+++ b/app-text/html401/html401-19991224-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224-r1.ebuild,v 1.1 2002/12/31 04:36:56 satai Exp $
+
+inherit sgml-catalog
+
+DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
+HOMEPAGE="http://www.w3.org/TR/${PN}/"
+SRC_URI="${HOMEPAGE}html40.tgz"
+S=${WORKDIR}
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="app-text/sgml-common"
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins HTML4.cat HTML4.decl *.dtd *.ent
+	insinto /etc/sgml
+	dohtml *.html */*
+}
+
+sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+	"/usr/share/sgml/${PN}/HTML4.cat"
diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index aa15dabbcd5c..bc52667f7ddc 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/openjade
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.15 2002/12/13 10:56:19 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.16 2002/12/31 04:36:56 satai Exp $
+
+*openjade-1.3.1-r6 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/openjade/files/digest-openjade-1.3.1-r4 b/app-text/openjade/files/digest-openjade-1.3.1-r4
deleted file mode 100644
index 06187d8bce59..000000000000
--- a/app-text/openjade/files/digest-openjade-1.3.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c453a50001de6cdf132d85ecfb99a0f9 openjade-1.3.1.tar.gz 1397606
diff --git a/app-text/openjade/files/digest-openjade-1.3.1-r2 b/app-text/openjade/files/digest-openjade-1.3.1-r6
index 06187d8bce59..06187d8bce59 100644
--- a/app-text/openjade/files/digest-openjade-1.3.1-r2
+++ b/app-text/openjade/files/digest-openjade-1.3.1-r6
diff --git a/app-text/openjade/openjade-1.3.1-r2.ebuild b/app-text/openjade/openjade-1.3.1-r2.ebuild
deleted file mode 100644
index 916f1fa01cdf..000000000000
--- a/app-text/openjade/openjade-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r2.ebuild,v 1.8 2002/12/09 04:17:44 manson Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Jade is an implemetation of DSSSL - an ISO standard for formatting SGML (and XML) documents"
-SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
-HOMEPAGE="http://openjade.sourceforge.net"
-SLOT="0"
-LICENSE="as-is"
-
-DEPEND="virtual/glibc
-	sys-devel/perl"
-
-RDEPEND="virtual/glibc
-	app-text/sgml-common"
-KEYWORDS="x86 ppc sparc "
-
-src_compile() {
-
-	#real weird setup here. we need to libtoolize to fix .la files.
-	#
-	#Azarah -- (7 April 2002)
-	ln -s config/configure.in configure.in
-	libtoolize --copy --force
-
-	SGML_PREFIX=/usr/share/sgml
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--enable-http \
-		--enable-default-catalog=/etc/sgml/catalog \
-		--enable-default-search-path=/usr/share/sgml \
-		--datadir=/usr/share/sgml/${P} || die
- 
-	make || die
-}
-
-src_install() {                               
-
-	dodir /usr
-	dodir /usr/lib
-	make prefix=${D}/usr \
-	  	datadir=${D}/usr/share/sgml/${P} \
-		install || die
-	
-	dosym openjade  /usr/bin/jade
-	dosym onsgmls   /usr/bin/nsgmls
-	dosym osgmlnorm /usr/bin/sgmlnorm
-	dosym ospam     /usr/bin/spam
-	dosym ospent    /usr/bin/spent
-	dosym osx       /usr/bin/sgml2xml
-
-	insinto /usr/include/sp/generic
-	doins generic/*.h
-
-	insinto /usr/include/sp/include
-	doins include/*.h
-
-	insinto /usr/include/sp/lib
-	doins lib/*.h
-
-	insinto /usr/share/sgml/${P}/
-	doins dsssl/builtins.dsl
-
-	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${D}/usr/share/sgml/${P}/catalog
-	insinto /usr/share/sgml/${P}/dsssl
-	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-	newins ${FILESDIR}/${P}.dsssl-catalog catalog
-# Breaks sgml2xml among other things
-#	insinto /usr/share/sgml/${P}/unicode
-#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
-	insinto /usr/share/sgml/${P}/pubtext
-	doins pubtext/*
-
-	dodoc COPYING NEWS README VERSION
-	docinto html/doc
-	dodoc doc/*.htm
-	docinto html/jadedoc
-	dodoc jadedoc/*.htm
-	docinto html/jadedoc/images
-	dodoc jadedoc/images/*
-
-}
-
-pkg_postinst() {
-  if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-#    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
-    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
-  fi
-}
-
-pkg_postrm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-		if [ ! -e /usr/share/sgml/openjade-${PV}/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-		fi
-		if [ ! -e /usr/share/sgml/openjade-${PV}/dsssl/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-		fi
-		if [ ! -e /usr/share/sgml/openjade-${PV}/unicode/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
-		fi
-		if [ ! -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
-		fi
-	fi
-}
-
diff --git a/app-text/openjade/openjade-1.3.1-r4.ebuild b/app-text/openjade/openjade-1.3.1-r6.ebuild
index c7a5d323b73f..f2ad63c3f890 100644
--- a/app-text/openjade/openjade-1.3.1-r4.ebuild
+++ b/app-text/openjade/openjade-1.3.1-r6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r4.ebuild,v 1.10 2002/12/15 10:44:11 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.1-r6.ebuild,v 1.1 2002/12/31 04:36:56 satai Exp $
 
-inherit libtool flag-o-matic
+inherit libtool flag-o-matic 
+inherit sgml-catalog
 
 
 filter-flags -fno-exceptions
@@ -23,6 +24,11 @@ RDEPEND="virtual/glibc
 KEYWORDS="x86 ppc sparc alpha"
 
 src_compile() {
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	CFLAGS=""
+	CXXFLAGS=""
 
 	ln -s config/configure.in configure.in
 	elibtoolize
@@ -86,32 +92,9 @@ src_install() {
 
 }
 
-pkg_postinst() {
-  if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-#    install-catalog --add /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
-    install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
-  fi
-}
-
-pkg_postrm() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
-		if [ ! -e /usr/share/sgml/openjade-${PV}/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/catalog
-		fi
-		if [ ! -e /usr/share/sgml/openjade-${PV}/dsssl/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/dsssl/catalog
-		fi
-		if [ ! -e /usr/share/sgml/openjade-${PV}/unicode/catalog ] && \
-		   [ -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/${P}.cat /usr/share/sgml/openjade-${PV}/unicode/catalog
-		fi
-		if [ ! -e /etc/sgml/${P}.cat ] ; then
-			install-catalog --remove /etc/sgml/sgml-docbook.cat /etc/sgml/${P}.cat
-		fi
-	fi
-}
-
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/${P}.cat"
diff --git a/app-text/sgml-common/ChangeLog b/app-text/sgml-common/ChangeLog
index 9969d6ba6073..2d3f19937a32 100644
--- a/app-text/sgml-common/ChangeLog
+++ b/app-text/sgml-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/sgml-common
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.10 2002/12/13 10:56:20 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.11 2002/12/31 04:36:56 satai Exp $
+
+*sgml-common-0.6.3-r3 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> :
+  Changed the echo's around a bit, other misc bits.  Warrants a revision bump
+  just to make sure it gets caught with all the other SGML changes.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/sgml-common/files/digest-sgml-common-0.6.3-r3 b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r3
new file mode 100644
index 000000000000..876e0934660f
--- /dev/null
+++ b/app-text/sgml-common/files/digest-sgml-common-0.6.3-r3
@@ -0,0 +1 @@
+MD5 103c9828f24820df86e55e7862e28974 sgml-common-0.6.3.tgz 76783
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r3.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r3.ebuild
new file mode 100644
index 000000000000..6ae34e202a8e
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r3.ebuild,v 1.1 2002/12/31 04:36:56 satai Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+SRC_URI="ftp://ftp.kde.org/pub/kde/devel/docbook/SOURCES/${P}.tgz
+	http://download.sourceforge.net/pub/mirrors/kde/devel/docbook/SOURCES/${P}.tgz"
+HOMEPAGE="http://www.iso.ch/cate/3524030.html"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha"
+src_unpack() {
+
+	unpack ${A}
+	# We use a hacked version of install-catalog that supports the ROOT variable
+	cp ${FILESDIR}/${P}-install-catalog.in ${S}/bin
+}
+
+src_compile() {
+	./configure	\
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man || die
+
+	emake || die
+}
+
+src_install () {
+	make \
+		prefix=${D}/usr	\
+		sysconfdir=${D}/etc	\
+		mandir=${D}/usr/share/man \
+		docdir=${D}/usr/share/doc \
+		install || die
+
+}
+
+pkg_postinst() {
+	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
+	then
+		einfo "Installing Catalogs..."
+		install-catalog --add \
+			/etc/sgml/sgml-ent.cat \
+			/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+
+		install-catalog --add \
+			/etc/sgml/sgml-docbook.cat \
+			/etc/sgml/sgml-ent.cat
+	else
+		ewarn "install-catalog not found! Something went wrong!"
+		die
+	fi
+}
+
+pkg_prerm() {
+	cp /usr/bin/install-catalog ${T}
+}
+
+pkg_postrm() {
+	if [ ! -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
+	then
+		einfo "Removing Catalogs..."
+		if [ -e /etc/sgml/sgml-ent.cat ]
+		then
+		${T}/install-catalog --remove \
+			/etc/sgml/sgml-ent.cat \
+			/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+		fi
+	
+		if [ -e /etc/sgml/sgml-docbook.cat ]
+		then
+		${T}/install-catalog --remove \
+			/etc/sgml/sgml-docbook.cat \
+			/etc/sgml/sgml-ent.cat
+		fi
+	fi
+}
+
diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog
index 44e33979ae35..ef97802c54a9 100644
--- a/app-text/sgmltools-lite/ChangeLog
+++ b/app-text/sgmltools-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sgmltools-lite
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.13 2002/12/13 10:56:20 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.14 2002/12/31 04:36:56 satai Exp $
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> :
+  Changed dependencies to work with new docbook-sgml-dtd's.
+
+*sgmltools-lite-3.0.3-r6 (30 Dec 2002)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dab77d3d751ca381a95ccebd88480a85 sgmltools-lite-3.0.3.tar.gz 61342
-MD5 d1faad065777a538ac09691761577b26 nw-eps-icons-0.0.1.tar.gz 8733
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r2 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r2
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dab77d3d751ca381a95ccebd88480a85 sgmltools-lite-3.0.3.tar.gz 61342
-MD5 d1faad065777a538ac09691761577b26 nw-eps-icons-0.0.1.tar.gz 8733
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r3 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r3
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dab77d3d751ca381a95ccebd88480a85 sgmltools-lite-3.0.3.tar.gz 61342
-MD5 d1faad065777a538ac09691761577b26 nw-eps-icons-0.0.1.tar.gz 8733
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r4 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r4
deleted file mode 100644
index caf2a88ba3cb..000000000000
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dab77d3d751ca381a95ccebd88480a85 sgmltools-lite-3.0.3.tar.gz 61342
-MD5 d1faad065777a538ac09691761577b26 nw-eps-icons-0.0.1.tar.gz 8733
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6
index caf2a88ba3cb..caf2a88ba3cb 100644
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3
+++ b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild
deleted file mode 100644
index 413c1209f015..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r1.ebuild,v 1.9 2002/12/09 04:17:45 manson Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr || die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd ${S}/etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild
deleted file mode 100644
index 94f2e01477ae..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r2.ebuild,v 1.9 2002/12/09 04:17:45 manson Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-
-KEYWORDS="x86 ppc sparc "
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		|| die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} mandir=${D}/usr/share/man install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd ${S}/etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild
deleted file mode 100644
index 45eaecaf0f2f..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r3.ebuild,v 1.10 2002/12/09 04:17:45 manson Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a DocBook/OpenJade environment."
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-
-KEYWORDS="x86 ppc sparc "
-src_compile() {
-	./configure 	\
-		--prefix=/usr \
-		--exec-prefix=/usr	\
-		--bindir=/usr/bin	\
-		--sbindir=/usr/sbin	\
-		--datadir=/usr/share	\
-		--mandir=/usr/share/man	|| die
-	
-	make || die
-}
-
-src_install() {
-	make	\
-		prefix=${D}/usr	\
-		exec-prefix=${D}/usr	\
-		datadir=${D}/usr/share	\
-		bindir=${D}/usr/bin	\
-		sysconfdir=${D}/etc	\
-		mandir=${D}/usr/share/man	\
-		etcdir=${D}/etc/sgml	\
-		install || die
-
-	dodoc COPYING ChangeLog POSTINSTALL README*
-	dohtml -r .
-	
-	cd ${WORKDIR}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	
-	cd callouts
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	doins *.eps
-	
-	rm ${D}/etc/sgml/catalog.{suse,rh62}
-}
-
-pkg_postinst() {
-
-	gensgmlenv
-	grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
-}
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
index 3d262e8efcc1..4d1745b7836b 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r5.ebuild
@@ -14,7 +14,7 @@ DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
 
 DEPEND="virtual/python
 	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
+	=app-text/docbook-sgml-dtd-3.1-r1
 	app-text/docbook-dsssl-stylesheets
 	app-text/jadetex
 	app-text/openjade
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
index cf08634e1957..a19d8b6bf28a 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild,v 1.10 2002/12/09 04:17:45 manson Exp $
+# $Header:
+# /home/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r4.ebuild,v 1.7 2002/08/16 02:42:02 murphy Exp $
+
+inherit sgml-catalog
 
 S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
@@ -8,11 +11,12 @@ SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
 HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
+DESCRIPTION="Python interface to SGML software specificially in a 
+DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
 
 DEPEND="virtual/python
 	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
+	=app-text/docbook-sgml-dtd-3.1-r1
 	app-text/docbook-dsssl-stylesheets
 	app-text/jadetex
 	app-text/openjade
@@ -78,11 +82,17 @@ src_install() {
 		cd ${S}
 	done
 
-	
+
 }
 
+sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
+	"/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
+
 pkg_postinst() {
 
 	gensgmlenv
 	grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
+
+	sgml-catalog_pkg_postinst
+
 }
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild
deleted file mode 100644
index 27e23af4aa87..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3.ebuild,v 1.14 2002/12/09 04:17:45 manson Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specificially in a DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
-
-DEPEND="virtual/python
-	app-text/sgml-common
-	=app-text/docbook-sgml-dtd-3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
-	app-text/openjade
-	net-www/lynx"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${P}.tar.gz
-	cd ${S}
-	unpack nw-eps-icons-0.0.1.tar.gz
-	patch -p0 <${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr || die
-	make || die
-}
-
-src_install () {
-	mv bin/gensgmlenv bin/gensgmlenv_orig
-	sed -e "s#/etc/sgml/sgml.env#${D}/etc/sgml/sgml.env#g" \
-		-e "s#/etc/sgml/sgml.cenv#${D}/etc/sgml/sgml.cenv#g" \
-		bin/gensgmlenv_orig > bin/gensgmlenv
-	make DESTDIR=${D} install
-
-	cd ${S}/bin
-	chmod a+x ./gensgmlenv
-	./gensgmlenv
-	cd /etc/sgml
-	dodir /etc/env.d
-	cat sgml.env | grep = > ${D}/etc/env.d/93sgmltools-lite
-	rm sgml.env sgml.cenv
-
-	cd ${S}/nw-eps-icons-0.0.1/images
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images
-	doins *.eps
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/images/callouts
-	cd callouts
-	doins *.eps
-}
diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index 954580b1307f..8c72cdd78bf6 100644
--- a/app-text/xhtml1/ChangeLog
+++ b/app-text/xhtml1/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-text/xhtml1
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.2 2002/11/27 19:10:11 vapier Exp $
+# ChangeLog for app-text/xhtml1 Copyright 2002 Gentoo Technologies, Inc.;
+# Distributed under the GPL v2 $Header:
+# /home/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.2 2002/11/27 19:10:11
+# vapier Exp $
+
+*xhtml1-20020801 (30 Dec 02)
+
+  30 Dec 2002; Matthew Turk <satai@gentoo.org> : 
+  changed to inherit sgml-catalog and better deal with catalogs. 
 
 *xhtml1-20020801 (16 Nov 02)
 
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r1 b/app-text/xhtml1/files/digest-xhtml1-20020801-r1
new file mode 100644
index 000000000000..44c04cf22c69
--- /dev/null
+++ b/app-text/xhtml1/files/digest-xhtml1-20020801-r1
@@ -0,0 +1 @@
+MD5 1fdad567eecb5deb8e32e3892cfe0074 xhtml1.tgz 232192
diff --git a/app-text/xhtml1/xhtml1-20020801-r1.ebuild b/app-text/xhtml1/xhtml1-20020801-r1.ebuild
new file mode 100644
index 000000000000..204b58bfb01d
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r1.ebuild,v 1.1 2002/12/31 04:36:56 satai Exp $
+
+inherit sgml-catalog
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/${PN}/"
+SRC_URI="${HOMEPAGE}${PN}.tgz"
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="app-text/sgml-common"
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+	insinto /etc/sgml
+	dodoc *.pdf *.ps
+	dohtml *.html *.png *.css
+}
+
+sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+	"/usr/share/sgml/${PN}/xhtml.soc"