Use build-docbook-catalog-1.6 to add these DTDs to the catalog.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 144 insertions, 71 deletions

diff --git a/app-text/docbook-xml-simple-dtd/ChangeLog b/app-text/docbook-xml-simple-dtd/ChangeLog
index 20c046a711dc..148bb083f1db 100644
--- a/app-text/docbook-xml-simple-dtd/ChangeLog
+++ b/app-text/docbook-xml-simple-dtd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-text/docbook-xml-simple-dtd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.53 2011/02/06 05:50:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.54 2011/03/29 02:33:51 flameeyes Exp $
+
+*docbook-xml-simple-dtd-4.1.2.5-r2 (29 Mar 2011)
+*docbook-xml-simple-dtd-4.1.2.4-r3 (29 Mar 2011)
+*docbook-xml-simple-dtd-1.0-r2 (29 Mar 2011)
+
+  29 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +docbook-xml-simple-dtd-1.0-r2.ebuild,
+  +docbook-xml-simple-dtd-4.1.2.4-r3.ebuild,
+  -docbook-xml-simple-dtd-4.1.2.5-r1.ebuild,
+  +docbook-xml-simple-dtd-4.1.2.5-r2.ebuild:
+  Use build-docbook-catalog-1.6 to add these DTDs to the catalog.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org>
   docbook-xml-simple-dtd-1.0-r1.ebuild,
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
new file mode 100644
index 000000000000..5a49d53fb295
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/03/29 02:33:51 flameeyes Exp $
+
+inherit sgml-catalog
+
+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="as-is"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	dev-libs/libxml2
+	>=app-text/build-docbook-catalog-1.6"
+
+S=${WORKDIR}
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.cat catalog
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
new file mode 100644
index 000000000000..ee23d002f9d9
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 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.4-r3.ebuild,v 1.1 2011/03/29 02:33:51 flameeyes Exp $
+
+inherit sgml-catalog
+
+MY_P="sdb4124"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	dev-libs/libxml2
+	>=app-text/build-docbook-catalog-1.6"
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
+	doins ent/*.ent
+
+	dodoc README ChangeLog LostLog COPYRIGHT
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild
deleted file mode 100644
index 7dcea3b8a5f3..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.3 2010/04/05 23:30:55 abcd Exp $
-
-EAPI="3"
-
-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="as-is"
-SLOT="4.1.2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41
-	dev-libs/libxml2"
-RDEPEND=""
-
-S=${WORKDIR}
-
-xml_catalog_setup() {
-	CATALOG="${EROOT}etc/xml/catalog"
-	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
-	DTDDIR="${EROOT}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/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
new file mode 100644
index 000000000000..ae199a475e4e
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/03/29 02:33:51 flameeyes Exp $
+
+inherit sgml-catalog
+
+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="as-is"
+SLOT="4.1.2.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	dev-libs/libxml2
+	>=app-text/build-docbook-catalog-1.6"
+
+S=${WORKDIR}
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}