Block gtk-doc, they causes problems together

5 files changed, 22 insertions, 9 deletions

diff --git a/app-text/xhtml1/ChangeLog b/app-text/xhtml1/ChangeLog
index 2acb842c26f8..f03233271d1c 100644
--- a/app-text/xhtml1/ChangeLog
+++ b/app-text/xhtml1/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xhtml1
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.7 2003/07/11 20:35:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/ChangeLog,v 1.8 2003/11/20 10:12:59 obz Exp $
+
+  20 Nov 2003; Mike Gardiner <obz@gentoo.org> metadata.xml,
+  xhtml1-20020801-r1.ebuild, xhtml1-20020801.ebuild:
+  Blocking gtk-doc. xhtml1 and gtk-doc cause all sorts of problems together,
+  they dont agree much. Check bug #33843 and links
 
 *xhtml1-20020801-r1 (13 Feb 2003)
  
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 88ef3cde3f53..8c217941d0c5 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,5 +1,6 @@
-MD5 4032a64fa88cddc42f99403ad4f8aee7 ChangeLog 706
-MD5 c0d18e9242a12c75f6b5789a74eb4144 xhtml1-20020801-r1.ebuild 711
-MD5 d8adab86e0eb4c9e17279d3cbe336928 xhtml1-20020801.ebuild 906
-MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801 55
+MD5 c1489a0c85acc91094fcd7f0e52d180a xhtml1-20020801-r1.ebuild 727
+MD5 b484f8888dfb4f9342f93d2acab8a4f1 ChangeLog 947
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 2924535d742ca97a5c554f05b2f3977c xhtml1-20020801.ebuild 920
 MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801-r1 55
+MD5 f4c640b63a2ac682e353b542c01a5081 files/digest-xhtml1-20020801 55
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
new file mode 100644
index 000000000000..06689a1a9114
--- /dev/null
+++ b/app-text/xhtml1/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>text-markup</herd>
+</pkgmetadata>
diff --git a/app-text/xhtml1/xhtml1-20020801-r1.ebuild b/app-text/xhtml1/xhtml1-20020801-r1.ebuild
index a6bfc4d7345d..28f18126ed79 100644
--- a/app-text/xhtml1/xhtml1-20020801-r1.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.3 2003/02/13 09:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801-r1.ebuild,v 1.4 2003/11/20 10:12:59 obz Exp $
 
 inherit sgml-catalog
 
@@ -10,7 +10,8 @@ SRC_URI="${HOMEPAGE}${PN}.tgz"
 LICENSE="W3C"
 SLOT="0"
 KEYWORDS="x86"
-DEPEND="app-text/sgml-common"
+DEPEND="app-text/sgml-common
+	!dev-util/gtk-doc"
 
 src_install() {
 	insinto /usr/share/sgml/${PN}
diff --git a/app-text/xhtml1/xhtml1-20020801.ebuild b/app-text/xhtml1/xhtml1-20020801.ebuild
index efdf61975700..a049fdcd441a 100644
--- a/app-text/xhtml1/xhtml1-20020801.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801.ebuild,v 1.4 2003/09/05 22:37:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xhtml1/xhtml1-20020801.ebuild,v 1.5 2003/11/20 10:12:59 obz Exp $
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
 HOMEPAGE="http://www.w3.org/TR/${PN}/"
@@ -8,7 +8,8 @@ SRC_URI="${HOMEPAGE}${PN}.tgz"
 LICENSE="W3C"
 SLOT="0"
 KEYWORDS="x86"
-DEPEND="app-text/sgml-common"
+DEPEND="app-text/sgml-common
+	!dev-util/gtk-doc"
 
 src_install() {
 	insinto /usr/share/sgml/${PN}