Removing unnecessary block with xhtml1. See bug #33843.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 19 insertions, 16 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index d5f9a61e20b9..802f8be0146d 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.46 2005/06/17 21:06:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.47 2005/06/21 09:54:16 leonardop Exp $
+
+  22 Jun 2005; Leonardo Boshell <leonardop@gentoo.org> gtk-doc-1.3-r1.ebuild,
+  gtk-doc-1.2-r1.ebuild, gtk-doc-1.1.ebuild:
+  Remove xhtml1 block. The problems being blamed on xhtml1 were unrelated.
+  In case real problems arise, the block is not a reasonable solution. See
+  bug #33843.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gtk-doc-1.3-r1.ebuild:
   Stable on ppc.
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index ae0ed85a246f..a65906e57e49 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,9 +1,9 @@
-MD5 a43fd82a11cf9cf34f542ba09a7222ec gtk-doc-1.1.ebuild 950
+MD5 bc66bfd8259075cb135c0b2d2b670224 ChangeLog 5552
+MD5 68475e195ea8dfe88042c3bf550ca616 gtk-doc-1.1.ebuild 932
+MD5 731d8b6086a2e340d00f698a80196b2e gtk-doc-1.2-r1.ebuild 1001
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4fc225b66ac32e436702b83f62921330 gtk-doc-1.3-r1.ebuild 1155
-MD5 92e6e1c38d2428b47191d92539ec4fba ChangeLog 5261
-MD5 f9a751bcfc337782edd6266175608a9c gtk-doc-1.2-r1.ebuild 1019
-MD5 01e1d20270319035161fbafc0d87132c files/gtk-doc-1.3-declaration.patch 372
+MD5 b8fea84a8c5aca8a726a9316136a6425 gtk-doc-1.3-r1.ebuild 1140
+MD5 c036d436f5c42ec78ef0bb5507eb5437 files/digest-gtk-doc-1.1 64
 MD5 9e9bf533df75a1c8173b97715f5391a6 files/digest-gtk-doc-1.2-r1 64
+MD5 01e1d20270319035161fbafc0d87132c files/gtk-doc-1.3-declaration.patch 372
 MD5 7cc023d59d3e76467752a9eddc070059 files/digest-gtk-doc-1.3-r1 64
-MD5 c036d436f5c42ec78ef0bb5507eb5437 files/digest-gtk-doc-1.1 64
diff --git a/dev-util/gtk-doc/gtk-doc-1.1.ebuild b/dev-util/gtk-doc/gtk-doc-1.1.ebuild
index 1fc0ea1d680f..b6dfa0ad3357 100644
--- a/dev-util/gtk-doc/gtk-doc-1.1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.1.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/dev-util/gtk-doc/gtk-doc-1.1.ebuild,v 1.21 2005/05/27 10:04:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.1.ebuild,v 1.22 2005/06/21 09:54:16 leonardop Exp $
 
 inherit gnome.org
 
@@ -17,8 +17,7 @@ RDEPEND=">=app-text/openjade-1.3.1
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	>=dev-lang/perl-5.6
 	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6
-	!app-text/xhtml1"
+	>=dev-libs/libxml2-2.3.6"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
diff --git a/dev-util/gtk-doc/gtk-doc-1.2-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.2-r1.ebuild
index dbbe0eba6053..e0319665288e 100644
--- a/dev-util/gtk-doc/gtk-doc-1.2-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.2-r1.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/dev-util/gtk-doc/gtk-doc-1.2-r1.ebuild,v 1.11 2005/05/27 10:04:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.2-r1.ebuild,v 1.12 2005/06/21 09:54:16 leonardop Exp $
 
 inherit elisp-common gnome.org
 
@@ -20,8 +20,7 @@ DEPEND=">=app-text/openjade-1.3.1
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	>=dev-lang/perl-5.6
 	>=dev-libs/libxml2-2.3.6
-	dev-libs/libxslt
-	!app-text/xhtml1"
+	dev-libs/libxslt"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild
index 2fa451708e86..bbe672010860 100644
--- a/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.3-r1.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/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild,v 1.7 2005/06/17 21:06:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.3-r1.ebuild,v 1.8 2005/06/21 09:54:16 leonardop Exp $
 
 inherit eutils elisp-common gnome.org
 
@@ -19,8 +19,7 @@ DEPEND=">=app-text/openjade-1.3.1
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	>=dev-lang/perl-5.6
 	>=dev-libs/libxml2-2.3.6
-	dev-libs/libxslt
-	!app-text/xhtml1"
+	dev-libs/libxslt"
 
 src_unpack() {
 	unpack ${A}