summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-09-20 10:19:49 +0000
committerDan Armak <danarmak@gentoo.org>2002-09-20 10:19:49 +0000
commit7c8a56260e9081642b9fdcfd19500d5adc024d9a (patch)
tree6b0bd9c73db60af8f7ac61961211eaeeccb1b282 /kde-base/kdemultimedia
parentadd bindings for the new cdr and scanner use flags to the cdrtools and sane-b... (diff)
downloadgentoo-2-7c8a56260e9081642b9fdcfd19500d5adc024d9a.tar.gz
gentoo-2-7c8a56260e9081642b9fdcfd19500d5adc024d9a.tar.bz2
gentoo-2-7c8a56260e9081642b9fdcfd19500d5adc024d9a.zip
make building kocd and kaudiocreator depend on the new cdr use flag
Diffstat (limited to 'kde-base/kdemultimedia')
-rw-r--r--kde-base/kdemultimedia/ChangeLog8
-rw-r--r--kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild10
-rw-r--r--kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild4
3 files changed, 17 insertions, 5 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index cbeef8711a1d..5ff73fa50cff 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kdemultimedia
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.11 2002/08/19 09:36:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.12 2002/09/20 10:19:49 danarmak Exp $
+
+ 08 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+
+ Make building koncd in 3.0.x, and kaudiocreator in 3.1.x, depend on the new
+ cdr use variable. This variable is on by default, so the default behaviour
+ is unchanged; therefore there is no new revision. Fix #4868.
*kdemultimedia-3.0.3 (19 Aug 2002)
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild
index d2fd20235c65..1477a8113fab 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild,v 1.2 2002/08/30 03:34:18 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.0.3.ebuild,v 1.3 2002/09/20 10:19:49 danarmak Exp $
inherit kde-dist flag-o-matic
DESCRIPTION="KDE $PV - multimedia apps"
@@ -15,12 +15,14 @@ newdepend ">=sys-libs/ncurses-5.2
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 )"
+RDEPEND="$RDEPEND
+ cdr? ( app-cdr/cdrtools
+ >=app-cdr/cdrdao-1.1.5 )"
+
replace-flags "-O3" "-O2"
myaudio="--enable-audio=oss"
@@ -38,6 +40,8 @@ use tcltk && myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
myconf="$myconf $myaudio $myinterface"
+use cdr || KDE_REMOVE_DIR="koncd"
+
src_unpack() {
base_src_unpack
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
index 95df4f585399..1efc4e259202 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2001 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild,v 1.4 2002/08/30 07:06:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1_beta1.ebuild,v 1.5 2002/09/20 10:19:49 danarmak Exp $
inherit kde-dist flag-o-matic
DESCRIPTION="KDE $PV - multimedia apps"
@@ -46,6 +46,8 @@ 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"
+
export DO_NOT_COMPILE="xine_artsplugin"
myconf="$myconf $myaudio $myinterface"