Added proper catalog support

4 files changed, 59 insertions, 32 deletions

diff --git a/app-text/docbook-xml-dtd/ChangeLog b/app-text/docbook-xml-dtd/ChangeLog
index c572dced050c..76a29fe856ce 100644
--- a/app-text/docbook-xml-dtd/ChangeLog
+++ b/app-text/docbook-xml-dtd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/docbook-xml-dtd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.1 2002/02/01 21:53:10 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.2 2002/02/24 03:01:02 karltk Exp $
+
+*docbook-xml-dtd-4.1.2-r1 (24 Feb 2002)
+
+  24 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog docbook-xml-dtd-4.1.2-r1:
+  
+  Added proper catalog installation into /etc/xml/catalog and 
+  /etc/xml/xml-docbook.cat
 
 *docbook-xml-dtd-4.1.2 (1 Feb 2002)
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..de5ca043cc58
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Achim Gottinger <achim@gentoo.org>
+# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r1.ebuild,v 1.1 2002/02/24 03:01:02 karltk Exp $
+
+A="docbkx412.zip"
+S=${WORKDIR}/${P}
+DESCRIPTION="Docbook DTD for XML"
+SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${A}"
+
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+
+DEPEND=">=app-arch/unzip-5.41
+	>=dev-libs/libxml2-2.4"
+RDEPEND="" 
+
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+}
+
+src_install() {
+
+	dodir /etc/xml
+	dosym /etc/xml/xml-docbook.cat /etc/xml/catalog
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.dtd *.mod
+	doins docbook.cat 
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent
+
+	dodoc ChangeLog *.txt
+}
+
+pkg_postinst() {
+	install-catalog --add /etc/xml/xml-docbook-${PV}.cat \
+		 /usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat
+	install-catalog --add /etc/xml/xml-docbook.cat \
+		/etc/xml/xml-docbook-${PV}.cat
+}	
+
+pkg_prerm() {
+	install-catalog --remove /etc/xml/xml-docbook-${PV}.cat \
+		 /usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat
+	install-catalog --remove /etc/xml/xml-docbook.cat \
+		/etc/xml/xml-docbook-${PV}.cat
+}	
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2.ebuild
deleted file mode 100644
index 555b6aee9a7f..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2.ebuild,v 1.3 2001/06/08 01:08:06 achim Exp $
-
-A="docbkx412.zip"
-S=${WORKDIR}/${P}
-DESCRIPTION="Docbook DTD for XML"
-SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${A}"
-
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="" 
-src_unpack() {
-  mkdir ${S}
-  cd ${S}
-  unpack ${A}
-}
-
-src_install() {
-
-    insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-    doins *.dtd *.mod
-    doins docbook.cat 
-    insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-    doins ent/*.ent
-
-    dodoc ChangeLog *.txt
-}
-
diff --git a/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2 b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2-r1
index 59dfef960c9d..59dfef960c9d 100644
--- a/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2
+++ b/app-text/docbook-xml-dtd/files/digest-docbook-xml-dtd-4.1.2-r1