new version and cleanup

9 files changed, 33 insertions, 226 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 327e2307944a..6997e41c6c3d 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.24 2003/03/04 11:17:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.25 2003/04/19 11:33:23 foser Exp $
+
+*gstreamer-0.6.1 (19 Apr 2003)
+
+  19 Apr 2003; foser <foser@gentoo.org> gstreamer-0.6.1.ebuild :
+  New version, remove some patching thats incorporated now
 
   10 Feb 2003; Aron Griffis <agriffis@gentoo.org> gstreamer-0.6.0-r2.ebuild :
   Add ~alpha to KEYWORDS
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.4.0-r1 b/media-libs/gstreamer/files/digest-gstreamer-0.4.0-r1
deleted file mode 100644
index d733178f9223..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1f24c7bb3d7bbed820f90d2a57515b8 gstreamer-0.4.0.tar.gz 1272063
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r2 b/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r2
deleted file mode 100644
index 2789145ef45b..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.4.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8248ce5c5ccb26c66377451f2bf230e3 gstreamer-0.4.1.tar.gz 1329588
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.4.2-r1 b/media-libs/gstreamer/files/digest-gstreamer-0.4.2-r1
deleted file mode 100644
index df174844da32..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9e4eed8bac71f52044e2b28356c81ef gstreamer-0.4.2.tar.bz2 1003933
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.1 b/media-libs/gstreamer/files/digest-gstreamer-0.6.1
new file mode 100644
index 000000000000..847fdcb30108
--- /dev/null
+++ b/media-libs/gstreamer/files/digest-gstreamer-0.6.1
@@ -0,0 +1 @@
+MD5 e9db8443c7679978b72d485c744f3189 gstreamer-0.6.1.tar.bz2 1063325
diff --git a/media-libs/gstreamer/files/xsl.diff b/media-libs/gstreamer/files/xsl.diff
deleted file mode 100644
index 04834bfda6a3..000000000000
--- a/media-libs/gstreamer/files/xsl.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN gstreamer-0.4.1/docs/devhelp/Makefile.in gstreamer-0.4.1-modified/docs/devhelp/Makefile.in
---- gstreamer-0.4.1/docs/devhelp/Makefile.in	Sat Sep 21 17:48:04 2002
-+++ gstreamer-0.4.1-modified/docs/devhelp/Makefile.in	Mon Sep 23 14:23:50 2002
-@@ -273,9 +273,9 @@
- gstreamer-libs.devhelp:
- 	cd ../libs && make
- 	$(PYTHON) ./html2xml.py ../libs/html
--	sed 's@base=""@base="@HTML_DIR@/gstreamer-libs"@g' html.devhelp > gstreamer-libs.devhelp
-+	#sed 's@base=""@base="@HTML_DIR@/gstreamer-libs"@g' html.devhelp > gstreamer-libs.devhelp
- 	perl -i -p -e 's/name="html"/name="gstreamer-libs"/' gstreamer-libs.devhelp
--	rm html.devhelp
-+	#rm html.devhelp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -urN gstreamer-0.4.1/docs/xsl/html.xsl gstreamer-0.4.1-modified/docs/xsl/html.xsl
---- gstreamer-0.4.1/docs/xsl/html.xsl	Sat Aug 31 13:17:01 2002
-+++ gstreamer-0.4.1-modified/docs/xsl/html.xsl	Mon Sep 23 13:50:09 2002
-@@ -6,8 +6,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"/>
-+<xsl:import href="file:///usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl"/> 
- 
- <!-- .. and customize them here:                               -->
- <xsl:include href="fileext.xsl"/>
diff --git a/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild b/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild
deleted file mode 100644
index dad4b34c0585..000000000000
--- a/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 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.0-r1.ebuild,v 1.10 2003/02/13 12:45:01 vapier 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/passivetex
-		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_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
deleted file mode 100644
index 160c7c8bc31b..000000000000
--- a/media-libs/gstreamer/gstreamer-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2003 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.6 2003/02/13 12:45:05 vapier Exp $
-
-inherit flag-o-matic
-
-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/passivetex
-		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() {
-
-	replace-flags "-03" "-O2"
-
-	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.2-r1.ebuild b/media-libs/gstreamer/gstreamer-0.6.1.ebuild
index f0fae69dd5e8..b84bf37ba855 100644
--- a/media-libs/gstreamer/gstreamer-0.4.2-r1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.6.1.ebuild
@@ -1,39 +1,38 @@
 # Copyright 1999-2003 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.6 2003/02/13 12:45:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.6.1.ebuild,v 1.1 2003/04/19 11:33:23 foser Exp $
 
-inherit eutils libtool flag-o-matic
+inherit eutils flag-o-matic libtool
 
-IUSE="doc"
+# Create a major/minor combo for our SLOT and executables suffix
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
 
-S="${WORKDIR}/${P}"
+IUSE="x86"
+
+S=${WORKDIR}/${P}
 DESCRIPTION="Streaming media framework"
 SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
 HOMEPAGE="http://gstreamer.sourceforge.net"
 
-SLOT="0"
+SLOT=${PV_MAJ_MIN}
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND=">=dev-libs/glib-2.0.4
 	>=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/passivetex
-		app-text/xpdf
-		app-text/ghostscript )
 	x86? ( >=dev-lang/nasm-0.90 )
 	>=sys-libs/zlib-1.1.4"
-	
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# Patch for problems compiling when specifying USE="doc"
-	epatch ${FILESDIR}/xsl.diff
-}
+
+# disable docs for now
+#	doc? ( >=dev-util/gtk-doc-0.9
+#		media-gfx/transfig
+#		dev-libs/libxslt
+#		app-text/docbook-xsl-stylesheets
+#		app-text/passivetex
+#		app-text/xpdf
+#		app-text/ghostscript )
 
 src_compile() {
 	elibtoolize
@@ -41,12 +40,14 @@ src_compile() {
 	strip-flags
 	replace-flags "-O3" "-O2"
 
-	local myconf
-	use doc \
-		&& myconf="${myconf} --enable-docs-build" \
-		|| myconf="${myconf} --disable-docs-build"
+	local myconf=""
+#	use doc \
+#		&& myconf="${myconf} --enable-docs-build" \
+#		|| myconf="${myconf} --disable-docs-build"
+	myconf="${myconf} --disable-docs-build"
 
 	econf \
+		--program-suffix=-${PV_MAJ_MIN} \
 		--with-configdir=/etc/gstreamer \
 		--disable-tests  --disable-examples \
 		${myconf} || die "./configure failed"
@@ -62,5 +63,5 @@ src_install () {
 }
 
 pkg_postinst () {
-	gst-register
+	gst-register-${PV_MAJ_MIN}
 }