new release 'n cleanup

18 files changed, 118 insertions, 538 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 5fc5037c34d5..041e25c163a5 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.53 2004/03/28 15:36:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.54 2004/04/23 16:09:09 foser Exp $
+
+*gstreamer-0.8.1 (23 Apr 2004)
+
+  23 Apr 2004; foser <foser@gentoo.org> gstreamer-0.8.1.ebuild :
+  New release, fix removal of nonversioned binaries
 
   28 Mar 2004; Luca Barbato <lu_zero@gentoo.org> gstreamer-0.8.0.ebuild:
   Removed an unnecessary patch.
@@ -8,6 +13,9 @@
   23 Mar 2004; Martin Holzer <mholzer@gentoo.org> :
   fixing depend qa issue. see 45343.
 
+  23 Mar 2004; foser <foser@gentoo.org> gstreamer-0.8.0.ebuild :
+  Remove eclass functionality, we shouldn't use that here
+
 *gstreamer-0.8.0 (21 Mar 2004)
 
   21 Mar 2004; foser <foser@gentoo.org> gstreamer-0.8.0.ebuild :
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 90a5d471cc89..169f6fbea0bd 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,20 +1,9 @@
-MD5 2859a53d220f0d4f15d70265c0ae3ee2 files/digest-gstreamer-0.6.0-r2 69
-MD5 d7d0bd22f575c14e4b5e9dae76109a13 files/digest-gstreamer-0.6.1-r1 69
-MD5 25e847f18be30c70bf95d37afd5c82a4 files/digest-gstreamer-0.6.2 69
-MD5 108e4dae9d3c886119d0b0651d959feb files/digest-gstreamer-0.6.3 69
-MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
-MD5 e373aed252b48ef567dbdda42e090c1f files/gnu_asm_fix.patch 953
-MD5 19da7f9f949dee117395e898c2e0bf39 files/gstreamer-0.6.0-sparc.patch 1428
-MD5 5705a7d2ff6278dbf1f51b8241ff5474 files/gstreamer-0.6.3-Werror.patch 2576
-MD5 9a6a2ed73b08e3d33cb2c9d7cb1550ff files/gstreamer-0.6.3-gcc33.patch 557
-MD5 6bbd0426345ae753a9833575e160ad71 files/gstreamer-default_scheduler_opt.patch 2100
-MD5 a74f9b21ddb30cb0925e25cc18fc9213 files/gstreamer-error_report.patch 771
-MD5 16471f40b2c558c85402c638d1d5f06c files/digest-gstreamer-0.8.0 69
-MD5 2ef10fe8a0e60444109d518d1f50985e ChangeLog 8453
-MD5 4348b8adbf8b3242693128d109866d94 gstreamer-0.6.0-r2.ebuild 2226
-MD5 b801bf79d31ad506d3ff094e49c3cb05 gstreamer-0.6.1-r1.ebuild 1654
-MD5 9fc89752a8c5789ec0febb6092b24cd4 gstreamer-0.6.2.ebuild 1632
-MD5 13d4295e6a61f0f3cbcfbc47773db1c0 gstreamer-0.6.3.ebuild 2258
+MD5 7af98b74d74ce4168f98fa3f5c812c7c gstreamer-0.8.1.ebuild 2223
 MD5 ec48c71eff24db6b7cc629d5de610e9e gstreamer-0.6.4.ebuild 1860
