new version and cleanups

12 files changed, 21 insertions, 544 deletions

diff --git a/media-libs/gst-plugins/ChangeLog b/media-libs/gst-plugins/ChangeLog
index 91f99d47f18a..0a9389f45e7a 100644
--- a/media-libs/gst-plugins/ChangeLog
+++ b/media-libs/gst-plugins/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-libs/gst-plugins
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.28 2003/02/27 12:41:07 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/ChangeLog,v 1.29 2003/04/19 11:40:38 foser Exp $
+
+*gst-plugins-0.6.1 (19 Apr 2003)
+
+  19 Apr 2003; foser <foser@gentoo.org> gst-plugins-0.6.1.ebuild :
+  reenabled v4l stuff, removed some incorporated patches
+  added cdparanoia as dep again for sound-juicer
 
 *gst-plugins-0.6.0-r4 (27 Feb 2003)
 
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1
deleted file mode 100644
index daf84ecd6c8c..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 753d7b6f4c1c997bd9a60bffcd716af6 gst-plugins-0.4.1.tar.gz 1848403
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r2
deleted file mode 100644
index d31363476a96..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2d499cf117408b5a4adc7a0d71eb095 gst-plugins-0.4.2.tar.gz 1937052
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r1
deleted file mode 100644
index 8195a933e515..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6548e5cde239dff066f1eb5b9f62fec5 gst-plugins-0.6.0.tar.bz2 1876447
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r2
deleted file mode 100644
index 8195a933e515..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6548e5cde239dff066f1eb5b9f62fec5 gst-plugins-0.6.0.tar.bz2 1876447
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r3 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r3
deleted file mode 100644
index 8195a933e515..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6548e5cde239dff066f1eb5b9f62fec5 gst-plugins-0.6.0.tar.bz2 1876447
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.1
new file mode 100644
index 000000000000..5bf164be6bca
--- /dev/null
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.1
@@ -0,0 +1 @@
+MD5 ddf0d5ae8628b3a6c99ca8f3c184a89f gst-plugins-0.6.1.tar.bz2 1891444
diff --git a/media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild b/media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild
deleted file mode 100644
index 657cdc866afd..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild,v 1.7 2003/02/13 12:44:45 vapier Exp $
-
-inherit libtool gnome2 flag-o-matic
-
-IUSE="encode quicktime mpeg oggvorbis jpeg esd gnome mikmod avi sdl png alsa arts dvd aalib"
-S=${WORKDIR}/${P}
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND=">=media-libs/gstreamer-0.4.1
-	>=gnome-base/gconf-1.2.0
-	media-sound/mad
-	media-libs/flac
-	media-sound/cdparanoia
-	media-libs/hermes
-	>=media-libs/libdv-0.9.5
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	=media-libs/libmpeg2-0.2* )
-	oggvorbis? ( 	media-libs/libvorbis 
-			media-libs/libogg )
-	jpeg? (	media-video/mjpegtools 
-		>=media-libs/jpeg-mmx-1.1.2-r1 )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 
-		media-sound/jack-audio-connection-kit )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav )
-	aalib? ( media-libs/aalib )
-	media-libs/ladspa-sdk" 
-
-# disable avi for now, it doesnt work
-#	avi? ( media-video/avifile )
-
-
-src_compile() {
-	elibtoolize
-	replace-flags "-O3" "-O2"
-
-	# this is an ugly patch to remove -I/usr/include from some CFLAGS
-	patch -p0 <${FILESDIR}/${P}-configure.patch
-
-	local myconf
-	myconf=""
-	use avi \
-		&& myconf="${myconf} --enable-avifile" \
-		|| myconf="${myconf} --disable-avifile"
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav
-				 --enable-libdv" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav
-				 --disable-libdv"
-
-	# not testing for much here, since if its in USE we want it, but its autodetected by configure
-	
-	./configure \
-		${myconf} \
-		--without-vorbis-includes \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--oldincludedir=/usr/include \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man || die "./configure failed"
-		
-	emake || die
-}
-
-src_install () {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
-	make DESTDIR=${D} install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register
-}
diff --git a/media-libs/gst-plugins/gst-plugins-0.4.2-r2.ebuild b/media-libs/gst-plugins/gst-plugins-0.4.2-r2.ebuild
deleted file mode 100644
index 0884ae78ee65..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.2-r2.ebuild,v 1.4 2003/02/13 12:44:49 vapier Exp $
-
-inherit eutils libtool gnome2 flag-o-matic
-
-IUSE="encode quicktime mpeg oggvorbis jpeg esd gnome mikmod avi sdl png alsa arts dvd aalib"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-# bz2 gives 404 right now 
-#SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc ~ppc"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND="=media-libs/gstreamer-${PV}*
-	>=gnome-base/gconf-1.2.0
-	media-sound/mad
-	media-libs/flac
-	media-sound/cdparanoia
-	media-libs/hermes
-	>=media-libs/libdv-0.9.5
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	<media-libs/libmpeg2-0.3 ) 
-	oggvorbis? ( 	media-libs/libvorbis 
-			media-libs/libogg )
-	jpeg? (	media-video/mjpegtools 
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 ) )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 
-		media-sound/jack-audio-connection-kit )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav )
-	aalib? ( media-libs/aalib )
-	media-libs/ladspa-sdk" 
-
-# disable avi for now, it doesnt work
-#	avi? ( media-video/avifile )
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Fix for gst-launch-ext
-	epatch ${FILESDIR}/gentoo-gst-0.4.2-launch.patch
-
-	if [ "${ARCH}" = "ppc" ]
-	then
-		einfo "Patching makefile to fix parallel build bug"
-		epatch ${FILESDIR}/gst-plugins-0.4.2-parallel-make-depfix.patch
-		einfo "Patching wav support in gst-plugins to be big-endian friendly"
-		epatch ${FILESDIR}/gst-plugins-0.4.2-wavparse-bigendian.patch
-	fi
-
-	# If the sound device for OSS was already open when gstreamer are started,
-	# libgstossaudio.so never returns, as opening the device without the
-	# O_NONBLOCK flag in Linux do not return if the device was busy.  Gnome
-	# bug at:
-	#
-	#   http://bugzilla.gnome.org/show_bug.cgi?id=102025
-	#
-	# <azarah@gentoo.org> (27 Dec 2002).
-	cd ${S}; epatch ${FILESDIR}/${P}-never-return-on-oss-busy.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	# gst doesnt handle optimisations well
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	# this is an ugly patch to remove -I/usr/include from some CFLAGS
-	# patch -p0 < ${FILESDIR}/${P}-configure.patch
-
-	local myconf=""
-
-	# FIXME : do this for _all_ IUSE flags
-	use avi \
-		&& myconf="${myconf} --enable-avifile" \
-		|| myconf="${myconf} --disable-avifile"
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav
-				 --enable-libdv" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav
-				 --disable-libdv"
-	use esd \
-		&& myconf="${myconf} --enable-esd --enable-esdtest" \
-		|| myconf="${myconf} --disable-esd --disable-esdtest"
-	use gnome \
-		&& myconf="${myconf} --enable-gnome_vfs" \
-		|| myconf="${myconf} --disable-gnome_vfs"
-	use encode \
-		&& myconf="${myconf} --enable-lame" \
-		|| myconf="${myconf} --disable-lame"
-	use quicktime \
-		&& myconf="${myconf} --enable-openquicktime" \
-		|| myconf="${myconf} --disable-openquicktime"
-	use mpeg \
-		&& myconf="${myconf} --enable-mpeg2dec" \
-		|| myconf="${myconf} --disable-mpeg2dec"
- 	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
-		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"		
- 
-    # qcam doesn't work on PPC
-	use ppc && myconf="${myconf} --disable-qcam"
-	# not testing for much here, since if its in USE we want it, but its autodetected by configure
-	
-	econf ${myconf} \
-		|| die "./configure failed"
-		
-	# i dont like this <foser>
-	MAKEOPTS="-j1" emake || make || die
-}
-
-src_install () {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
-	make DESTDIR=${D} install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register
-}
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.0-r1.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.0-r1.ebuild
deleted file mode 100644
index 32f12e0d1e64..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.0-r1.ebuild,v 1.5 2003/02/19 20:16:46 foser Exp $
-
-inherit eutils libtool gnome2 flag-o-matic
-
-# Create a major/minor combo for our SLOT and executables suffix
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-
-IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc ~ppc"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND="=media-libs/gstreamer-${PV}*
-	>=gnome-base/gconf-1.2.0
-	media-sound/mad
-	media-libs/flac
-	media-sound/cdparanoia
-	media-libs/hermes
-	>=media-libs/libdv-0.9.5
-	media-libs/libvorbis
-	media-libs/libogg
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	>=media-libs/libmpeg2-0.3.1 )
-	jpeg? (	media-video/mjpegtools 
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 ) )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 virtual/jack )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav )
-	aalib? ( media-libs/aalib )
-	media-libs/ladspa-sdk" 
-
-# oggvorbis now is used by the cvs of ffmpeg
-#	oggvorbis? ( media-libs/libvorbis 
-#	             media-libs/libogg )
-
-
-src_unpack() {
-	unpack ${A}
-
-	# ffmpeg libs fix
-	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
-
-	# fix the scripts
-	cd ${S}/tools
-	mv gst-launch-ext gst-launch-ext.old
-	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
-		-e "s:gst-launch-ext:gst-launch-ext-${PV_MAJ_MIN}:" gst-launch-ext.old > gst-launch-ext
-	chmod +x gst-launch-ext
-
-	mv gst-visualise gst-visualise.old
-	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
-		-e "s:gst-visualise:gst-visualise-${PV_MAJ_MIN}:" gst-visualise.old > gst-visualise
-	chmod +x gst-visualise
-}
-
-src_compile() {
-	elibtoolize
-
-	# gst doesnt handle optimisations well
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-
-	# temp disable v4l (#15989)
-	myconf="--disable-v4l --disable-v4l2"
-
-	# FIXME : do this for _all_ IUSE flags
-#	use avi \
-#		&& myconf="${myconf} --enable-avifile" \
-#		|| myconf="${myconf} --disable-avifile"
-		myconf="${myconf} --enable-avifile"
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav \
-		                     --enable-libdv" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav \
-		                     --disable-libdv"
-	use esd \
-		&& myconf="${myconf} --enable-esd --enable-esdtest" \
-		|| myconf="${myconf} --disable-esd --disable-esdtest"
-	use gnome \
-		&& myconf="${myconf} --enable-gnome_vfs" \
-		|| myconf="${myconf} --disable-gnome_vfs"
-	use encode \
-		&& myconf="${myconf} --enable-lame" \
-		|| myconf="${myconf} --disable-lame"
-	use quicktime \
-		&& myconf="${myconf} --enable-openquicktime" \
-		|| myconf="${myconf} --disable-openquicktime"
-	use mpeg \
-		&& myconf="${myconf} --enable-mpeg2dec" \
-		|| myconf="${myconf} --disable-mpeg2dec"
-#	use oggvorbis \
-#		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
-#		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"		
-	myconf="${myconf} --enable-vorbis --enable-vorbistest" 
-	 
-	# qcam doesn't work on PPC
-	use ppc && myconf="${myconf} --disable-qcam"
-	
-	econf ${myconf} \
-		--program-suffix=-${PV_MAJ_MIN} \
-		|| die "./configure failed"
-		
-	emake || make || die
-}
-
-src_install () {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
-	make DESTDIR=${D} install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register-${PV_MAJ_MIN}
-}
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.0-r2.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.0-r2.ebuild
deleted file mode 100644
index 89052568d3fb..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.0-r2.ebuild,v 1.2 2003/02/19 20:16:46 foser Exp $
-
-inherit eutils libtool gnome2 flag-o-matic
-
-# Create a major/minor combo for our SLOT and executables suffix
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-
-IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND="=media-libs/gstreamer-${PV}*
-	>=gnome-base/gconf-1.2.0
-	media-sound/mad
-	media-libs/flac
-	media-sound/cdparanoia
-	media-libs/hermes
-	>=media-libs/libdv-0.9.5
-	media-libs/libvorbis
-	media-libs/libogg
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	>=media-libs/libmpeg2-0.3.1 )
-	jpeg? (	media-video/mjpegtools 
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 ) )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 
-	virtual/jack )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav )
-	aalib? ( media-libs/aalib )
-	media-libs/ladspa-sdk" 
-
-# oggvorbis now is used by the cvs of ffmpeg
-#	oggvorbis? ( media-libs/libvorbis 
-#	             media-libs/libogg )
-
-
-src_unpack() {
-	unpack ${A}
-
-	# ffmpeg libs fix
-	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
-
-	# ogg with id3 tag detection fix by <foser@gentoo.org>
-	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ogg_detection_fix.patch
-
-	# fix the scripts
-	cd ${S}/tools
-	mv gst-launch-ext gst-launch-ext.old
-	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
-		-e "s:gst-launch-ext:gst-launch-ext-${PV_MAJ_MIN}:" gst-launch-ext.old > gst-launch-ext
-	chmod +x gst-launch-ext
-
-	mv gst-visualise gst-visualise.old
-	sed -e "s:gst-launch :gst-launch-${PV_MAJ_MIN} :" \
-		-e "s:gst-visualise:gst-visualise-${PV_MAJ_MIN}:" gst-visualise.old > gst-visualise
-	chmod +x gst-visualise
-}
-
-src_compile() {
-	elibtoolize
-
-	# gst doesnt handle optimisations well
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-
-	# temp disable (#15989)
-	myconf="--disable-v4l --disable-v4l2"
-
-	# FIXME : do this for _all_ IUSE flags
-#	use avi \
-#		&& myconf="${myconf} --enable-avifile" \
-#		|| myconf="${myconf} --disable-avifile"
-		myconf="${myconf} --enable-avifile"
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav \
-		                     --enable-libdv" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav \
-		                     --disable-libdv"
-	use esd \
-		&& myconf="${myconf} --enable-esd --enable-esdtest" \
-		|| myconf="${myconf} --disable-esd --disable-esdtest"
-	use gnome \
-		&& myconf="${myconf} --enable-gnome_vfs" \
-		|| myconf="${myconf} --disable-gnome_vfs"
-	use encode \
-		&& myconf="${myconf} --enable-lame" \
-		|| myconf="${myconf} --disable-lame"
-	use quicktime \
-		&& myconf="${myconf} --enable-openquicktime" \
-		|| myconf="${myconf} --disable-openquicktime"
-	use mpeg \
-		&& myconf="${myconf} --enable-mpeg2dec" \
-		|| myconf="${myconf} --disable-mpeg2dec"
-#	use oggvorbis \
-#		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
-#		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"		
-	myconf="${myconf} --enable-vorbis --enable-vorbistest" 
-	 
-	# qcam doesn't work on PPC
-	use ppc && myconf="${myconf} --disable-qcam"
-	
-	econf ${myconf} \
-		--program-suffix=-${PV_MAJ_MIN} \
-		|| die "./configure failed"
-		
-	emake || make || die
-}
-
-src_install () {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
-	make DESTDIR=${D} install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register-${PV_MAJ_MIN}
-}
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.0-r3.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild
index e63ed81f6a72..1920085efc98 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.0-r3.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.0-r3.ebuild,v 1.1 2003/02/24 14:37:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild,v 1.1 2003/04/19 11:40:38 foser Exp $
 
 inherit eutils libtool gnome2 flag-o-matic
 
