mark 0.6.3 x86 'n cleanup

6 files changed, 11 insertions, 274 deletions

diff --git a/media-libs/gst-plugins/Manifest b/media-libs/gst-plugins/Manifest
index 883f20891196..ee4435aa4f8a 100644
--- a/media-libs/gst-plugins/Manifest
+++ b/media-libs/gst-plugins/Manifest
@@ -1,18 +1,14 @@
-MD5 d1692e34fcf6feb24686d4d687b5442b ChangeLog 7501
-MD5 ca97543ee9f2a20325ce51626a1f3c43 gst-plugins-0.6.1.ebuild 4861
-MD5 77a7756503fe6ee887918f5352661e5f gst-plugins-0.6.2-r5.ebuild 2255
-MD5 ef98fe1233696e1ccf36a56f61581af4 gst-plugins-0.6.2.ebuild 4943
 MD5 c9445afa0fcae54b4a11f4bc6f13ab7e gst-plugins-0.6.2-r1.ebuild 5101
+MD5 ca97543ee9f2a20325ce51626a1f3c43 gst-plugins-0.6.1.ebuild 4861
+MD5 1ff8e5e8883aa9119b887b16ce7a5699 gst-plugins-0.6.3.ebuild 2986
+MD5 d1692e34fcf6feb24686d4d687b5442b ChangeLog 7501
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 c6ff6386cf446e64dc56084fcfb94de1 gst-plugins-0.6.3.ebuild 2990
-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 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
-MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
-MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2 71
-MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r5 71
+MD5 4ce1d39bcd5cf1db9464cad55467b790 files/gst-plugins-0.6.3-gcc33.patch 1307
 MD5 c416f328737707f685267ea1dcf14272 files/digest-gst-plugins-0.6.2-r1 71
 MD5 1934516009a2cf836520961cd1fd0085 files/gst-plugins-0.6.2-rm_cflags.patch 2542
-MD5 f7aac3ba492d4e54ae14ebeabc3299d4 files/libmpeg2.patch 878
+MD5 497c4febffa64787dea6e4771fb6b72b files/digest-gst-plugins-0.6.1 71
 MD5 ad7d13e5c42638d153311159e0c64028 files/digest-gst-plugins-0.6.3 71
-MD5 4ce1d39bcd5cf1db9464cad55467b790 files/gst-plugins-0.6.3-gcc33.patch 1307
+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 04bb0cdc1431b53db92b658a3c9fa6dd files/noppcasm.patch 1431
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2
deleted file mode 100644
index d3c9de65af1e..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2
+++ /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.2-r5 b/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2-r5
deleted file mode 100644
index d3c9de65af1e..000000000000
--- a/media-libs/gst-plugins/files/digest-gst-plugins-0.6.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 421447896753ebecaeba9d4bf60d3776 gst-plugins-0.6.2.tar.bz2 1894462
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild
deleted file mode 100644
index f734b78005b1..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.2-r5.ebuild
+++ /dev/null
@@ -1,93 +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/gst-plugins/gst-plugins-0.6.2-r5.ebuild,v 1.6 2003/09/11 01:17:46 msterret Exp $
-
-# IMPORTANT
-#
-# Since gst-plugins uses a local copy of ffmpeg we consider this a non-external plugin
-# In essence this means gst-plugins without any external plugins already provides a
-# wide range of audio/video codecs
-#
-# This may change in the future, but for now 3rd-party apps do probably not need to depend
-# on mpeg/avi plugins etcetera unless they directly name specific plugins
-
-inherit gnome2 gst-plugins eutils flag-o-matic
-
-DESCRIPTION="Additional plugins for gstreamer"
-HOMEPAGE="http://gstreamer.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-# TODO : gconf support is also optional
-
-RDEPEND="=media-libs/gstreamer-${PV}*
-	>=gnome-base/gconf-1.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-BUILD_GST_PLUGIN="ffmpeg"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-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 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() {
-
-	elibtoolize
-
-	# gst doesnt handle optimisations well
-	strip-flags
-	replace-flags "-O3" "-O2"
-	filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
-	gst-plugins_src_configure --program-suffix=-${PV_MAJ_MIN}
-
-	emake || die
-
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc AUTHORS COPYING INSTALL README RELEASE TODO
-}
-
-pkg_postinst () {
-
-	gnome2_pkg_postinst
-	gst-plugins_pkg_postinst
-
-}
-
-pkg_postrm() {
-
-	gnome2_pkg_postrm
-	gst-plugins_pkg_postrm
-
-}
diff --git a/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild b/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild
deleted file mode 100644
index 58bff9a8b0ba..000000000000
--- a/media-libs/gst-plugins/gst-plugins-0.6.2.ebuild
+++ /dev/null
@@ -1,164 +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/gst-plugins/gst-plugins-0.6.2.ebuild,v 1.7 2003/09/11 01:17:46 msterret 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}*
-	>=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"
-
-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
-
-	# 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() {
-	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.6.3.ebuild
index 64db183b926a..758796b23dfb 100644
--- a/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
+++ b/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.6 2003/09/16 02:53:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.6.3.ebuild,v 1.7 2003/10/05 14:14:44 foser Exp $
 
 # IMPORTANT
 #
@@ -17,7 +17,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 
 # TODO : gconf support is also optional