Moving sgml-catalog_cat_include into pkg_setup(). Removing obsolete ebuild.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 14 insertions, 46 deletions

diff --git a/app-text/html401/ChangeLog b/app-text/html401/ChangeLog
index c8b208dd4244..c64aadcc7288 100644
--- a/app-text/html401/ChangeLog
+++ b/app-text/html401/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/html401
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.10 2005/06/21 09:32:53 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/ChangeLog,v 1.11 2005/07/10 00:22:29 leonardop Exp $
+
+  09 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  html401-19991224-r2.ebuild:
+  Moved sgml-catalog_cat_include into pkg_setup().
 
   21 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
   html401-19991224-r2.ebuild:
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index 64911a50ab1e..8b95bb3818a8 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 242401f11c95d3a8b2dd826d423415f6 html401-19991224-r2.ebuild 792
+MD5 686d8a4d8472844bc0fb8ae2722bbbda ChangeLog 1277
+MD5 4182b2b77d7d9394ab292c9fbdd7686d html401-19991224-r2.ebuild 813
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 6f03523102e70b100f9bee9e70be55a6 html401-19991224-r1.ebuild 706
-MD5 2c32387b8a628bea02f78ebb2874a0b2 ChangeLog 1140
-MD5 7c6e3f8185b8e05e98a1b06b01baf482 files/html401-decl.diff 469
 MD5 1b3e89643eafe12ccb08ed86705b78c7 files/digest-html401-19991224-r2 55
-MD5 1b3e89643eafe12ccb08ed86705b78c7 files/digest-html401-19991224-r1 55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzez5gIKl8Uu19MoRAsb/AJ9OGvt4Y05qDJF/3gerY6e8Ud3gJACfbU1D
-XoJbZ8InBiTnKXKa7D3++kM=
-=RmWI
------END PGP SIGNATURE-----
+MD5 7c6e3f8185b8e05e98a1b06b01baf482 files/html401-decl.diff 469
diff --git a/app-text/html401/files/digest-html401-19991224-r1 b/app-text/html401/files/digest-html401-19991224-r1
deleted file mode 100644
index c047d8034b7b..000000000000
--- a/app-text/html401/files/digest-html401-19991224-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ed76627ba80816079649f67023ec7ab html40.tgz 369830
diff --git a/app-text/html401/html401-19991224-r1.ebuild b/app-text/html401/html401-19991224-r1.ebuild
deleted file mode 100644
index 222c5b02b3ee..000000000000
--- a/app-text/html401/html401-19991224-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224-r1.ebuild,v 1.9 2005/01/01 16:19:50 eradicator Exp $
-
-inherit sgml-catalog
-
-DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
-HOMEPAGE="http://www.w3.org/TR/${PN}/"
-SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
-S=${WORKDIR}
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="x86 s390"
-IUSE=""
-DEPEND="app-text/sgml-common"
-
-src_install() {
-	insinto /usr/share/sgml/${PN}
-	doins HTML4.cat HTML4.decl *.dtd *.ent
-	insinto /etc/sgml
-	dohtml *.html */*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-	"/usr/share/sgml/${PN}/HTML4.cat"
diff --git a/app-text/html401/html401-19991224-r2.ebuild b/app-text/html401/html401-19991224-r2.ebuild
index 86016a7b512d..6a64ba6345ad 100644
--- a/app-text/html401/html401-19991224-r2.ebuild
+++ b/app-text/html401/html401-19991224-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224-r2.ebuild,v 1.5 2005/07/08 03:02:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html401/html401-19991224-r2.ebuild,v 1.6 2005/07/10 00:22:29 leonardop Exp $
 
 inherit sgml-catalog eutils
 
@@ -14,6 +14,11 @@ KEYWORDS="~ppc s390 x86"
 IUSE=""
 DEPEND="app-text/sgml-common"
 
+pkg_setup() {
+	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+		"/usr/share/sgml/${PN}/HTML4.cat"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -26,6 +31,3 @@ src_install() {
 	insinto /etc/sgml
 	dohtml *.html */*
 }
-
-sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-	"/usr/share/sgml/${PN}/HTML4.cat"