Added DTDDECL to xhtml1.soc. Thanks to Peter Simons <simons@cryp.to>; bug #33517.

5 files changed, 39 insertions, 17 deletions

diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index 1f3363867ce7..8959cc68fd5b 100644
--- a/app-text/xhtml1/ChangeLog
+++ b/app-text/xhtml1/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xhtml1
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.9 2004/06/24 22:56:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.10 2004/11/06 13:19:44 usata Exp $
+
+*xhtml1-20020801-r2 (06 Nov 2004)
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> +files/xhtml1-dtddecl.diff,
+  +xhtml1-20020801-r2.ebuild, -xhtml1-20020801.ebuild:
+  Added DTDDECL to xhtml1.soc. Thanks to Peter Simons <simons@cryp.to>;
+  bug #33517.
 
   20 Nov 2003; Mike Gardiner <obz@gentoo.org> metadata.xml,
   xhtml1-20020801-r1.ebuild, xhtml1-20020801.ebuild:
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index afc382ea5630..bc416301a31d 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,6 +1,9 @@
+MD5 a509aea5b9a8560d429d605c0fcb614b xhtml1-20020801-r2.ebuild 838
 MD5 c3f3ba5db610c6dd08aae694492362f2 xhtml1-20020801-r1.ebuild 751
 MD5 86e0ea62ff79303182e03f2475e0db26 ChangeLog 943
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 9db45c3fd1bd4f6f06bcbec1f16b39ff xhtml1-20020801.ebuild 924
 MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r1 55
+MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r2 55
+MD5 125c5ca9bf2568b2dafae1e5050bf277 files/xhtml1-dtddecl.diff 599
 MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801 55
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801 b/app-text/xhtml1/files/digest-xhtml1-20020801-r2
index 44c04cf22c69..44c04cf22c69 100644
--- a/app-text/xhtml1/files/digest-xhtml1-20020801
+++ b/app-text/xhtml1/files/digest-xhtml1-20020801-r2
diff --git a/app-text/xhtml1/files/xhtml1-dtddecl.diff b/app-text/xhtml1/files/xhtml1-dtddecl.diff
new file mode 100644
index 000000000000..01320379708a
--- /dev/null
+++ b/app-text/xhtml1/files/xhtml1-dtddecl.diff
@@ -0,0 +1,13 @@
+--- xhtml.soc.orig	2004-11-06 22:00:14.000000000 +0900
++++ xhtml.soc	2004-11-06 22:06:13.060104558 +0900
+@@ -5,6 +5,10 @@
+ PUBLIC  "-//W3C//DTD XHTML 1.0 Transitional//EN"  "xhtml1-transitional.dtd"
+ PUBLIC  "-//W3C//DTD XHTML 1.0 Frameset//EN"      "xhtml1-frameset.dtd"
+ 
++DTDDECL "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1.dcl"
++DTDDECL "-//W3C//DTD XHTML 1.0 Transitional//EN" "xhtml1.dcl"
++DTDDECL "-//W3C//DTD XHTML 1.0 Frameset//EN" "xhtml1.dcl"
++
+         -- ISO latin 1 entity set for Extensible HTML (XML 1.0 format) --
+ 
+ PUBLIC	"-//W3C//ENTITIES Latin 1 for XHTML//EN"  "xhtml-lat1.ent"
diff --git a/app-text/xhtml1/xhtml1-20020801.ebuild b/app-text/xhtml1/xhtml1-20020801-r2.ebuild
index 814e17773327..eb30c43656ff 100644
--- a/app-text/xhtml1/xhtml1-20020801.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r2.ebuild
@@ -1,17 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801.ebuild,v 1.8 2004/07/14 00:51:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r2.ebuild,v 1.1 2004/11/06 13:19:44 usata Exp $
+
+inherit sgml-catalog eutils
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
 HOMEPAGE="http://www.w3.org/TR/${PN}/"
-SRC_URI="${HOMEPAGE}${PN}.tgz"
+SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
 LICENSE="W3C"
+
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
+
 DEPEND="app-text/sgml-common
 	!dev-util/gtk-doc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/DTD
+	epatch ${FILESDIR}/${PN}-dtddecl.diff
+}
+
 src_install() {
 	insinto /usr/share/sgml/${PN}
 	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
@@ -20,16 +30,5 @@ src_install() {
 	dohtml *.html *.png *.css
 }
 
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add /etc/sgml/${PN}.cat /usr/share/sgml/${PN}/xhtml.soc
-	fi
-}
-
-pkg_prerm() {
-	if [ -e /etc/sgml/${PN}.cat ]
-	then
-		install-catalog --remove /etc/sgml/${PN}.cat /usr/share/sgml/${PN}/xhtml.soc
-	fi
-}
+sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+	"/usr/share/sgml/${PN}/xhtml.soc"