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/

13 files changed, 171 insertions, 230 deletions

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