+MD5 6e3ff9a79eac2e6a76376c7277f63e32 gstreamer-0.8.0.ebuild 2186
+MD5 229c55eb1c98938413af6adff5dea425 ChangeLog 8725
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 babdbb2df2d74607c1f2a639a6e657a1 gstreamer-0.8.0.ebuild 2075
+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 e373aed252b48ef567dbdda42e090c1f files/gnu_asm_fix.patch 953
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r2 b/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r2
deleted file mode 100644
index 3650f861360a..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d0dec37678b33bbcb23cb2e20a83fe4 gstreamer-0.6.0.tar.bz2 1094712
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.1-r1 b/media-libs/gstreamer/files/digest-gstreamer-0.6.1-r1
deleted file mode 100644
index 847fdcb30108..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9db8443c7679978b72d485c744f3189 gstreamer-0.6.1.tar.bz2 1063325
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.2 b/media-libs/gstreamer/files/digest-gstreamer-0.6.2
deleted file mode 100644
index 33c130bb276a..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2eafaa3b7de1f501ed4b0462b3e065f9 gstreamer-0.6.2.tar.bz2 1222558
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.3 b/media-libs/gstreamer/files/digest-gstreamer-0.6.3
deleted file mode 100644
index cea7618af715..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9e9401c709074dc7bd600b0f3baab37 gstreamer-0.6.3.tar.bz2 1081182
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.8.1 b/media-libs/gstreamer/files/digest-gstreamer-0.8.1
new file mode 100644
index 000000000000..2fe884410c74
--- /dev/null
+++ b/media-libs/gstreamer/files/digest-gstreamer-0.8.1
@@ -0,0 +1 @@
+MD5 154c95169f343b53f15cc5a124ef673d gstreamer-0.8.1.tar.bz2 1177592
diff --git a/media-libs/gstreamer/files/gstreamer-0.6.0-sparc.patch b/media-libs/gstreamer/files/gstreamer-0.6.0-sparc.patch
deleted file mode 100644
index 885fcd7b5e67..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.6.0-sparc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-*** gstreamer-0.6.0/gst/gstatomic_impl.h	Tue Jan 28 19:22:32 2003
---- gstreamer-0.6.0.patched/gst/gstatomic_impl.h	Mon Mar  3 19:05:11 2003
-***************
-*** 204,214 ****
-  
-    return result == 0;
-  }
-  
-  /***** Sun SPARC *****/
-! #elif defined(HAVE_CPU_SPARC) && defined(__GNUC__)
-  
-  GST_INLINE_FUNC void 	gst_atomic_int_destroy 	(GstAtomicInt *aint) { } 
-  
-  #ifdef GST_CONFIG_NO_SMP
-  GST_INLINE_FUNC void 	gst_atomic_int_init 	(GstAtomicInt *aint, gint val) { aint->counter = val; }
---- 204,215 ----
-  
-    return result == 0;
-  }
-  
-  /***** Sun SPARC *****/
-! /* disabled for now */
-! #elif defined(HAVE_CPU_SPARC) && defined(__GNUC__) && 0
-  
-  GST_INLINE_FUNC void 	gst_atomic_int_destroy 	(GstAtomicInt *aint) { } 
-  
-  #ifdef GST_CONFIG_NO_SMP
-  GST_INLINE_FUNC void 	gst_atomic_int_init 	(GstAtomicInt *aint, gint val) { aint->counter = val; }
-***************
-*** 269,279 ****
-  {
-    register volatile int *ptr asm ("g1");
-    register int increment asm ("g2");
-  
-    ptr = &aint->counter;
-!   increment = val;
-  
-    __asm__ __volatile__(
-      "mov    %%o7, %%g4\n\t"
-      "call   ___atomic_sub\n\t"
-      " add   %%o7, 8, %%o7\n"
---- 270,280 ----
-  {
-    register volatile int *ptr asm ("g1");
-    register int increment asm ("g2");
-  
-    ptr = &aint->counter;
-!   increment = 1;
-  
-    __asm__ __volatile__(
-      "mov    %%o7, %%g4\n\t"
-      "call   ___atomic_sub\n\t"
-      " add   %%o7, 8, %%o7\n"
diff --git a/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch b/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch
deleted file mode 100644
index ea904eb7f2dc..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-gstreamer is built with -Werror.  However on platforms that don't have
-architecture specific implementations of the atomic functions, this
-code would cause the compile to fail, so comment out the line.  This
-is particularly important at the moment on IA-64.
-					      -- agriffis, 13 Nov 2003
-
---- gstreamer-0.6.3/gst/gstatomic_impl.h.old	2003-08-03 16:52:19.000000000 -0400
-+++ gstreamer-0.6.3/gst/gstatomic_impl.h	2003-11-13 14:43:34.000000000 -0500
-@@ -415,7 +415,7 @@
- }
- 
- #else 
--#warning consider putting your architecture specific atomic implementations here
-+//#warning consider putting your architecture specific atomic implementations here
- 
- /*
-  * generic implementation
---- gstreamer-0.6.3/gst/elements/gstfilesrc.c.old	2003-11-14 13:41:30.000000000 -0500
-+++ gstreamer-0.6.3/gst/elements/gstfilesrc.c	2003-11-14 14:28:12.000000000 -0500
-@@ -396,8 +396,8 @@
-     return NULL;
-   }
-   else if (mmapregion == MAP_FAILED) {
--    GST_DEBUG (0, "mmap (0x%x, %d, 0x%llx) : %s",
-- 	     size, src->fd, offset, strerror (errno));
-+    GST_DEBUG (0, "mmap (0x%lx, %ld, %d, 0x%llx) : %s",
-+ 	     (unsigned long)NULL, size, src->fd, offset, strerror (errno));
-     return NULL;
-   }
-   GST_DEBUG (0, "mapped region %08lx+%08lx from file into memory at %p", 
-@@ -667,8 +667,7 @@
- 
-   /* check for EOF */
-   if (src->curoffset == src->filelen) {
--    GST_DEBUG (0, "filesrc eos %" G_GINT64_FORMAT
--		  " %" G_GINT64_FORMAT, src->curoffset, src->filelen);
-+    GST_DEBUG (0, "filesrc eos %llx %lld", src->curoffset, src->filelen);
-     gst_element_set_eos (GST_ELEMENT (src));
-     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
-   }
-@@ -836,19 +835,19 @@
-           if (offset > src->filelen) 
- 	    goto error;
-           src->curoffset = offset;
--          GST_DEBUG(0, "seek set pending to %" G_GINT64_FORMAT, src->curoffset);
-+          GST_DEBUG(0, "seek set pending to %llx", src->curoffset);
- 	  break;
-         case GST_SEEK_METHOD_CUR:
-           if (offset + src->curoffset > src->filelen) 
- 	    goto error;
-           src->curoffset += offset;
--          GST_DEBUG(0, "seek cur pending to %" G_GINT64_FORMAT, src->curoffset);
-+          GST_DEBUG(0, "seek cur pending to %llx", src->curoffset);
- 	  break;
-         case GST_SEEK_METHOD_END:
-           if (ABS (offset) > src->filelen) 
- 	    goto error;
-           src->curoffset = src->filelen - ABS (offset);
--          GST_DEBUG(0, "seek end pending to %" G_GINT64_FORMAT, src->curoffset);
-+          GST_DEBUG(0, "seek end pending to %llx", src->curoffset);
- 	  break;
- 	default:
-           goto error;
diff --git a/media-libs/gstreamer/files/gstreamer-0.6.3-gcc33.patch b/media-libs/gstreamer/files/gstreamer-0.6.3-gcc33.patch
deleted file mode 100644
index cad137ea0765..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.6.3-gcc33.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gstreamer-0.6.3/gst/gstplugin.c.old	2003-08-29 09:39:45.301019616 +0800
-+++ gstreamer-0.6.3/gst/gstplugin.c	2003-08-29 09:55:03.862377064 +0800
-@@ -180,7 +180,7 @@
-   module = g_module_open (filename, G_MODULE_BIND_LAZY);
- 
-   if (module != NULL) {
--    if (g_module_symbol (module, "plugin_desc", (gpointer *)&desc)) {
-+    if (g_module_symbol (module, "plugin_desc", (gpointer *)((void *)&desc))) {
-       GST_DEBUG (GST_CAT_PLUGIN_LOADING, "plugin \"%s\" loaded, called entry function...", filename);
- 
-       plugin->filename = g_strdup (filename);
diff --git a/media-libs/gstreamer/files/gstreamer-default_scheduler_opt.patch b/media-libs/gstreamer/files/gstreamer-default_scheduler_opt.patch
deleted file mode 100644
index f502be794a93..000000000000
--- a/media-libs/gstreamer/files/gstreamer-default_scheduler_opt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur gstreamer-0.6.0/gst/gst.c gstreamer-0.6.0.optsched/gst/gst.c
---- gstreamer-0.6.0/gst/gst.c	2003-01-21 23:10:07.000000000 +0100
-+++ gstreamer-0.6.0.optsched/gst/gst.c	2003-02-05 22:07:30.000000000 +0100
-@@ -94,7 +94,7 @@
- #define NUL '\0'
- #endif
- 
--/* default scheduler, 'basicomega', can be changed in
-+/* default scheduler, 'opt', can be changed in
-  * gstscheduler.c in function gst_scheduler_factory_class_init
-  */
- static const struct poptOption options[] = {
-@@ -108,7 +108,7 @@
-   {"gst-plugin-spew",    NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP,   NULL, ARG_PLUGIN_SPEW,    "enable verbose plugin loading diagnostics", NULL},
-   {"gst-plugin-path",    NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_PATH,    "'" G_SEARCHPATH_SEPARATOR_S "'--separated path list for loading plugins", "PATHS"},
-   {"gst-plugin-load",    NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_LOAD,    "comma-separated list of plugins to preload in addition to the list stored in env variable GST_PLUGIN_PATH", "PLUGINS"},
--  {"gst-scheduler",      NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER,      "scheduler to use ('basicomega' is the default)", "SCHEDULER"},
-+  {"gst-scheduler",      NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER,      "scheduler to use ('opt' is the default)", "SCHEDULER"},
-   {"gst-nothreads",      NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP,   NULL, ARG_NOTHREADS,      "use NOPs for all threading and locking operations", NULL},
-   {"gst-registry",       NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_REGISTRY,       "registry to use" , "REGISTRY"},
-   POPT_TABLEEND
-diff -ur gstreamer-0.6.0/gst/gstscheduler.c gstreamer-0.6.0.optsched/gst/gstscheduler.c
---- gstreamer-0.6.0/gst/gstscheduler.c	2003-01-18 15:11:36.000000000 +0100
-+++ gstreamer-0.6.0.optsched/gst/gstscheduler.c	2003-02-05 22:07:34.000000000 +0100
-@@ -802,7 +802,7 @@
-   factory_parent_class = g_type_class_ref (GST_TYPE_PLUGIN_FEATURE);
- 
-   if (!_default_name)
--    _default_name = g_strdup ("basicomega");
-+    _default_name = g_strdup ("opt");
- }
- 
- static void
diff --git a/media-libs/gstreamer/files/gstreamer-error_report.patch b/media-libs/gstreamer/files/gstreamer-error_report.patch
deleted file mode 100644
index 7254f4319f0f..000000000000
--- a/media-libs/gstreamer/files/gstreamer-error_report.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur gstreamer-0.6.0/gst/registries/gstxmlregistry.c gstreamer-0.6.0.patched/gst/registries/gstxmlregistry.c
---- gstreamer-0.6.0/gst/registries/gstxmlregistry.c	2003-01-16 22:22:06.000000000 +0100
-+++ gstreamer-0.6.0.patched/gst/registries/gstxmlregistry.c	2003-02-02 16:23:44.000000000 +0100
-@@ -625,11 +625,14 @@
- static GstRegistryReturn 
- gst_xml_registry_load_plugin (GstRegistry *registry, GstPlugin *plugin)
- {
-+  GError *error = NULL;
-   /* FIXME: add gerror support */
--  if (!gst_plugin_load_plugin (plugin, NULL)) {
-+  if (!gst_plugin_load_plugin (plugin, &error)) {
-+    if (error) {
-+      g_warning ("could not load plugin %s: %s", plugin->name, error->message);
-+    }
-     return GST_REGISTRY_PLUGIN_LOAD_ERROR;
-   }
--
-   return GST_REGISTRY_OK;
- }
- 
diff --git a/media-libs/gstreamer/gstreamer-0.6.0-r2.ebuild b/media-libs/gstreamer/gstreamer-0.6.0-r2.ebuild
deleted file mode 100644
index 9541109d3aac..000000000000
--- a/media-libs/gstreamer/gstreamer-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,88 +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/gstreamer/gstreamer-0.6.0-r2.ebuild,v 1.10 2004/03/19 07:56:03 mr_bones_ Exp $
-
-inherit eutils flag-o-matic libtool
-
-# 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="doc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-DEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-
-# 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
-#		virtual/ghostscript )
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# some extra error feedback
-	epatch ${FILESDIR}/${PN}-error_report.patch
-
-	# use 'opt' as our default scheduler it is new and has some
-	# known problems but the default scheduler will crash on systems
-	# with their glibc compiled for i386+, which means for about all
-	# of our users :)
-	# http://www.gstreamer.net/releases/0.6.0/notice.php
-	#
-	# foser <foser@gentoo.org>
-	epatch ${FILESDIR}/${PN}-default_scheduler_opt.patch
-
-	# Added patch for sparc.  Resolves bug #15502.  Thanks to
-	# Alvaro Figueroa for pointing out the fix :)
-	epatch ${FILESDIR}/${PN}-0.6.0-sparc.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	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"
-
-	emake || die "compile failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog COPYING* DEVEL NEWS \
-		README RELEASE REQUIREMENTS TODO
-}
-
-pkg_postinst () {
-	gst-register-${PV_MAJ_MIN}
-}
diff --git a/media-libs/gstreamer/gstreamer-0.6.1-r1.ebuild b/media-libs/gstreamer/gstreamer-0.6.1-r1.ebuild
deleted file mode 100644
index 6b5f2892ee6e..000000000000
--- a/media-libs/gstreamer/gstreamer-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,73 +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/gstreamer/gstreamer-0.6.1-r1.ebuild,v 1.7 2004/03/19 07:56:03 mr_bones_ Exp $
-
-inherit eutils flag-o-matic libtool
-
-# 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="doc"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc ~alpha amd64"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	elibtoolize
-
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-	use doc \
-		&& myconf="${myconf} --enable-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"
-
-	emake || die "compile failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-	if [ -n "`use doc`" ] ;
-	then
-		cd ${S}/docs/devhelp
-		for PDH in `ls *.devhelp` ;
-		do
-			mv ${PDH} ${PDH}.old
-			sed -e "s:${D}::" ${PDH}.old > ${PDH}
-
-			insinto /usr/share/gtk-doc/html/${PDH/.devhelp/}
-			doins ${PDH}
-		done
-	fi
-
-	dodoc AUTHORS ChangeLog COPYING* DEVEL NEWS \
-		README RELEASE REQUIREMENTS TODO
-}
-
-pkg_postinst () {
-	gst-register-${PV_MAJ_MIN}
-}
diff --git a/media-libs/gstreamer/gstreamer-0.6.2.ebuild b/media-libs/gstreamer/gstreamer-0.6.2.ebuild
deleted file mode 100644
index 52973d11af68..000000000000
--- a/media-libs/gstreamer/gstreamer-0.6.2.ebuild
+++ /dev/null
@@ -1,73 +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/gstreamer/gstreamer-0.6.2.ebuild,v 1.9 2004/03/23 19:16:53 mholzer Exp $
-
-inherit eutils flag-o-matic libtool gnome.org
-
-# 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=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha ~amd64"
-
-DEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-
-#	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	elibtoolize
-
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-
-# docs are broken once again
-#	use doc \
-#		&& myconf="${myconf} --enable-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"
-
-	emake || die "compile failed"
-}
-
-src_install () {
-	einstall || die "Installation failed"
-
-#	if [ -n "`use doc`" ] ;
-#	then
-#		cd ${S}/docs/devhelp
-#		for PDH in `ls *.devhelp` ;
-#		do
-#			mv ${PDH} ${PDH}.old
-#			sed -e "s:${D}::" ${PDH}.old > ${PDH}
-#
-#			insinto /usr/share/gtk-doc/html/${PDH/.devhelp/} 
-#			doins ${PDH} 
-#		done
-#	fi
-
-	dodoc AUTHORS ChangeLog COPYING* DEVEL NEWS \
-		README RELEASE REQUIREMENTS TODO
-}
-
-pkg_postinst () {
-	gst-register-${PV_MAJ_MIN}
-}
diff --git a/media-libs/gstreamer/gstreamer-0.6.3.ebuild b/media-libs/gstreamer/gstreamer-0.6.3.ebuild
deleted file mode 100644
index dc346f0ed077..000000000000
--- a/media-libs/gstreamer/gstreamer-0.6.3.ebuild
+++ /dev/null
@@ -1,99 +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/gstreamer/gstreamer-0.6.3.ebuild,v 1.15 2004/03/19 07:56:03 mr_bones_ Exp $
-
-inherit eutils flag-o-matic libtool gnome.org
-
-# 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=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT=${PV_MAJ_MIN}
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4
-	>=dev-libs/popt-1.5
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-#	doc? ( dev-util/gtk-doc )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# proper gcc 3.3.1 fix (#27077)
-	epatch ${FILESDIR}/${P}-gcc33.patch
-
-	# patches to build with -Werror on ia64
-	if use ia64; then
-		epatch ${FILESDIR}/${PN}-0.6.3-Werror.patch
-	fi
-
-}
-
-src_compile() {
-	elibtoolize
-
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-
-# docs are broken once again
-#	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"
-
-	# On alpha, amd64 and hppa some innocuous warnings are spit out that break
-	# the build because of -Werror
-	use alpha && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
-	use amd64 && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
-	use hppa && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
-	emake || die "compile failed"
-}
-
-src_install () {
-
-	einstall || die "Installation failed"
-
-	# fixes devhelp paths
-	if [ -n "`use doc`" ] ;
-	then
-		cd ${S}/docs/devhelp
-		for PDH in `ls *.devhelp` ;
-		do
-			mv ${PDH} ${PDH}.old
-			sed -e "s:${D}::" ${PDH}.old > ${PDH}
-
-			insinto /usr/share/gtk-doc/html/${PDH/.devhelp/}
-			doins ${PDH}
-		done
-	fi
-
-	dodoc AUTHORS ChangeLog COPYING* DEVEL NEWS \
-		README RELEASE REQUIREMENTS TODO
-}
-
-pkg_postinst () {
-
-	gst-register-${PV_MAJ_MIN}
-
-}
diff --git a/media-libs/gstreamer/gstreamer-0.8.0.ebuild b/media-libs/gstreamer/gstreamer-0.8.0.ebuild
index 9f1e69a4dd57..e2209b3694e6 100644
--- a/media-libs/gstreamer/gstreamer-0.8.0.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.8.0.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/gstreamer/gstreamer-0.8.0.ebuild,v 1.2 2004/03/28 15:36:20 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.0.ebuild,v 1.3 2004/04/23 16:09:09 foser Exp $
 
 # FIXME : re-enable docs build
 inherit eutils flag-o-matic libtool gnome2
@@ -72,8 +72,15 @@ src_install() {
 
 	# remove the unversioned gst binaries
 	# or they will be owned by several slots
-	gst-plugins_remove_unversioned_binaries
 
+	cd ${D}/usr/bin
+	for gst_bins in `ls *-${PV_MAJ_MIN}`
+	do
+		rm ${gst_bins/-${PV_MAJ_MIN}/}
+		einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
+	done
+
+	cd ${S}
 	dodoc AUTHORS ChangeLog COPYING* DEVEL \
 		NEWS README RELEASE REQUIREMENTS TODO
 
diff --git a/media-libs/gstreamer/gstreamer-0.8.1.ebuild b/media-libs/gstreamer/gstreamer-0.8.1.ebuild
new file mode 100644
index 000000000000..7dd8751813b8
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-0.8.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.1.ebuild,v 1.1 2004/04/23 16:09:09 foser Exp $
+
+# FIXME : re-enable docs build
+inherit eutils flag-o-matic libtool gnome2
+
+# 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="Streaming media framework"
+HOMEPAGE="http://gstreamer.sourceforge.net"
+LICENSE="LGPL-2"
+
+SLOT=${PV_MAJ_MIN}
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+#IUSE="doc"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=dev-libs/libxml2-2.4.9
+	>=dev-libs/popt-1.6.3"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	dev-util/pkgconfig"
+#	doc? ( dev-util/gtk-doc
+#		app-text/xmlto )"
+
+src_unpack() {
+
+	unpack ${A}
+#	Fixed in the configure in a cleaner way.
+#	use ppc && epatch ${FILESDIR}/gnu_asm_fix.patch
+	# docs hack, disable dirs without html output
+#	cd ${S}/docs
+#	mv Makefile.in Makefile.in.old
+#	sed -e "s:faq manual pwg::" Makefile.in.old > Makefile.in
+
+}
+
+src_compile() {
+
+	elibtoolize
+
+	strip-flags
+	replace-flags "-O3" "-O2"
+
+	# docs hack, circumvent xmltex check
+	HAVE_XMLTEX=1 econf \
+		--with-configdir=/etc/gstreamer \
+		--disable-tests  \
+		--disable-examples \
+		--disable-docs-build \
+		|| die "./configure failed"
+#		`use_enable doc docs-build` \
+
+	# On alpha, amd64 and hppa some innocuous warnings are spit out that break
+	# the build because of -Werror
+	use alpha && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+	use amd64 && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+	use hppa && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+
+	emake || die "compile failed"
+
+}
+
+src_install() {
+
+	einstall || die
+
+	# remove the unversioned binaries gstreamer provide
+	# this is to prevent these binaries to be owned by several SLOTs
+	cd ${D}/usr/bin
+	for gst_bins in `ls *-${PV_MAJ_MIN}`
+	do
+		rm ${gst_bins/-${PV_MAJ_MIN}/}
+		einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
+	done
+
+	cd ${S}
+	dodoc AUTHORS ChangeLog COPYING* DEVEL \
+		NEWS README RELEASE REQUIREMENTS TODO
+
+}
+
+pkg_postinst() {
+
+	gst-register-${PV_MAJ_MIN}
+
+}