Fix docs building. Resolves bug #55700.

4 files changed, 56 insertions, 9 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 552be1f4f8ec..d0221ab09a6c 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.61 2004/06/29 17:42:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.62 2004/07/01 20:03:41 leonardop Exp $
+
+  01 Jul 2004; L. Boshell <leonardop@gentoo.org> gstreamer-0.8.3.ebuild,
+  files/gstreamer-0.8.3-jade_fix.patch:
+  Patch to fix docs building process. Resolves bug #55700.
 
 *gstreamer-0.8.3 (29 Jun 2004)
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 546d68ed426c..7592df63a177 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,12 +1,13 @@
+MD5 c24ebd79589371eba489be92cece3119 ChangeLog 9412
 MD5 bf72c2c17b5dcb1ccdde4e5763ebe071 gstreamer-0.8.1.ebuild 2195
-MD5 979a9fc07a6db9d5102891ef1de2e4bf gstreamer-0.8.3.ebuild 1903
+MD5 ef2cc08f66e958d38a9adf22fa194819 gstreamer-0.8.3.ebuild 2070
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9ef739073895812b13c8c1e5fca45c0b gstreamer-0.6.4.ebuild 1852
 MD5 e87651ba764693056a6353cbae6ab6c0 gstreamer-0.8.0.ebuild 2179
-MD5 a00d3000597ae5c53a046b68a9476aa2 ChangeLog 9235
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c7cf43fd49b58741237224b5e48e188a files/gstreamer-0.8-unclobber_asm.patch 1164
-MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
-MD5 16471f40b2c558c85402c638d1d5f06c files/digest-gstreamer-0.8.0 69
 MD5 3abab202e8f94756a8828e3af3bb7be5 files/digest-gstreamer-0.8.1 69
+MD5 c7cf43fd49b58741237224b5e48e188a files/gstreamer-0.8-unclobber_asm.patch 1164
 MD5 d219e0115125181e4730a98f86ca463b files/digest-gstreamer-0.8.3 69
+MD5 465e9b8e2f33205128b7a69eca2e2c02 files/gstreamer-0.8.3-jade_fix.patch 1713
+MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
 MD5 e373aed252b48ef567dbdda42e090c1f files/gnu_asm_fix.patch 953
+MD5 16471f40b2c558c85402c638d1d5f06c files/digest-gstreamer-0.8.0 69
diff --git a/media-libs/gstreamer/files/gstreamer-0.8.3-jade_fix.patch b/media-libs/gstreamer/files/gstreamer-0.8.3-jade_fix.patch
new file mode 100644
index 000000000000..4c96215da2e2
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.8.3-jade_fix.patch
@@ -0,0 +1,33 @@
+diff -NurdB gstreamer-0.8.3-orig/docs/faq/faq.xml gstreamer-0.8.3/docs/faq/faq.xml
+--- gstreamer-0.8.3-orig/docs/faq/faq.xml	2004-07-01 12:51:55 -0500
++++ gstreamer-0.8.3/docs/faq/faq.xml	2004-07-01 12:52:38 -0500
+@@ -1,6 +1,6 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
++          "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
+ 
+ <!ENTITY % image-entities SYSTEM "image.entities">
+ %image-entities;
+diff -NurdB gstreamer-0.8.3-orig/docs/manual/manual.xml gstreamer-0.8.3/docs/manual/manual.xml
+--- gstreamer-0.8.3-orig/docs/manual/manual.xml	2004-07-01 12:51:55 -0500
++++ gstreamer-0.8.3/docs/manual/manual.xml	2004-07-01 14:09:42 -0500
+@@ -1,6 +1,6 @@
+ <?xml version='1.0'?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-                  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
++                  "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
+ <!ENTITY % image-entities SYSTEM "image.entities">
+ %image-entities;
+ <!ENTITY % version-entities SYSTEM "version.entities">
+diff -NurdB gstreamer-0.8.3-orig/docs/pwg/pwg.xml gstreamer-0.8.3/docs/pwg/pwg.xml
+--- gstreamer-0.8.3-orig/docs/pwg/pwg.xml	2004-07-01 12:51:55 -0500
++++ gstreamer-0.8.3/docs/pwg/pwg.xml	2004-07-01 14:14:04 -0500
+@@ -1,6 +1,6 @@
+ <?xml version='1.0'?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
++               "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
+ <!ENTITY % image-entities SYSTEM "image.entities">
+ %image-entities;
+ <!ENTITY % version-entities SYSTEM "version.entities">
diff --git a/media-libs/gstreamer/gstreamer-0.8.3.ebuild b/media-libs/gstreamer/gstreamer-0.8.3.ebuild
index e21fe0513e4d..261cd3480210 100644
--- a/media-libs/gstreamer/gstreamer-0.8.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.3.ebuild,v 1.2 2004/06/29 17:42:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.3.ebuild,v 1.3 2004/07/01 20:03:41 leonardop Exp $
 
 inherit eutils flag-o-matic libtool gnome2
 
@@ -24,7 +24,16 @@ RDEPEND=">=dev-libs/glib-2.2
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.11.5
 	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc
+		=app-text/docbook-xml-dtd-4.2* )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix doc generation with jade. See bug #55700.
+	epatch ${FILESDIR}/${P}-jade_fix.patch
+}
 
 src_compile() {