New revision, installs xhtml1 entries in the global XML catalog (bug #159122).

(Portage version: 2.1.1-r2)

4 files changed, 97 insertions, 2 deletions

diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index 340d1e4bc72d..1b3eed341de6 100644
--- a/app-text/xhtml1/ChangeLog
+++ b/app-text/xhtml1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xhtml1
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.15 2006/01/15 14:19:58 cryos Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.16 2007/01/11 04:56:53 leonardop Exp $
+
+*xhtml1-20020801-r4 (11 Jan 2007)
+
+  11 Jan 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +xhtml1-20020801-r4.ebuild:
+  Install xhtml1 entries in the global XML catalog (bug #159122).
 
   15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
   xhtml1-20020801-r3.ebuild:
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r3 b/app-text/xhtml1/files/digest-xhtml1-20020801-r3
index 44c04cf22c69..d8f65cbd10a0 100644
--- a/app-text/xhtml1/files/digest-xhtml1-20020801-r3
+++ b/app-text/xhtml1/files/digest-xhtml1-20020801-r3
@@ -1 +1,3 @@
 MD5 1fdad567eecb5deb8e32e3892cfe0074 xhtml1.tgz 232192
+RMD160 923b346b4cd7e2fac147692c95abca93cacfc828 xhtml1.tgz 232192
+SHA256 148e9eccb5c91222b5f0c07359174ca0df1bd74834a2bae4c6e57c10136a2067 xhtml1.tgz 232192
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r4 b/app-text/xhtml1/files/digest-xhtml1-20020801-r4
new file mode 100644
index 000000000000..d8f65cbd10a0
--- /dev/null
+++ b/app-text/xhtml1/files/digest-xhtml1-20020801-r4
@@ -0,0 +1,3 @@
+MD5 1fdad567eecb5deb8e32e3892cfe0074 xhtml1.tgz 232192
+RMD160 923b346b4cd7e2fac147692c95abca93cacfc828 xhtml1.tgz 232192
+SHA256 148e9eccb5c91222b5f0c07359174ca0df1bd74834a2bae4c6e57c10136a2067 xhtml1.tgz 232192
diff --git a/app-text/xhtml1/xhtml1-20020801-r4.ebuild b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
new file mode 100644
index 000000000000..fc58f1b849c5
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r4.ebuild,v 1.1 2007/01/11 04:56:53 leonardop Exp $
+
+inherit sgml-catalog eutils
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
+LICENSE="W3C"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+RDEPEND=""
+
+
+sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+	"/usr/share/sgml/${PN}/xhtml.soc"
+
+
+xml_catalog_setup() {
+	CATALOG="${ROOT}etc/xml/catalog"
+	XMLTOOL="${ROOT}usr/bin/xmlcatalog"
+	DTDDIR="${ROOT}usr/share/sgml/${PN}"
+
+	[ -x "${XMLTOOL}" ] || return 1
+
+	return 0
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd ${S}/DTD
+
+	epatch ${FILESDIR}/${PN}-catalog.patch
+}
+
+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
+}
+
+pkg_postinst() {
+	sgml-catalog_pkg_postinst
+	xml_catalog_setup || return
+
+	einfo "Installing xhtml1 in the global XML catalog"
+
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
+		${DTDDIR}/xhtml1-strict.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
+		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
+		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
+	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+}
+
+pkg_postrm() {
+	sgml-catalog_pkg_postrm
+	xml_catalog_setup || return
+
+	if [ -d "$DTDDIR" ]; then
+		einfo "The xhtml1 data directory still exists."
+		einfo "No entries will be removed from the XML catalog."
+		return
+	fi
+
+	einfo "Removing xhtml1 from the global XML catalog"
+
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
+	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
+}