Added ebuild for Simplified DocBook 4.1.2.5 (bug #188499)

(Portage version: 2.1.3.6)

5 files changed, 80 insertions, 53 deletions

diff --git a/app-text/docbook-xml-simple-dtd/ChangeLog b/app-text/docbook-xml-simple-dtd/ChangeLog
index 13cf62bf88ed..78d286773fd2 100644
--- a/app-text/docbook-xml-simple-dtd/ChangeLog
+++ b/app-text/docbook-xml-simple-dtd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/docbook-xml-simple-dtd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.46 2007/07/12 09:15:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.47 2007/08/21 23:02:05 leonardop Exp $
+
+*docbook-xml-simple-dtd-4.1.2.5 (21 Aug 2007)
+
+  21 Aug 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +docbook-xml-simple-dtd-4.1.2.5.ebuild:
+  Added DTD for Simplified DocBook 4.1.2.5 (bug #188499). Added code to handle
+  installation/removal of the DTD in the XML catalog.
 
   12 Jul 2007; Roy Marples <uberlord@gentoo.org>
   docbook-xml-simple-dtd-1.0.ebuild, docbook-xml-simple-dtd-1.0-r1.ebuild,
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0.ebuild
deleted file mode 100644
index 05da0bc47361..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0.ebuild,v 1.13 2007/07/12 09:15:03 uberlord Exp $
-
-MY_PN="docbook-simple"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
-
-LICENSE="X11"
-SLOT="1.0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND=">=app-arch/unzip-5.41
-	${RDEPEND}"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/xml-simple-dtd-${PV}
-	doins *.dtd *.mod *.css || die
-}
-
-pkg_postinst() {
-	# and now enter the simplified docbook dtd to the catalog
-	CATALOG=/etc/xml/catalog
-
-	/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
-		"http://www.oasis-open.org/docbook/xml/simple/${PV}" \
-		"/usr/share/sgml/docbook/xml-simple-dtd-${PV}" \
-		${CATALOG}
-
-	/usr/bin/xmlcatalog --noout --add "rewriteURI" \
-		"http://www.oasis-open.org/docbook/xml/simple/${PV}" \
-		"/usr/share/sgml/docbook/xml-simple-dtd-${PV}" \
-		${CATALOG}
-}
-
-pkg_postrm() {
-	# and clean up the catalog when we're finished
-	CATALOG=/etc/xml/catalog
-	/usr/bin/xmlcatalog --noout --del \
-		"/usr/share/sgml/docbook/xml-simple-dtd-${PV}" \
-		${CATALOG}
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5.ebuild
new file mode 100644
index 000000000000..5e89b92ff28b
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5.ebuild,v 1.1 2007/08/21 23:02:05 leonardop Exp $
+
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
+
+LICENSE="X11"
+SLOT="4.1.2.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41
+	dev-libs/libxml2"
+RDEPEND=""
+
+S=${WORKDIR}
+
+
+xml_catalog_setup() {
+	CATALOG="${ROOT}etc/xml/catalog"
+	XMLTOOL="${ROOT}usr/bin/xmlcatalog"
+	DTDDIR="${ROOT}usr/share/sgml/docbook/${P#docbook-}"
+
+	[ -x "${XMLTOOL}" ] || return 1
+
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+}
+
+pkg_postinst() {
+	xml_catalog_setup || return
+
+	einfo "Installing docbook-simple-dtd-4.1.2.5 in the global XML catalog"
+
+	$XMLTOOL --noout --add 'public' \
+		'-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN' \
+		${DTDDIR}/sdocbook.dtd $CATALOG
+	$XMLTOOL --noout --add 'rewriteSystem' \
+		'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' \
+		${DTDDIR} $CATALOG
+	$XMLTOOL --noout --add 'rewriteURI' \
+		'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' \
+		${DTDDIR} $CATALOG
+}
+
+pkg_postrm() {
+	xml_catalog_setup || return
+
+	if [ -d "$DTDDIR" ]; then
+		einfo "The simple-dtd-4.1.2.5 data directory still exists."
+		einfo "No entries will be removed from the XML catalog."
+		return
+	fi
+
+	einfo "Removing docbook-simple-dtd-4.1.2.5 from the global XML catalog"
+
+	$XMLTOOL --noout --del \
+		'-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN' $CATALOG
+	$XMLTOOL --noout --del \
+		'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' $CATALOG
+}
diff --git a/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-1.0 b/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-1.0
deleted file mode 100644
index 392ad0e7f5a5..000000000000
--- a/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 10cf33eb280595db5a6927a3407ef61a docbook-simple-1.0.zip 31173
-RMD160 69eb251783596d7222baab90c3fe08316823aadc docbook-simple-1.0.zip 31173
-SHA256 412665bd9958a39044d4ab5432c3c786f7f5db51a59905290e4d099983d714ba docbook-simple-1.0.zip 31173
diff --git a/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-4.1.2.5 b/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-4.1.2.5
new file mode 100644
index 000000000000..24554ccbc892
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/files/digest-docbook-xml-simple-dtd-4.1.2.5
@@ -0,0 +1,3 @@
+MD5 001fe86011b81c9f7aa863c385b98fcd simple4125.zip 29839
+RMD160 9dbb249dfd89957288c41a3d4e60252327e9be9b simple4125.zip 29839
+SHA256 a3c8dc4961b469447986dc4b6b4d7081450ddb1097ad1d8c82e0d35b335aa1a2 simple4125.zip 29839