x86 stable

8 files changed, 7 insertions, 178 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index ce60f26cbd4b..09ec9d1d0f2e 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.122 2004/09/03 04:34:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.123 2004/09/09 16:33:33 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdemultimedia-3.2.1.ebuild,
+  -kdemultimedia-3.2.2.ebuild:
+  removing old versions, marking 3.3.0 x86 stable
 
   02 Sep 2004; Tom Gall <tgall@gentoo.org> kdemultimedia-3.3.0.ebuild:
   added ~ppc64, bug 62685
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.1
deleted file mode 100644
index 75c997a23eb8..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e03faa44ff7fdf60fd2fef0d23d5c43 kdemultimedia-3.2.1.tar.bz2 4926192
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2
deleted file mode 100644
index 3e9ad457e1ea..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 062249563cbf66d77e61b41e5126f806 kdemultimedia-3.2.2.tar.bz2 4911246
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc2
deleted file mode 100644
index 0e0456c9385d..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f59ece4b9fc1524d3970f3143af1565 kdemultimedia-3.3.0-rc2.tar.bz2 5437367
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild
deleted file mode 100644
index b8d44a054351..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.1.ebuild,v 1.10 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
-
-DEPEND="~kde-base/kdebase-${PV}
-	sys-libs/ncurses
-	media-sound/cdparanoia
-	virtual/mpg123
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
-	motif? ( x11-libs/openmotif )
-	slang? ( sys-libs/slang )
-	tcltk? ( dev-lang/tk dev-lang/tcl )
-	>=dev-libs/glib-2.2.1
-	>=media-libs/xine-lib-1_beta12
-	gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
-	media-libs/id3lib media-libs/musicbrainz media-libs/taglib
-	!media-sound/juk"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	# Still persists with 3.2.1 - kaboodle
-	filter-flags "-fno-default-inline"
-
-	myaudio="--enable-audio=oss"
-	myinterface="--enable-interface=xaw,ncurses"
-	myconf="$myconf --enable-xaw --enable-ncurses"
-	myconf="$myconf --with-xine-prefix=/usr"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-	use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-	use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-	use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-	use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-	myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.2.ebuild
deleted file mode 100644
index 0bc25ae1c5e1..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.2.ebuild,v 1.4 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
-IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
-
-DEPEND="~kde-base/kdebase-${PV}
-	sys-libs/ncurses
-	media-sound/cdparanoia
-	virtual/mpg123
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
-	motif? ( x11-libs/openmotif )
-	slang? ( sys-libs/slang )
-	tcltk? ( dev-lang/tk dev-lang/tcl )
-	>=dev-libs/glib-2.2.1
-	>=media-libs/xine-lib-1_beta12
-	gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
-	media-libs/id3lib media-libs/musicbrainz media-libs/taglib
-	!media-sound/juk"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	# Still persists with 3.2.1 - kaboodle
-	filter-flags "-fno-default-inline"
-
-	myaudio="--enable-audio=oss"
-	myinterface="--enable-interface=xaw,ncurses"
-	myconf="$myconf --enable-xaw --enable-ncurses"
-	myconf="$myconf --with-xine-prefix=/usr"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-	use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-	use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-	use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-	use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-	myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
index 44ea5760cc53..9653fe9396b4 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild,v 1.7 2004/09/03 04:34:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild,v 1.8 2004/09/09 16:33:33 caleb Exp $
 
 inherit kde-dist flag-o-matic eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ppc ~ppc64"
+KEYWORDS="x86 ~amd64 ~sparc ppc ~ppc64"
 IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc2.ebuild
deleted file mode 100644
index aebad8e65f71..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0_rc2.ebuild,v 1.2 2004/08/13 13:11:28 caleb Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
-
-DEPEND="~kde-base/kdebase-${PV}
-	audiofile? ( media-libs/audiofile )
-	cdparanoia? ( media-sound/cdparanoia )
-	flac? ( media-libs/flac )
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-sound/vorbis-tools )
-	xine? ( >=media-libs/xine-lib-1_beta12 )
-	alsa? ( media-libs/alsa-lib )
-	speex? ( media-libs/speex )
-	media-libs/taglib media-libs/tunepimp
-	!media-sound/juk"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	# Still persists with 3.2.1 - kaboodle
-	filter-flags "-fno-default-inline"
-
-	use xine && myconf="$myconf --with-xine-prefix=/usr"
-	use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
-
-	myconf="${myconf} `use_with cdparanoia`"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
-
-	myconf="$myconf --disable-strict --disable-warnings"
-
-	kde_src_compile
-}