new release 'n cleanup

12 files changed, 23 insertions, 540 deletions

diff --git a/media-libs/gst-plugins/Manifest b/media-libs/gst-plugins/Manifest
index 7315d6c9bcb3..ae733054f163 100644
--- a/media-libs/gst-plugins/Manifest
+++ b/media-libs/gst-plugins/Manifest
@@ -1,20 +1,12 @@
-MD5 5024e6812066d0993923103076c757d2 gst-plugins-0.6.2-r1.ebuild 5099
 MD5 a9ff1d0dd939ac49d1f2abc7d56403a5 gst-plugins-0.8.0-r1.ebuild 2776
-MD5 1d1e583cca65c1d5f2abe553417efdfc gst-plugins-0.6.1.ebuild 4862
-MD5 81734bbfd7c6251faf854981b7034365 gst-plugins-0.6.3.ebuild 3044
+MD5 ab3300697030bd831cfca77ab7f1873a gst-plugins-0.8.1.ebuild 2253
 MD5 6821b4cae889aa45ca45792613fbcec6 ChangeLog 9934
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 eb33b7dba7ce584832ba10535cc25a06 gst-plugins-0.6.4.ebuild 2926
-MD5 4ce1d39bcd5cf1db9464cad55467b790 files/gst-plugins-0.6.3-gcc33.patch 1307
-MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r1 71
 MD5 fb236b39268cb180039f970fab62e27a files/digest-gst-plugins-0.8.0-r1 71
-MD5 1934516009a2cf836520961cd1fd0085 files/gst-plugins-0.6.2-rm_cflags.patch 2542
-MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
-MD5 ad7d13e5c42638d153311159e0c64028 files/digest-gst-plugins-0.6.3 71
 MD5 34e8dc19450d4a7bee008953e59314b0 files/digest-gst-plugins-0.6.4 71
+MD5 d454a981aba7bfc51b76556d18ef0357 files/digest-gst-plugins-0.8.1 71
 MD5 f7aac3ba492d4e54ae14ebeabc3299d4 files/libmpeg2.patch 878
