Fixed 0.6.0 rev

5 files changed, 37 insertions, 86 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 728ba16e2ed6..004829b40b5f 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +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.19 2003/02/04 10:49:25 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.20 2003/02/04 15:11:34 foser Exp $
+
+*gstreamer-0.6.0-r1 (04 Feb 2003)
+
+  04 Feb 2003; foser <foser@gentoo.org> gstreamer-0.6.0-r1.ebuild :
+  Revision bump with a lot of needed SLOT related changes
+  Disabled docs until the gstreamer team gets things sorted out
+  Added extra error notification patch
 
 *gstreamer-0.6.0 (04 Feb 2003)
 
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.5.1 b/media-libs/gstreamer/files/digest-gstreamer-0.5.1
deleted file mode 100644
index 85fcebda9eb5..000000000000
--- a/media-libs/gstreamer/files/digest-gstreamer-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cb5958ce555eae3b06609f3308fc56c gstreamer-0.5.1.tar.bz2 1083948
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r1 b/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r1
new file mode 100644
index 000000000000..3650f861360a
--- /dev/null
+++ b/media-libs/gstreamer/files/digest-gstreamer-0.6.0-r1
@@ -0,0 +1 @@
+MD5 3d0dec37678b33bbcb23cb2e20a83fe4 gstreamer-0.6.0.tar.bz2 1094712
diff --git a/media-libs/gstreamer/gstreamer-0.5.1.ebuild b/media-libs/gstreamer/gstreamer-0.6.0-r1.ebuild
index b982a8d15102..39f479aa7300 100644
--- a/media-libs/gstreamer/gstreamer-0.5.1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.6.0-r1.ebuild
@@ -1,46 +1,47 @@
 # 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.1.ebuild,v 1.1 2003/01/10 06:47:26 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.6.0-r1.ebuild,v 1.1 2003/02/04 15:11:34 foser 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}"
+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"
 
 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/docbook-xsl-stylesheets
-		app-text/passivetex
-		app-text/xpdf
-		app-text/ghostscript )
 	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
+#		app-text/ghostscript )
+
 src_unpack() {
 	unpack ${A}
-	
-	# Patch for problems compiling when specifying USE="doc"
-	# The problem is that gstreamer's docs import the wrong version
-	# (or different to ours) of app-text/docbook-xsl-stylesheets,
-	# and delete files it should not.
-	# <azarah@gentoo.org> (27 Dec 2002).
+
 	cd ${S}
-#	epatch ${FILESDIR}/${P}-xsl-use-current.patch
-	epatch ${FILESDIR}/${P}-no-rm-html.devhelp.patch
+	# some extra error feedback
+	epatch ${FILESDIR}/${PN}-error_report.patch
 }
-
+	
 src_compile() {
 	elibtoolize
 
@@ -48,11 +49,13 @@ src_compile() {
 	replace-flags "-O3" "-O2"
 
 	local myconf=""
-	use doc \
-		&& myconf="${myconf} --enable-docs-build" \
-		|| myconf="${myconf} --disable-docs-build"
+#	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"
@@ -68,5 +71,5 @@ src_install () {
 }
 
 pkg_postinst () {
-	gst-register
+	gst-register-${PV_MAJ_MIN}
 }
diff --git a/media-libs/gstreamer/gstreamer-0.6.0.ebuild b/media-libs/gstreamer/gstreamer-0.6.0.ebuild
deleted file mode 100644
index 2f8c79d8b964..000000000000
--- a/media-libs/gstreamer/gstreamer-0.6.0.ebuild
+++ /dev/null
@@ -1,59 +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.6.0.ebuild,v 1.1 2003/02/04 10:49:25 raker Exp $
-
-inherit eutils flag-o-matic libtool
-
-IUSE="doc"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.bz2"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
-
-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/docbook-xsl-stylesheets
-		app-text/passivetex
-		app-text/xpdf
-		app-text/ghostscript )
-	x86? ( >=dev-lang/nasm-0.90 )
-	>=sys-libs/zlib-1.1.4"
-	
-src_compile() {
-	elibtoolize
-
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	local myconf=""
-	use doc \
-		&& myconf="${myconf} --enable-docs-build" \
-		|| myconf="${myconf} --disable-docs-build"
-
-	econf \
-		--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
-}