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

Package-Manager: portage-2.1.1-r2

diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index 340d1e4bc72d6a02975536ff614a1b63cf0812c3..1b3eed341de6422bfa0469a565f205fe1cf8a8af 100644 (file)
--- 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/Manifest b/app-text/xhtml1/Manifest
index 16f5d0e4c81a42e3d259d5478677a5748f78c097..819bdb6bd9a63b82dd5fb3185da55a8e79cff2f6 100644 (file)
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,15 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 76eb7e9c3bb7016e433e76c503dcae4a ChangeLog 1979
-MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r3 55
+AUX xhtml1-catalog.patch 834 RMD160 09a57a6d1a68ae9dfc8844f0dea435742b00bf04 SHA1 e1882cc2035a089cffbe2ad814bd02f850c385ad SHA256 36b3e6f56ca4448bde8ec872bb171df6a0e86e668101d8e9e3e298095aa6e603
 MD5 89f90d2f6036d96c89c6d7a33c64c7cb files/xhtml1-catalog.patch 834
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 09a57a6d1a68ae9dfc8844f0dea435742b00bf04 files/xhtml1-catalog.patch 834
+SHA256 36b3e6f56ca4448bde8ec872bb171df6a0e86e668101d8e9e3e298095aa6e603 files/xhtml1-catalog.patch 834
+DIST xhtml1.tgz 232192 RMD160 923b346b4cd7e2fac147692c95abca93cacfc828 SHA1 6fb14e70047f4b56681cd64032ca5ec5eb9396cd SHA256 148e9eccb5c91222b5f0c07359174ca0df1bd74834a2bae4c6e57c10136a2067
+EBUILD xhtml1-20020801-r3.ebuild 844 RMD160 010b7c2945d5d203251a16c51aad3b92964b7cc6 SHA1 1d925002445e67af957d631e02468e52e18393a4 SHA256 12d167d5d99d245e4998a0045c73f449e0a71632c46707fb8e16c2bbb0ee5f0d
 MD5 a1a020b36350ac2b0ec15853f1ffd574 xhtml1-20020801-r3.ebuild 844
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyloentT9W3vfTuoRAsj6AJ972KvH2UG6KEFU8iLnpwWez5VZSACgiVS/
-mYDSkx8iVmgvQ8p73poZSkQ=
-=zKme
------END PGP SIGNATURE-----
+RMD160 010b7c2945d5d203251a16c51aad3b92964b7cc6 xhtml1-20020801-r3.ebuild 844
+SHA256 12d167d5d99d245e4998a0045c73f449e0a71632c46707fb8e16c2bbb0ee5f0d xhtml1-20020801-r3.ebuild 844
+EBUILD xhtml1-20020801-r4.ebuild 2283 RMD160 0e5e36c924af3bde830d042a45bff8db0a159abc SHA1 856f2a7a0096b76534dd0061ed8b3c2e8f1ae866 SHA256 a66cb3e4e38f3b14a8ed95c9de3e7ea65e9a1082776ef86ad7decb7f305c8381
+MD5 d2654bfd5cd0b998701df2e30dfae2dd xhtml1-20020801-r4.ebuild 2283
+RMD160 0e5e36c924af3bde830d042a45bff8db0a159abc xhtml1-20020801-r4.ebuild 2283
+SHA256 a66cb3e4e38f3b14a8ed95c9de3e7ea65e9a1082776ef86ad7decb7f305c8381 xhtml1-20020801-r4.ebuild 2283
+MISC ChangeLog 2170 RMD160 5571b483b93515b9abf9236e972d7a6cf75d2f23 SHA1 b428ba22ae44190c27e892941e5a985867d38b67 SHA256 4835da1a0e5b96c45a45b5e9db5122c042988ad4c8129bd213cfd490eb1d2852
+MD5 f818fd04729995299d9e7128891679c9 ChangeLog 2170
+RMD160 5571b483b93515b9abf9236e972d7a6cf75d2f23 ChangeLog 2170
+SHA256 4835da1a0e5b96c45a45b5e9db5122c042988ad4c8129bd213cfd490eb1d2852 ChangeLog 2170
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 208cfdc9dd85eef7062386ac8502e02a files/digest-xhtml1-20020801-r3 211
+RMD160 13ffde88c22ef3c031355578a0c375d51e82eed5 files/digest-xhtml1-20020801-r3 211
+SHA256 909f95b76ed502ab8368012f1deb0011febd023f0ece07012fecda77b7060e4d files/digest-xhtml1-20020801-r3 211
+MD5 208cfdc9dd85eef7062386ac8502e02a files/digest-xhtml1-20020801-r4 211
+RMD160 13ffde88c22ef3c031355578a0c375d51e82eed5 files/digest-xhtml1-20020801-r4 211
+SHA256 909f95b76ed502ab8368012f1deb0011febd023f0ece07012fecda77b7060e4d files/digest-xhtml1-20020801-r4 211

diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r3 b/app-text/xhtml1/files/digest-xhtml1-20020801-r3
index 44c04cf22c6923cae4e38c6d0cb405abfcab4258..d8f65cbd10a0d3376a9ae12e0a53678d87c52ba8 100644 (file)
--- 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 (file)
index 0000000..d8f65cb
--- /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 (file)
index 0000000..fc58f1b
--- /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
+}