-MD5 f4d299412b70de18060a4226c6fa981f files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch 923
-MD5 548125c96ab562221dc0509e485d0f5a files/gst-plugins-0.6-ffmpeg_ldflags.patch 1858
 MD5 09dbea60bc673a49aadc1a6369d724d7 files/gst-plugins-0.6.4-gcc2_fix.patch 692
 MD5 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
 MD5 c6e69d419de61401529c6e3000271e1b files/gst-plugins-0.8.0-audioconvert_stereo.patch 4437
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
deleted file mode 100644
index 5bf164be6bca..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddf0d5ae8628b3a6c99ca8f3c184a89f gst-plugins-0.6.1.tar.bz2 1891444
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2-r1
deleted file mode 100644
index d3c9de65af1e..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 421447896753ebecaeba9d4bf60d3776 gst-plugins-0.6.2.tar.bz2 1894462
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.3 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.3
deleted file mode 100644
index 486547c0c691..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cc128c526e1537267df74fd201b7376 gst-plugins-0.6.3.tar.bz2 1960994
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.8.1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.8.1
new file mode 100644
index 000000000000..b929b9c1f041
--- /dev/null
+++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.8.1
@@ -0,0 +1 @@
+MD5 c08c21df02857a11875295935d0442a1 gst-plugins-0.8.1.tar.bz2 1809789
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch b/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch
deleted file mode 100644
index 4e014feee0da..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.6-disable_ffmpeg_mpeg_typefind.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur gst-plugins-0.6.0/ext/ffmpeg/gstffmpegtypes.c gst-plugins-0.6.0.patched/ext/ffmpeg/gstffmpegtypes.c
---- gst-plugins-0.6.0/ext/ffmpeg/gstffmpegtypes.c	2003-01-26 12:56:37.000000000 +0100
-+++ gst-plugins-0.6.0.patched/ext/ffmpeg/gstffmpegtypes.c	2003-02-27 01:38:53.000000000 +0100
-@@ -77,8 +77,8 @@
-   global_types = g_hash_table_new (g_str_hash, g_str_equal);
- 
-   ADD_TYPE ("avi",    	GST_CAPS_NEW ("ffmpeg_type_avi",  "video/avi", NULL));
--  ADD_TYPE ("mpeg",   	GST_CAPS_NEW ("ffmpeg_type_mpeg", "video/mpeg", 
--			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));
-+/*  ADD_TYPE ("mpeg",   	GST_CAPS_NEW ("ffmpeg_type_mpeg", "video/mpeg", 
-+			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));*/
-   ADD_TYPE ("mpegts", 	GST_CAPS_NEW ("ffmpeg_type_mpegts", "video/x-mpegts", 
- 			  		"systemstream", GST_PROPS_BOOLEAN (TRUE)));
-   ADD_TYPE ("rm",    	GST_CAPS_NEW ("ffmpeg_type_rm",  "audio/x-pn-realaudio", NULL));
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6-ffmpeg_ldflags.patch b/media-libs/gst-plugins/files/gst-plugins-0.6-ffmpeg_ldflags.patch
deleted file mode 100644
index 24901257d8d5..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.6-ffmpeg_ldflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur gst-plugins-0.6.0/ext/ffmpeg/Makefile.am gst-plugins-0.6.0.patched/ext/ffmpeg/Makefile.am
---- gst-plugins-0.6.0/ext/ffmpeg/Makefile.am	2003-01-30 23:37:14.000000000 +0100
-+++ gst-plugins-0.6.0.patched/ext/ffmpeg/Makefile.am	2003-02-06 01:02:33.000000000 +0100
-@@ -19,7 +19,7 @@
- libgstffmpeg_la_LIBADD = \
- 	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a \
- 	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat/libavformat.a \
--	-lz
-+	-lz -logg -lvorbis -lvorbisenc
- 
- libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
-@@ -30,7 +30,7 @@
-         -I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec \
-         -I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat
- libgstffmpegall_la_LIBADD = \
--        $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a
-+        $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a 
- 
- libgstffmpegall_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
-diff -ur gst-plugins-0.6.0/ext/ffmpeg/Makefile.in gst-plugins-0.6.0.patched/ext/ffmpeg/Makefile.in
---- gst-plugins-0.6.0/ext/ffmpeg/Makefile.in	2003-02-02 02:03:19.000000000 +0100
-+++ gst-plugins-0.6.0.patched/ext/ffmpeg/Makefile.in	2003-02-06 02:02:22.000000000 +0100
-@@ -232,7 +232,7 @@
- libgstffmpeg_la_LIBADD = \
- 	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a \
- 	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat/libavformat.a \
--	-lz
-+	-lz -logg -lvorbis -lvorbisenc
- 
- 
- libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-@@ -246,8 +246,8 @@
-         -I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat
- 
- libgstffmpegall_la_LIBADD = \
--        $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a
--
-+        $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a \
-+	-logg -lvorbis -lvorbisenc
- 
- libgstffmpegall_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6.2-rm_cflags.patch b/media-libs/gst-plugins/files/gst-plugins-0.6.2-rm_cflags.patch
deleted file mode 100644
index c418e1beb3b9..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.6.2-rm_cflags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uNr gst-plugins-0.6.2/gst/mpeg1enc/Makefile.am gst-plugins-0.6.2.patched/gst/mpeg1enc/Makefile.am
---- gst-plugins-0.6.2/gst/mpeg1enc/Makefile.am	2002-12-08 15:49:43.000000000 +0100
-+++ gst-plugins-0.6.2.patched/gst/mpeg1enc/Makefile.am	2003-08-24 17:43:31.000000000 +0200
-@@ -16,11 +16,7 @@
-                           transform.c \
-                           gstmpeg1encoder.c
- 
--if HAVE_CPU_I386
--ARCHCFLAGS = -O3 -mcpu=i486 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
--else
- ARCHCFLAGS = -O3 -fschedule-insns2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
--endif
- 
- libgstmpeg1encoder_la_CFLAGS = $(ARCHCFLAGS) $(GST_CFLAGS)
- libgstmpeg1encoder_la_LIBADD =
-diff -uNr gst-plugins-0.6.2/gst/mpeg2enc/Makefile.am gst-plugins-0.6.2.patched/gst/mpeg2enc/Makefile.am
---- gst-plugins-0.6.2/gst/mpeg2enc/Makefile.am	2002-12-08 15:49:44.000000000 +0100
-+++ gst-plugins-0.6.2.patched/gst/mpeg2enc/Makefile.am	2003-08-24 17:43:49.000000000 +0200
-@@ -45,11 +45,7 @@
-                           gstmpeg2enc.c \
- 			  $(ASM_SRCS)
- 
--if HAVE_CPU_I386
--ARCHCFLAGS = -mcpu=i486
--else
- ARCHCFLAGS = 
--endif
- 
- libgstmpeg2enc_la_CFLAGS = -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math $(GST_CFLAGS)
- libgstmpeg2enc_la_LIBADD =
-diff -uNr gst-plugins-0.6.2/gst/mpeg2sub/Makefile.am gst-plugins-0.6.2.patched/gst/mpeg2sub/Makefile.am
---- gst-plugins-0.6.2/gst/mpeg2sub/Makefile.am	2002-12-08 15:49:45.000000000 +0100
-+++ gst-plugins-0.6.2.patched/gst/mpeg2sub/Makefile.am	2003-08-24 17:44:06.000000000 +0200
-@@ -4,11 +4,7 @@
- 
- libgstmpeg2subt_la_SOURCES = gstmpeg2subt.c  
- 
--if HAVE_CPU_I386
--ARCHCFLAGS = -mcpu=i486
--else
- ARCHCFLAGS = 
--endif
- 
- libgstmpeg2subt_la_CFLAGS = -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math $(GST_CFLAGS)
- libgstmpeg2subt_la_LIBADD =
-diff -uNr gst-plugins-0.6.2/gst/mpegaudio/Makefile.am gst-plugins-0.6.2.patched/gst/mpegaudio/Makefile.am
---- gst-plugins-0.6.2/gst/mpegaudio/Makefile.am	2002-12-08 15:49:45.000000000 +0100
-+++ gst-plugins-0.6.2.patched/gst/mpegaudio/Makefile.am	2003-08-24 17:43:10.000000000 +0200
-@@ -12,11 +12,7 @@
- 	tables.c            \
- 	tonal.c
- 
--if HAVE_CPU_I386
--ARCHCFLAGS = -O2 -mcpu=i486 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
--else
- ARCHCFLAGS = -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
--endif
- 
- libgstmpegaudio_la_CFLAGS = $(ARCHCFLAGS) $(GST_CFLAGS)
- libgstmpegaudio_la_LIBADD =
diff --git a/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch b/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch
deleted file mode 100644
index 813da699c78a..000000000000
--- a/media-libs/gst-plugins/files/gst-plugins-0.6.3-gcc33.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c
---- gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c	2002-12-11 03:16:51.000000000 +0000
-+++ gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/ffserver.c	2003-09-11 13:10:43.517428848 +0100
-@@ -20,6 +20,8 @@
- #include "avformat.h"
- 
- #include <stdarg.h>
-+#include <ctype.h>
-+
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-@@ -33,12 +35,12 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
--#include <ctype.h>
- #include <signal.h>
- #ifdef CONFIG_HAVE_DLFCN
- #include <dlfcn.h>
- #endif
- 
-+
- #include "ffserver.h"
- 
- /* maximum number of simultaneous HTTP connections */
-diff -ur gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c
---- gst-plugins-0.6.3/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c	2002-11-30 17:17:58.000000000 +0000
-+++ gst-plugins-0.6.3.new/gst-libs/ext/ffmpeg/ffmpeg/vhook/imlib2.c	2003-09-11 13:12:33.854655040 +0100
-@@ -48,7 +48,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <unistd.h>
--#include <sys/time.h>
-+#include <time.h>
- #include <X11/Xlib.h>
- #include <Imlib2.h>                                                             
- 
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild
deleted file mode 100644
index 63d7fe730790..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.1.ebuild,v 1.11 2004/03/19 07:56:03 mr_bones_ 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]}
-
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="x86 sparc ppc amd64"
-IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib oggvorbis mmx"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-
-# TODO: I think we should split up these plugins in seperate ebuilds
-
-RDEPEND="=media-libs/gstreamer-${PV}*
-
-	media-sound/mad
-	media-libs/hermes
-	media-sound/cdparanoia
-
-	oggvorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	=media-libs/libmpeg2-0.3.1* )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	jpeg? ( x86? ( mmx? ( media-video/mjpegtools ) ) )
-	jpeg? ( media-libs/jpeg )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav
-		media-libs/libdvdread )
-	aalib? ( media-libs/aalib )"
-
-# Some ditched minor plugins to bring number of deps down
-#	>=media-libs/flac-1.0.3
-#	virtual/jack
-#	media-libs/ladspa-sdk"
-#	>=media-libs/libdv-0.9.5
-
-DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2.0
-	>=dev-util/pkgconfig-0.9"
-
-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
-
-	# 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=""
-
-	# FIXME : do this for _all_ IUSE flags
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav"
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-	use arts \
-		&& myconf="${myconf} --enable-arts --enable-artsc" \
-		|| myconf="${myconf} --disable-arts --disable-artsc"
-	use encode \
-		&& myconf="${myconf} --enable-lame" \
-		|| myconf="${myconf} --disable-lame"
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-	use jpeg && use mmx \
-		&& myconf="${myconf} --enable-mjpegtools" \
-		|| myconf="${myconf} --disable-mjpegtools"
-	use png \
-		&& myconf="${myconf} --enable-png" \
-		|| myconf="${myconf} --disable-png"
-	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 sdl \
-		&& myconf="${myconf} --enable-sdl --enable-sdltest" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
-		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"
-	use mikmod \
-		&& myconf="${myconf} --enable-mikmod --enable-libmikmodtest" \
-		|| myconf="${myconf} --disable-mikmod --disable-libmikmodtest"
-
-	# 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
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register-${PV_MAJ_MIN}
-}
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-
-DOCS="AUTHORS COPYING INSTALL README RELEASE TODO"
-
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild
deleted file mode 100644
index 0fd3b9bb9552..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.2-r1.ebuild,v 1.6 2004/03/19 07:56:03 mr_bones_ 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]}
-
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-LICENSE="LGPL-2.1"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="x86 ~sparc ppc ~amd64"
-IUSE="encode quicktime mpeg jpeg esd gnome mikmod sdl png alsa arts dvd aalib oggvorbis mmx"
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-
-# TODO: I think we should split up these plugins in seperate ebuilds
-
-RDEPEND="=media-libs/gstreamer-${PV}*
-	>=gnome-base/gconf-1.2
-
-	media-sound/mad
-	media-libs/hermes
-	media-sound/cdparanoia
-
-	oggvorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	encode? ( media-sound/lame )
-	quicktime? ( media-libs/openquicktime )
-	mpeg? (	>=media-libs/libmpeg2-0.3.1 )
-	esd? ( media-sound/esound )
-	gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-	mikmod? ( media-libs/libmikmod )
-	sdl? ( media-libs/libsdl )
-	jpeg? ( media-libs/jpeg )
-	png? ( >=media-libs/libpng-1.2.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	arts? ( >=kde-base/arts-1.0.2 )
-	dvd? ( 	media-libs/libdvdnav
-		media-libs/libdvdread )
-	aalib? ( media-libs/aalib )"
-
-# Some ditched minor plugins to bring number of deps down
-#	>=media-libs/flac-1.0.3
-#	virtual/jack
-#	media-libs/ladspa-sdk"
-#	>=media-libs/libdv-0.9.5
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	sys-devel/automake"
-
-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
-
-	# patch for gcc-3.3.x
-	cd ${S};  patch -p1 < ${FILESDIR}/${PN}-0.6.3-gcc33.patch
-
-	# ffmpeg libs fix
-	use oggvorbis && epatch ${FILESDIR}/${PN}-${PV_MAJ_MIN}-ffmpeg_ldflags.patch
-
-	# patch for changing types in >libmpeg-0.3.1
-	if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then
-		epatch ${FILESDIR}/libmpeg2.patch
-	fi
-
-	# remove problematic default CFLAGS (#22249)
-	epatch ${FILESDIR}/${P}-rm_cflags.patch
-
-	automake || die
-
-	# 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=""
-
-	# FIXME : do this for _all_ IUSE flags
-	use aalib \
-		&& myconf="${myconf} --enable-aalib" \
-		|| myconf="${myconf} --disable-aalib"
-	use dvd \
-		&& myconf="${myconf} --enable-dvdread --enable-dvdnav" \
-		|| myconf="${myconf} --disable-dvdread --disable-dvdnav"
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-	use alsa \
-		&& myconf="${myconf} --enable-alsa" \
-		|| myconf="${myconf} --disable-alsa"
-	use arts \
-		&& myconf="${myconf} --enable-arts --enable-artsc" \
-		|| myconf="${myconf} --disable-arts --disable-artsc"
-	use encode \
-		&& myconf="${myconf} --enable-lame" \
-		|| myconf="${myconf} --disable-lame"
-	use jpeg \
-		&& myconf="${myconf} --enable-jpeg" \
-		|| myconf="${myconf} --disable-jpeg"
-	use jpeg && use mmx \
-		&& myconf="${myconf} --enable-mjpegtools" \
-		|| myconf="${myconf} --disable-mjpegtools"
-	use png \
-		&& myconf="${myconf} --enable-png" \
-		|| myconf="${myconf} --disable-png"
-	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 sdl \
-		&& myconf="${myconf} --enable-sdl --enable-sdltest" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis --enable-vorbistest" \
-		|| myconf="${myconf} --disable-vorbis --disable-vorbistest"
-	use mikmod \
-		&& myconf="${myconf} --enable-mikmod --enable-libmikmodtest" \
-		|| myconf="${myconf} --disable-mikmod --disable-libmikmodtest"
-
-	# 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
-}
-
-pkg_postinst () {
-	gnome2_gconf_install
-	gst-register-${PV_MAJ_MIN}
-}
-
-USE_DESTDIR="1"
-
-DOCS="AUTHORS COPYING INSTALL README RELEASE TODO"
-
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild b/media-libs/gst-plugins/gst-plugins-0.8.1.ebuild
index 074eb8cc880f..7e33c40b8df4 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild,v 1.18 2004/03/24 01:14:24 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.1.ebuild,v 1.1 2004/04/23 16:57:50 foser Exp $
 
 # IMPORTANT
 #
