redo xsl patch

8 files changed, 31 insertions, 101 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 756572caf2c6..b7fc2ee46a2e 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.13 2002/12/26 23:22:18 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.14 2002/12/27 18:14:48 azarah Exp $
 
+*gstreamer-0.5.0-r1 (27 Dec 2002)
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gstreamer-0.5.0-r1.ebuild :
+  Redo previous fix.  We path html.xsl to rather need the 'current' version of
+  docbook-xsl-stylesheets, and not a specific version.  This voids the need to
+  depend on a specific version ...
 
 *gstreamer-0.5.0 (26 Dec 2002)
 
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r1 b/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r1
deleted file mode 100644
index 2789145ef45b..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8248ce5c5ccb26c66377451f2bf230e3 gstreamer-0.4.1.tar.gz 1329588
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.5.0 b/media-libs/gstreamer/files/digest-gstreamer-0.5.0-r1
index 26b1067f9200..26b1067f9200 100644
--- a/media-libs/gstreamer/files/digest-gstreamer-0.5.0
+++ b/media-libs/gstreamer/files/digest-gstreamer-0.5.0-r1
diff --git a/media-libs/gstreamer/files/gstreamer-0.5.0-xsl-use-current.patch b/media-libs/gstreamer/files/gstreamer-0.5.0-xsl-use-current.patch
new file mode 100644
index 000000000000..d640f2c99669
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.5.0-xsl-use-current.patch
@@ -0,0 +1,11 @@
+--- gstreamer-0.5.0/docs/xsl/html.xsl.orig	2002-12-27 00:24:49.000000000 +0200
++++ gstreamer-0.5.0/docs/xsl/html.xsl	2002-12-27 00:35:51.000000000 +0200
+@@ -7,7 +7,7 @@
+ <!-- This file is for customizing the default XSL stylesheets. -->
+ <!-- We include them here (this one is for HTML output):       -->
+ <xsl:import
+- href="http://docbook.sourceforge.net/release/xsl/1.50.0/xhtml/chunk.xsl"/>
++ href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
+ 
+ <!-- .. and customize them here:                               -->
+ <xsl:include href="fileext.xsl"/>
diff --git a/media-libs/gstreamer/gstreamer-0.4.1-r1.ebuild b/media-libs/gstreamer/gstreamer-0.4.1-r1.ebuild
deleted file mode 100644
index d712c145662a..000000000000
--- a/media-libs/gstreamer/gstreamer-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.1-r1.ebuild,v 1.5 2002/12/09 04:26:11 manson Exp $
-
-IUSE="doc"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc "
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	doc? ( >=dev-util/gtk-doc-0.9 
-		media-gfx/transfig 
-		dev-libs/libxslt
-		app-text/xmltex
-		app-text/xpdf
-		app-text/ghostscript )
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-	
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	>=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# patch for problems compiling when specifying USE="doc"
-	patch -p1 < ${FILESDIR}/xsl.diff || die "patch failed"
-
-}
-
-src_compile() {
-	local myconf
-	use doc \
-		&& myconf="${myconf} --enable-docs-build" \
-		|| myconf="${myconf} --disable-docs-build"
-
-	# gtkdoc-fixxref should do its stuff in DESTDIR
-	pushd docs/libs
-	sed 's/\(gtkdoc-fixxref.*html-dir=\)/\1$(DESTDIR)/' \
-		Makefile.am > Makefile.am.new
-
-	mv Makefile.am.new Makefile.am
-
-	popd
-
-	econf \
-		--with-configdir=/etc/gstreamer \
-		--disable-tests  --disable-examples \
-		${myconf} || die "./configure failed"
-
-	emake || die "compile failed" 
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	# gtkdoc will install stuff in a directory with wrong name (wrong after my opinion)
-	# fix it:
-	mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	# now have to clean after gtkdoc-fixxref
-	prepalldocs
-	dodoc AUTHORS COPYING COPYING.LIB INSTALL README RELEASE REQUIREMENTS TODO
-	# will do these later - must do some recursive stuff about it... (with find???)
-	# docs/random/*
-	# examples/*
-	# get all those html manuals and stuff like that.
-	dohtml -r docs
-}
-
-pkg_postinst () {
-	gst-register
-}
diff --git a/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild b/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild
index c82daee872eb..7f4bf9b17c16 100644
--- a/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild,v 1.3 2002/12/09 04:26:11 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild,v 1.4 2002/12/27 18:14:48 azarah Exp $
 
 inherit flag-o-matic
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gstreamer.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+KEYWORDS="x86 ppc sparc "
 
 # required packages
 # there are many many optional libraries. features are compiled if the libraries
diff --git a/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild b/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild
index 6ddee62d9aff..40e7f4f940ea 100644
--- a/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild,v 1.3 2002/12/09 04:26:11 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild,v 1.4 2002/12/27 18:14:48 azarah Exp $
 
-inherit flag-o-matic
+inherit eutils libtool flag-o-matic
 
 IUSE="doc"
 
-S=${WORKDIR}/${P}
-
+S="${WORKDIR}/${P}"
 DESCRIPTION="Streaming media framework"
 SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
 HOMEPAGE="http://gstreamer.sourceforge.net"
@@ -30,12 +29,15 @@ DEPEND=">=dev-libs/glib-2.0.4
 	
 src_unpack() {
 	unpack ${A}
+	
 	cd ${S}
-	# patch for problems compiling when specifying USE="doc"
-	patch -p1 < ${FILESDIR}/xsl.diff || die "patch failed"
+	# Patch for problems compiling when specifying USE="doc"
+	epatch ${FILESDIR}/xsl.diff
 }
 
 src_compile() {
+	elibtoolize
+
 	strip-flags
 	replace-flags "-O3" "-O2"
 
diff --git a/media-libs/gstreamer/gstreamer-0.5.0.ebuild b/media-libs/gstreamer/gstreamer-0.5.0-r1.ebuild
index e86bd78e5d36..980ee7e0287e 100644
--- a/media-libs/gstreamer/gstreamer-0.5.0.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.5.0.ebuild,v 1.1 2002/12/26 23:22:18 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.5.0-r1.ebuild,v 1.1 2002/12/27 18:14:48 azarah Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -21,14 +21,12 @@ DEPEND=">=dev-libs/glib-2.0.4
 	doc? ( >=dev-util/gtk-doc-0.9
 		media-gfx/transfig
 		dev-libs/libxslt
-		=app-text/docbook-xsl-stylesheets-1.57.0*
+		app-text/docbook-xsl-stylesheets
 		app-text/xmltex
 		app-text/xpdf
 		app-text/ghostscript )
 	x86? ( >=dev-lang/nasm-0.90 )
 	>=sys-libs/zlib-1.1.4"
-# !!! NOTE: if you change above app-text/docbook-xsl-stylesheets       !!!
-# !!!       DEPEND, you also have to ajust ${FILESDIR}/${P}-xsl.patch  !!!
 	
 src_unpack() {
 	unpack ${A}
@@ -39,7 +37,7 @@ src_unpack() {
 	# and delete files it should not.
 	# <azarah@gentoo.org> (27 Dec 2002).
 	cd ${S}
-	epatch ${FILESDIR}/${P}-xsl.patch
+	epatch ${FILESDIR}/${P}-xsl-use-current.patch
 	epatch ${FILESDIR}/${P}-no-rm-html.devhelp.patch
 }