@@ -13,6 +13,7 @@ IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib og
 S="${WORKDIR}/${P}"
 DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
 HOMEPAGE="http://gstreamer.sourceforge.net"
+SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
 
 SLOT=${PV_MAJ_MIN}
 LICENSE="LGPL-2.1"
@@ -28,6 +29,7 @@ RDEPEND="=media-libs/gstreamer-${PV}*
 
 	media-sound/mad
 	media-libs/hermes
+	media-sound/cdparanoia
 
 	oggvorbis? ( media-libs/libvorbis
 		media-libs/libogg )
@@ -52,7 +54,6 @@ RDEPEND="=media-libs/gstreamer-${PV}*
 #	virtual/jack 
 #	media-libs/ladspa-sdk" 
 #	>=media-libs/libdv-0.9.5
-#	media-sound/cdparanoia
 
 DEPEND="${RDEPEND}
 	>=gnome-base/gconf-1.2.0
@@ -60,13 +61,14 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	# ppc asm included in the resample plugin seems to be broken, 
+	# using a slower but working version for now
+	epatch ${FILESDIR}/noppcasm.patch
 
 	# ffmpeg libs fix
 	use oggvorbis && epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
 
-	# ogg with id3 tag detection fix by <foser@gentoo.org>
-	epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ogg_detection_fix.patch
-
 	# fix the scripts
 	cd ${S}/tools
 	mv gst-launch-ext gst-launch-ext.old
@@ -89,9 +91,6 @@ src_compile() {
 
 	local myconf=""
 
-	# temp disable (#15989)
-	myconf="--disable-v4l --disable-v4l2"
-
 	# FIXME : do this for _all_ IUSE flags
 	use aalib \
 		&& myconf="${myconf} --enable-aalib" \
@@ -152,15 +151,13 @@ src_compile() {
 	emake || make || die
 }
 
-src_install () {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"		
-	make DESTDIR=${D} install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
 pkg_postinst () {
 	gnome2_gconf_install
 	gst-register-${PV_MAJ_MIN}
 }
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+
+DOCS="AUTHORS COPYING INSTALL README RELEASE TODO"
+