@@ -16,52 +16,30 @@ inherit gst-plugins gnome2 eutils flag-o-matic
 
 DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.net/"
-
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 
-# TODO : gconf support is also optional
+IUSE="esd alsa oss"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
 
 RDEPEND="=media-libs/gstreamer-${PV}*
 	>=gnome-base/gconf-1.2"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
 	>=dev-util/pkgconfig-0.9"
 
-PDEPEND=">=media-plugins/gst-plugins-oss-${PV}"
-
-GST_PLUGINS_BUILD="ffmpeg"
+PDEPEND="oss? ( >=media-plugins/gst-plugins-oss-${PV} )
+	alsa? ( >=media-plugins/gst-plugins-alsa-${PV} )
+	esd? ( >=media-plugins/gst-plugins-esd-${PV} )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
+# we need x for the x overlay to get linked
+GST_PLUGINS_BUILD="x xshm"
 
+# overrides the eclass
 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
-
-	# fix compile issues with gcc-3.3.x
-	epatch ${FILESDIR}/${P}-gcc33.patch
-
-	# patch for changing types in >libmpeg-0.3.1
-	if grep -q mpeg2_picture ${ROOT}/usr/include/mpeg2dec/mpeg2.h; then
-		epatch ${FILESDIR}/libmpeg2.patch
-	fi
-
-	# 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() {
@@ -76,12 +54,19 @@ src_compile() {
 		append-flags -fPIC
 	fi
 
-	gst-plugins_src_configure --program-suffix=-${PV_MAJ_MIN}
+	gst-plugins_src_configure
 
 	emake || die
 
 }
 
+# override eclass
+src_install() {
+
+	gnome2_src_install
+
+}
+
 DOCS="AUTHORS COPYING INSTALL README RELEASE TODO"
 
 pkg_postinst () {
@@ -91,13 +76,10 @@ pkg_postinst () {
 
 	echo ""
 	einfo "The Gstreamer plugins setup has changed quite a bit on Gentoo,"
-	einfo "applications now should provide you with the basic plugins."
-	echo ""
-	einfo "Right now this package installs at least an OSS output plugin to have"
-	einfo "a standard sound output plugin, but this might change in the future."
+	einfo "applications now should provide the basic plugins needed."
 	echo ""
 	einfo "The new seperate plugins are all named 'gst-plugins-<plugin>'."
-	einfo "To get a listing of currently available plugins do 'emerge -s gst-plugins-'."
+	einfo "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'."
 	einfo "In most cases it shouldn't be needed though to emerge extra plugins."
 
 }