Added DTDDECL to HTML4.cat; bug #33517.

5 files changed, 36 insertions, 19 deletions

diff --git a/app-text/html401/ChangeLog b/app-text/html401/ChangeLog
index d2f7d3377468..e914501a10fa 100644
--- a/app-text/html401/ChangeLog
+++ b/app-text/html401/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/html401
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.6 2004/06/24 22:39:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.7 2004/11/06 12:56:17 usata Exp $
+
+*html401-19991224-r2 (06 Nov 2004)
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> +files/html401-decl.diff,
+  +html401-19991224-r2.ebuild, -html401-19991224.ebuild:
+  Added DTDDECL to HTML4.cat; bug #33517.
 
   16 Apr 2004; Michael McCabe <randy@gentoo.org>
   html401-19991224-r1.ebuild:
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index 636d32f0f243..7bd84529f5a0 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,7 @@
+MD5 48f727a31787483c032bbe906b6684db HTML4.cat 514
 MD5 eb5be43fc761a035644d8256471ccb71 html401-19991224-r1.ebuild 704
-MD5 3f48d1b5244a42f2a7aa3d2b6ffb677e html401-19991224.ebuild 874
 MD5 fb03c429ff95c80f2ba164f3175f326d ChangeLog 721
+MD5 a00fa968db9568b29c5bd4e077a4ded9 html401-19991224-r2.ebuild 789
 MD5 1b3e89643eafe12ccb08ed86705b78c7 files/digest-html401-19991224-r1 55
-MD5 1b3e89643eafe12ccb08ed86705b78c7 files/digest-html401-19991224 55
+MD5 1b3e89643eafe12ccb08ed86705b78c7 files/digest-html401-19991224-r2 55
+MD5 7c6e3f8185b8e05e98a1b06b01baf482 files/html401-decl.diff 469
diff --git a/app-text/html401/files/digest-html401-19991224 b/app-text/html401/files/digest-html401-19991224-r2
index c047d8034b7b..c047d8034b7b 100644
--- a/app-text/html401/files/digest-html401-19991224
+++ b/app-text/html401/files/digest-html401-19991224-r2
diff --git a/app-text/html401/files/html401-decl.diff b/app-text/html401/files/html401-decl.diff
new file mode 100644
index 000000000000..27819a8afd17
--- /dev/null
+++ b/app-text/html401/files/html401-decl.diff
@@ -0,0 +1,12 @@
+--- HTML4.cat.orig	2004-11-06 20:25:39.000000000 +0900
++++ HTML4.cat	2004-11-06 21:16:08.543377286 +0900
+@@ -1,5 +1,9 @@
+ OVERRIDE YES
+ 
++DTDDECL "-//W3C//DTD HTML 4.01//EN" HTML4.decl
++DTDDECL "-//W3C//DTD HTML 4.01 Transitional//EN" HTML4.decl
++DTDDECL "-//W3C//DTD HTML 4.01 Frameset//EN" HTML4.decl
++
+ PUBLIC "-//W3C//DTD HTML 4.01//EN" strict.dtd
+ PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" loose.dtd
+ PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" frameset.dtd
diff --git a/app-text/html401/html401-19991224.ebuild b/app-text/html401/html401-19991224-r2.ebuild
index 3859de0728b4..98f8f26e4ade 100644
--- a/app-text/html401/html401-19991224.ebuild
+++ b/app-text/html401/html401-19991224-r2.ebuild
@@ -1,17 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224.ebuild,v 1.7 2004/07/13 22:03:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224-r2.ebuild,v 1.1 2004/11/06 12:56:17 usata Exp $
+
+inherit sgml-catalog eutils
 
 DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
 HOMEPAGE="http://www.w3.org/TR/${PN}/"
-SRC_URI="${HOMEPAGE}html40.tgz"
+SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
 S=${WORKDIR}
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~s390"
 IUSE=""
 DEPEND="app-text/sgml-common"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-decl.diff
+}
+
 src_install() {
 	insinto /usr/share/sgml/${PN}
 	doins HTML4.cat HTML4.decl *.dtd *.ent
@@ -19,16 +27,5 @@ src_install() {
 	dohtml *.html */*
 }
 
-pkg_postinst() {
-	if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ]
-	then
-		install-catalog --add /etc/sgml/${PN}.cat /usr/share/sgml/${PN}/HTML4.cat
-	fi
-}
-
-pkg_prerm() {
-	if [ -e /etc/sgml/${PN}.cat ]
-	then
-		install-catalog --remove /etc/sgml/${PN}.cat /usr/share/sgml/${PN}/HTML4.cat
-	fi
-}
+sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+	"/usr/share/sgml/${PN}/HTML4.cat"