diff options
| author |   Hannes Mehnert <hannes@gentoo.org> | 2003-02-12 17:27:42 +0000 |
|---|---|---|
| committer | Hannes Mehnert <hannes@gentoo.org> | 2003-02-12 17:27:42 +0000 |
| commit | d0a74c3f230be229c3e05537bafc4820abab2482 (patch) | |
| tree | 1b5b1ed639cb46dfb14b467c6e37aaf7f9a024e2 /kde-base | |
| parent | removed old ebuild (diff) | |
| download | gentoo-2-d0a74c3f230be229c3e05537bafc4820abab2482.tar.gz gentoo-2-d0a74c3f230be229c3e05537bafc4820abab2482.tar.bz2 gentoo-2-d0a74c3f230be229c3e05537bafc4820abab2482.zip | |
removed old ebuilds
lintool fixes
Diffstat (limited to 'kde-base')
19 files changed, 39 insertions, 434 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index b43041857d38..44f58830e858 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-basekdemultimediaChangeLog/ # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.33 2003/02/12 06:57:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.34 2003/02/12 17:27:42 hannes Exp $ + + 12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-2.2.2.ebuild, + kdemultimedia-3.0.2.ebuild, kdemultimedia-3.0.3.ebuild, + kdemultimedia-3.1_rc6.ebuild: removed old ebuilds *kdemultimedia-3.1-r1 (11 Feb 2003) diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2 deleted file mode 100644 index 8be93bde0aeb..000000000000 --- a/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 76981ca284663093cd0bc37500e10441 kdemultimedia-2.2.2.tar.bz2 4700495 diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.2 deleted file mode 100644 index 424596082c3c..000000000000 --- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 b794f63425e5584a4de1a0f7e07d9ff7 kdemultimedia-3.0.2.tar.bz2 5790681 diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.3 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.3 deleted file mode 100644 index f0392317f8db..000000000000 --- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 f191cc8476fb67fd1ca0c240f620d2b1 kdemultimedia-3.0.3.tar.bz2 5791102 diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1_rc6 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1_rc6 deleted file mode 100644 index 1820fb4b60a5..000000000000 --- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1_rc6 +++ /dev/null @@ -1 +0,0 @@ -MD5 e2533a235f0721909532df03cc34526d kdemultimedia-3.1rc6.tar.bz2 5966237 diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.1-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.1-gentoo-timidity.diff deleted file mode 100644 index f392a244212e..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-3.0.1-gentoo-timidity.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c ---- kmidi/TIMIDITY/motif_p.c Mon Feb 28 19:07:37 2000 -+++ kmidi/TIMIDITY/motif_p.c Fri Oct 19 04:00:10 2001 -@@ -22,6 +22,7 @@ - pipe communication between motif interface and sound generator - - */ -+#include <sys/errno.h> - #ifdef IA_MOTIF - - #include <stdio.h> ---- kmidi/TIMIDITY/tk_c.c 2002-04-04 21:15:35.000000000 -0600 -+++ kmidi/TIMIDITY/tk_c.c 2002-04-04 21:17:06.000000000 -0600 -@@ -12,6 +12,7 @@ - *================================================================*/ - #ifdef TCLTK - -+#include <sys/errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.2-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.2-gentoo-timidity.diff deleted file mode 100644 index f392a244212e..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-3.0.2-gentoo-timidity.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c ---- kmidi/TIMIDITY/motif_p.c Mon Feb 28 19:07:37 2000 -+++ kmidi/TIMIDITY/motif_p.c Fri Oct 19 04:00:10 2001 -@@ -22,6 +22,7 @@ - pipe communication between motif interface and sound generator - - */ -+#include <sys/errno.h> - #ifdef IA_MOTIF - - #include <stdio.h> ---- kmidi/TIMIDITY/tk_c.c 2002-04-04 21:15:35.000000000 -0600 -+++ kmidi/TIMIDITY/tk_c.c 2002-04-04 21:17:06.000000000 -0600 -@@ -12,6 +12,7 @@ - *================================================================*/ - #ifdef TCLTK - -+#include <sys/errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.0.3-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.0.3-gentoo-timidity.diff deleted file mode 100644 index f392a244212e..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-3.0.3-gentoo-timidity.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c ---- kmidi/TIMIDITY/motif_p.c Mon Feb 28 19:07:37 2000 -+++ kmidi/TIMIDITY/motif_p.c Fri Oct 19 04:00:10 2001 -@@ -22,6 +22,7 @@ - pipe communication between motif interface and sound generator - - */ -+#include <sys/errno.h> - #ifdef IA_MOTIF - - #include <stdio.h> ---- kmidi/TIMIDITY/tk_c.c 2002-04-04 21:15:35.000000000 -0600 -+++ kmidi/TIMIDITY/tk_c.c 2002-04-04 21:17:06.000000000 -0600 -@@ -12,6 +12,7 @@ - *================================================================*/ - #ifdef TCLTK - -+#include <sys/errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-gentoo-timidity.diff deleted file mode 100644 index f392a244212e..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-gentoo-timidity.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c ---- kmidi/TIMIDITY/motif_p.c Mon Feb 28 19:07:37 2000 -+++ kmidi/TIMIDITY/motif_p.c Fri Oct 19 04:00:10 2001 -@@ -22,6 +22,7 @@ - pipe communication between motif interface and sound generator - - */ -+#include <sys/errno.h> - #ifdef IA_MOTIF - - #include <stdio.h> ---- kmidi/TIMIDITY/tk_c.c 2002-04-04 21:15:35.000000000 -0600 -+++ kmidi/TIMIDITY/tk_c.c 2002-04-04 21:17:06.000000000 -0600 -@@ -12,6 +12,7 @@ - *================================================================*/ - #ifdef TCLTK - -+#include <sys/errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-ln-sf.diff deleted file mode 100644 index ee6daa91f3dc..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-3.1_rc6-ln-sf.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- kmidi/TIMIDITY/makelinks Sat Aug 24 11:36:27 2002 -+++ kmidi/TIMIDITY/makelinks Sat Aug 24 11:36:15 2002 -@@ -3,7 +3,7 @@ srcdir=$1 - for header in common config controls ctl effects filter instrum mix \ - output playmidi readmidi resample sbk sflayer tables \ - version ; do -- if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi -+ if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi - done - - for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \ -@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd - playmidi raw_a readmidi readsbk resample resample_f \ - resample_l reverb_e sbktext sf2cfg slang_c sndfont \ - sun_a tables timidity wav2pat wave_a ; do -- if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi -+ if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi - done - - for lfile in cfg ; do -- if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi -+ if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi - done - - # LEAVE THIS ONE AT THE END!! - for other in BITMAPS ; do -- if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi -+ if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi - done diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild index 9a314ba5f298..091ec39094f0 100644 --- a/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild,v 1.2 2003/02/01 20:07:51 jmorgan Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild,v 1.3 2003/02/12 17:27:42 hannes Exp $ IUSE="nas esd motif gtk slang alsa" -inherit kde-dist +inherit kde-dist eutils SRC_URI="${SRC_URI} mirror://kde/security_patches/post-${PV}-${PN}.diff" @@ -25,12 +25,11 @@ newdepend ">=sys-libs/ncurses-5.2 src_unpack() { unpack ${P}.tar.bz2 cd ${S} - patch -p1 < ${DISTDIR}/post-${PV}-${PN}.diff - patch -p0 < ${FILESDIR}/${P}-gentoo.diff + epatch ${DISTDIR}/post-${PV}-${PN}.diff + epatch ${FILESDIR}/${P}-gentoo.diff } src_compile() { - kde_src_compile myconf local myaudio @@ -49,7 +48,4 @@ src_compile() { myconf="$myconf $myaudio $myinterface" kde_src_compile configure make - } - - diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild deleted file mode 100644 index 33dbb542bb3f..000000000000 --- a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild,v 1.17 2003/01/30 19:40:19 danarmak Exp $ - -IUSE="nas esd motif gtk slang alsa" -inherit kde-dist - -DESCRIPTION="KDE $PV - multimedia apps" -KEYWORDS="x86 sparc " - -newdepend ">=sys-libs/ncurses-5.2 - >=media-sound/cdparanoia-3.9.8 - >=media-libs/libvorbis-1.0_beta4 - >=media-video/xanim-2.80.1 - alsa? ( >=media-libs/alsa-lib-0.5.9 ) - nas? ( >=media-libs/nas-1.4.1 ) - esd? ( >=media-sound/esound-0.2.22 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - gtk? ( =x11-libs/gtk+-1.2* ) - slang? ( >=sys-libs/slang-1.4.4 )" - -src_unpack() { - - kde_src_unpack all patch - -} - -src_compile() { - - kde_src_compile myconf - - local myaudio - local myinteface - myaudio="--enable-audio=oss" - myinterface="--enable-interface=xaw,ncurses" - - use alsa && myconf="$myconf --with-alsa" && myaudio="$myaudio,alsa" - use nas && myaudio="$myaudio,nas" - use esd && myaudio="$myaudio,esd" - use motif && myinterface="$myinterface,motif" - use gtk && myinterface="$myinterface,gtk" - use slang && myinterface="$myinterface,slang" -# tcl tk does not work - - myconf="$myconf $myaudio $myinterface" - - kde_src_compile configure make - -} - - diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.2.ebuild deleted file mode 100644 index 7430de0ba693..000000000000 --- a/kde-base/kdemultimedia/kdemultimedia-3.0.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.2.ebuild,v 1.11 2003/01/30 19:40:19 danarmak Exp $ - -IUSE="nas esd motif gtk tcltk slang" -inherit kde-dist flag-o-matic - -DESCRIPTION="KDE $PV - multimedia apps" -KEYWORDS="x86 ppc sparc " - -newdepend ">=sys-libs/ncurses-5.2 - >=media-sound/cdparanoia-3.9.8 - >=media-libs/libvorbis-1.0_beta4 - >=media-video/xanim-2.80.1 - nas? ( >=media-libs/nas-1.4.1 ) - esd? ( >=media-sound/esound-0.2.22 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - gtk? ( =x11-libs/gtk+-1.2* ) - slang? ( >=sys-libs/slang-1.4.4 ) - app-cdr/cdrtools - >=app-cdr/cdrdao-1.1.5 - >=media-sound/mpg123-0.59r - tcltk? ( >=dev-lang/tk-8.0.5-r2 )" -# alsa? ( >=media-libs/alsa-lib-0.5.9 )" - -replace-flags "-O3" "-O2" -filter-flags "-fomit-frame-pointer" - -myaudio="--enable-audio=oss" -myinterface="--enable-interface=xaw,ncurses" -myconf="$myconf --enable-xaw --enable-ncurses" - -#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 gtk && myinterface="$myinterface,gtk" && myconf="$myconf --enable-gtk" -use slang && myinterface="$myinterface,slang" && myconf="$myconf --enable-slang" -use tcltk && myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk" - -myconf="$myconf $myaudio $myinterface" - -src_unpack() { - - kde_src_unpack - cd ${S} - patch -p0 < ${FILESDIR}/${P}-gentoo-timidity.diff || die -# use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff - - kde_sandbox_patch ${S}/kmidi/config - - cd ${S}/kmidi/config - for x in Makefile.am Makefile.in; do - mv $x $x.orig - sed -e 's:TIMID_DIR = $(DESTDIR)/$(kde_datadir):TIMID_DIR = $(kde_datadir):g' $x.orig > $x - done - -} - -pkg_postinst() { - - if [ -n "`use alsa`" ]; then - einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. -For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. -Meanwhile, you can use the alsa oss emulation." - fi - return 0 - -} diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild deleted file mode 100644 index a5a4ea5c680f..000000000000 --- a/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild,v 1.9 2003/01/30 19:40:19 danarmak Exp $ - -IUSE="nas esd motif gtk tcltk slang" -inherit kde-dist flag-o-matic - -DESCRIPTION="KDE $PV - multimedia apps" -KEYWORDS="x86 ppc" - -newdepend ">=sys-libs/ncurses-5.2 - >=media-sound/cdparanoia-3.9.8 - >=media-libs/libvorbis-1.0_beta4 - >=media-video/xanim-2.80.1 - nas? ( >=media-libs/nas-1.4.1 ) - esd? ( >=media-sound/esound-0.2.22 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - gtk? ( =x11-libs/gtk+-1.2* ) - slang? ( >=sys-libs/slang-1.4.4 ) - >=media-sound/mpg123-0.59r - tcltk? ( >=dev-lang/tk-8.0.5-r2 )" -# alsa? ( >=media-libs/alsa-lib-0.5.9 )" - -# koncd isn't compiled by default (kde.org's default) -#RDEPEND="$RDEPEND -# cdr? ( app-cdr/cdrtools -# >=app-cdr/cdrdao-1.1.5 )" - -replace-flags "-O3" "-O2" -filter-flags "-fforce-addr -fomit-frame-pointer" -myaudio="--enable-audio=oss" -myinterface="--enable-interface=xaw,ncurses" -myconf="$myconf --enable-xaw --enable-ncurses" - -#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 gtk && myinterface="$myinterface,gtk" && myconf="$myconf --enable-gtk" -use slang && myinterface="$myinterface,slang" && myconf="$myconf --enable-slang" -use tcltk && myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk" - -myconf="$myconf $myaudio $myinterface" - -#use cdr || KDE_REMOVE_DIR="koncd" - -src_unpack() { - - kde_src_unpack - cd ${S} - patch -p0 < ${FILESDIR}/${P}-gentoo-timidity.diff || die -# use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff - - kde_sandbox_patch ${S}/kmidi/config - - cd ${S}/kmidi/config - for x in Makefile.am Makefile.in; do - mv $x $x.orig - sed -e 's:TIMID_DIR = $(DESTDIR)/$(kde_datadir):TIMID_DIR = $(kde_datadir):g' $x.orig > $x - done - -} - -pkg_postinst() { - - if [ -n "`use alsa`" ]; then - einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. -For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. -Meanwhile, you can use the alsa oss emulation." - fi - return 0 - -} diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild index 8bea8018a894..a9739de65f82 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild,v 1.6 2003/01/30 19:40:19 danarmak Exp $ -inherit kde-dist flag-o-matic +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.4.ebuild,v 1.7 2003/02/12 17:27:42 hannes Exp $ +inherit kde-dist flag-o-matic eutils +IUSE="nas esd motif gtk slang tcltk" DESCRIPTION="KDE $PV - multimedia apps" KEYWORDS="x86 ppc alpha" @@ -45,29 +46,24 @@ myconf="$myconf $myaudio $myinterface" #use cdr || KDE_REMOVE_DIR="koncd" src_unpack() { - kde_src_unpack - cd ${S} - patch -p0 < ${FILESDIR}/${P}-gentoo-timidity.diff || die -# use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff - - kde_sandbox_patch ${S}/kmidi/config + cd ${S} + epatch ${FILESDIR}/${P}-gentoo-timidity.diff + #use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff + + kde_sandbox_patch ${S}/kmidi/config cd ${S}/kmidi/config for x in Makefile.am Makefile.in; do mv $x $x.orig sed -e 's:TIMID_DIR = $(DESTDIR)/$(kde_datadir):TIMID_DIR = $(kde_datadir):g' $x.orig > $x done - } pkg_postinst() { - - if [ -n "`use alsa`" ]; then + if [ -n "`use alsa`" ]; then einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. Meanwhile, you can use the alsa oss emulation." - fi - return 0 - + fi } diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild index fe59387481e7..b76eb007c7df 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild,v 1.4 2003/02/01 20:07:51 jmorgan Exp $ -inherit kde-dist flag-o-matic +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.5a.ebuild,v 1.5 2003/02/12 17:27:42 hannes Exp $ +inherit kde-dist flag-o-matic eutils +IUSE="nas esd motif gtk slang tcltk" DESCRIPTION="KDE $PV - multimedia apps" KEYWORDS="x86 ~ppc ~alpha sparc" @@ -45,29 +46,24 @@ myconf="$myconf $myaudio $myinterface" #use cdr || KDE_REMOVE_DIR="koncd" src_unpack() { - - kde_src_unpack - cd ${S} - patch -p0 < ${FILESDIR}/${P}-gentoo-timidity.diff || die -# use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff - - kde_sandbox_patch ${S}/kmidi/config + kde_src_unpack + cd ${S} + epatch ${FILESDIR}/${P}-gentoo-timidity.diff + #use alsa && patch -p0 < ${FILESDIR}/${P}-gentoo-alsa.diff + + kde_sandbox_patch ${S}/kmidi/config cd ${S}/kmidi/config for x in Makefile.am Makefile.in; do mv $x $x.orig sed -e 's:TIMID_DIR = $(DESTDIR)/$(kde_datadir):TIMID_DIR = $(kde_datadir):g' $x.orig > $x done - } pkg_postinst() { - - if [ -n "`use alsa`" ]; then + if [ -n "`use alsa`" ]; then einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. Meanwhile, you can use the alsa oss emulation." - fi - return 0 - + fi } diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild index b3aadd84d369..d635cee4dc3e 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild,v 1.1 2003/02/11 20:21:20 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1-r1.ebuild,v 1.2 2003/02/12 17:27:42 hannes Exp $ inherit kde-dist flag-o-matic +IUSE="nas esd motif slang tcltk oggvorbis cdr" DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..." KEYWORDS="~x86 ~ppc ~sparc" @@ -60,12 +61,9 @@ KDE_REMOVE_DIR="xine_artsplugin" myconf="$myconf $myaudio $myinterface" pkg_postinst() { - - if [ -n "`use alsa`" ]; then + if [ -n "`use alsa`" ]; then einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. Meanwhile, you can use the alsa oss emulation." - fi - return 0 - + fi } diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild index f3d074ddd437..fb7bd7a22012 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild @@ -1,8 +1,9 @@ # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild,v 1.5 2003/02/01 20:07:51 jmorgan Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.ebuild,v 1.6 2003/02/12 17:27:42 hannes Exp $ inherit kde-dist flag-o-matic +IUSE="nas esd motif slang tcltk oggvorbis cdr" DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..." KEYWORDS="x86 ppc ~sparc" @@ -20,7 +21,7 @@ newdepend ">=sys-libs/ncurses-5.2 oggvorbis? ( media-libs/libvorbis )" #>=media-libs/xine-lib-0.9.14" # not yet available #gtk? ( =x11-libs/gtk+-1.2* ) -# alsa? ( >=media-libs/alsa-lib-0.5.9 )" + #alsa? ( >=media-libs/alsa-lib-0.5.9 )" RDEPEND="$RDEPEND cdr? ( app-cdr/cdrtools @@ -60,12 +61,9 @@ KDE_REMOVE_DIR="xine_artsplugin" myconf="$myconf $myaudio $myinterface" pkg_postinst() { - - if [ -n "`use alsa`" ]; then + if [ -n "`use alsa`" ]; then einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. Meanwhile, you can use the alsa oss emulation." - fi - return 0 - + fi } diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1_rc6.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1_rc6.ebuild deleted file mode 100644 index 086cf147b08e..000000000000 --- a/kde-base/kdemultimedia/kdemultimedia-3.1_rc6.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1_rc6.ebuild,v 1.2 2003/01/08 21:45:57 gerk Exp $ -inherit kde-dist flag-o-matic - -DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..." -KEYWORDS="~x86 ~ppc ~sparc" - -newdepend ">=sys-libs/ncurses-5.2 - >=media-sound/cdparanoia-3.9.8 - >=media-libs/libvorbis-1.0_beta4 - >=media-video/xanim-2.80.1 - nas? ( >=media-libs/nas-1.4.1 ) - esd? ( >=media-sound/esound-0.2.22 ) - motif? ( >=x11-libs/openmotif-2.1.30 ) - slang? ( >=sys-libs/slang-1.4.4 ) - >=media-sound/mpg123-0.59r - tcltk? ( >=dev-lang/tk-8.0.5-r2 ) - >=dev-libs/glib-1.3.3 - oggvorbis? ( media-libs/libvorbis )" - #>=media-libs/xine-lib-0.9.14" # not yet available - #gtk? ( =x11-libs/gtk+-1.2* ) -# alsa? ( >=media-libs/alsa-lib-0.5.9 )" - -RDEPEND="$RDEPEND - cdr? ( app-cdr/cdrtools - >=app-cdr/cdrdao-1.1.5 )" - -replace-flags "-O3" "-O2" - -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 -export MAKEOPTS="$MAKEOPTS -j1" - -PATCHES="$FILESDIR/$P-gentoo-timidity.diff - $FILESDIR/$P-ln-sf.diff" - -# 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" -# kmidi/TIMIDITY miscompiles with gtk -#use gtk && myinterface="$myinterface,gtk" && myconf="$myconf --enable-gtk" -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" - -use cdr || KDE_REMOVE_DIR="kaudiocreator" - -# xine doesn't compile yet -# also turn off kaudiocreator if cdr isn't in use -KDE_REMOVE_DIR="xine_artsplugin" -[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator" - -myconf="$myconf $myaudio $myinterface" - -pkg_postinst() { - - if [ -n "`use alsa`" ]; then - einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources. -For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org. -Meanwhile, you can use the alsa oss emulation." - fi - return 0 - -} |