New revision, with an actually correct patch for the catalog from bug #92020. Removed obsolete ebuilds.

(Portage version: 2.0.51.22-r1)

8 files changed, 39 insertions, 52 deletions

diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index a32d87bad456..9ee170946054 100644
--- a/app-text/xhtml1/ChangeLog
+++ b/app-text/xhtml1/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/xhtml1
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.12 2005/06/01 01:07:36 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.13 2005/06/21 09:25:29 leonardop Exp $
+
+*xhtml1-20020801-r3 (21 Jun 2005)
+
+  21 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+  xhtml1-20020801-r3.ebuild, files/xhtml1-catalog.patch:
+  New revision, with a corrected patch, the SGMLDECL keyword should be
+  removed now that we use DTDDECL. Resolves bug #92020, thanks to Peter
+  Simons. Doesn't block gtk-doc anymore (bug #33843). Marked stable on x86
+  since it fixes critical problems with openjade and the global catalogs
+  system.
 
   31 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   xhtml1-20020801-r2.ebuild:
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 260cec0e900d..c924cab37b91 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,7 +1,8 @@
 MD5 90ea4040ea6b50e5f23b7fa2cc73cff8 ChangeLog 1297
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 d5563290326a6eb0aff2cfad99a237d4 xhtml1-20020801-r1.ebuild 753
-MD5 9b42efe724e0d1005f242580e8335f71 xhtml1-20020801-r2.ebuild 844
-MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r1 55
+MD5 f932d6115bb249c5e40951e872c6bd7b xhtml1-20020801-r2.ebuild 847
+MD5 973eeaffc6dfc3d6c9af646036b1d6ae xhtml1-20020801-r3.ebuild 826
+MD5 89f90d2f6036d96c89c6d7a33c64c7cb files/xhtml1-catalog.patch 834
 MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r2 55
 MD5 125c5ca9bf2568b2dafae1e5050bf277 files/xhtml1-dtddecl.diff 599
+MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r3 55
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r2 b/app-text/xhtml1/files/digest-xhtml1-20020801-r2
deleted file mode 100644
index 44c04cf22c69..000000000000
--- a/app-text/xhtml1/files/digest-xhtml1-20020801-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fdad567eecb5deb8e32e3892cfe0074 xhtml1.tgz 232192
diff --git a/app-text/xhtml1/files/digest-xhtml1-20020801-r1 b/app-text/xhtml1/files/digest-xhtml1-20020801-r3
index 44c04cf22c69..44c04cf22c69 100644
--- a/app-text/xhtml1/files/digest-xhtml1-20020801-r1
+++ b/app-text/xhtml1/files/digest-xhtml1-20020801-r3
diff --git a/app-text/xhtml1/files/xhtml1-catalog.patch b/app-text/xhtml1/files/xhtml1-catalog.patch
new file mode 100644
index 000000000000..37b41a2b0dc1
--- /dev/null
+++ b/app-text/xhtml1/files/xhtml1-catalog.patch
@@ -0,0 +1,19 @@
+diff -NurdB xhtml1-20020801/DTD/xhtml.soc xhtml1-20020801-patched/DTD/xhtml.soc
+--- xhtml1-20020801/DTD/xhtml.soc	2002-08-01 13:23:08.000000000 -0500
++++ xhtml1-20020801-patched/DTD/xhtml.soc	2005-06-21 04:12:36.000000000 -0500
+@@ -1,4 +1,9 @@
+ OVERRIDE	YES
++
++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"
++
+         -- Oasis entity catalog for Extensible HTML 1.0 --
+ 
+ PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN"        "xhtml1-strict.dtd"
+@@ -10,5 +15,3 @@
+ PUBLIC	"-//W3C//ENTITIES Latin 1 for XHTML//EN"  "xhtml-lat1.ent"
+ PUBLIC	"-//W3C//ENTITIES Symbols for XHTML//EN" "xhtml-symbol.ent"
+ PUBLIC	"-//W3C//ENTITIES Special for XHTML//EN" "xhtml-special.ent"
+-
+-SGMLDECL "xhtml1.dcl"
diff --git a/app-text/xhtml1/files/xhtml1-dtddecl.diff b/app-text/xhtml1/files/xhtml1-dtddecl.diff
deleted file mode 100644
index 01320379708a..000000000000
--- a/app-text/xhtml1/files/xhtml1-dtddecl.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-r1.ebuild b/app-text/xhtml1/xhtml1-20020801-r1.ebuild
deleted file mode 100644
index 76aca84495b2..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r1.ebuild
+++ /dev/null
@@ -1,28 +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/xhtml1/xhtml1-20020801-r1.ebuild,v 1.8 2005/01/01 16:43:05 eradicator Exp $
-
-inherit sgml-catalog
-
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/${PN}/"
-SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
-LICENSE="W3C"
-
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="app-text/sgml-common
-	!dev-util/gtk-doc"
-
-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
-}
-
-sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
-	"/usr/share/sgml/${PN}/xhtml.soc"
diff --git a/app-text/xhtml1/xhtml1-20020801-r2.ebuild b/app-text/xhtml1/xhtml1-20020801-r3.ebuild
index fa0f4eeabb1b..ef5e140cfd45 100644
--- a/app-text/xhtml1/xhtml1-20020801-r2.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r3.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r2.ebuild,v 1.3 2005/06/01 01:07:36 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r3.ebuild,v 1.1 2005/06/21 09:25:29 leonardop Exp $
 
 inherit sgml-catalog eutils
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/${PN}/"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
 SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
 LICENSE="W3C"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND="app-text/sgml-common
-	!dev-util/gtk-doc"
+DEPEND="app-text/sgml-common"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DTD
-	epatch ${FILESDIR}/${PN}-dtddecl.diff
+	epatch ${FILESDIR}/${PN}-catalog.patch
 }
 
 src_install() {