summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2002-09-20 10:21:13 +0000
committerDan Armak <danarmak@gentoo.org>2002-09-20 10:21:13 +0000
commitc336e02eb0b74f314b6477d4ef88d77cdbbbf963 (patch)
tree41ab5f2ea0368c302efd1bc613d8715c52adda8a /kde-base
parentmake building kocd and kaudiocreator depend on the new cdr use flag (diff)
downloadgentoo-2-c336e02eb0b74f314b6477d4ef88d77cdbbbf963.tar.gz
gentoo-2-c336e02eb0b74f314b6477d4ef88d77cdbbbf963.tar.bz2
gentoo-2-c336e02eb0b74f314b6477d4ef88d77cdbbbf963.zip
make building kooka depend o the new scanner use flag
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdegraphics/ChangeLog8
-rw-r--r--kde-base/kdegraphics/kdegraphics-3.0.3.ebuild17
-rw-r--r--kde-base/kdegraphics/kdegraphics-3.1_beta1.ebuild4
3 files changed, 25 insertions, 4 deletions
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 21db4525f25c..9e30c87b9964 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kdegraphics
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.10 2002/08/19 09:36:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.11 2002/09/20 10:21:13 danarmak Exp $
+
+ 08 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+
+ Make building libkscan and kooka (the kde sane frontend) depend on the
+ new scanner use variale. This variable is on by default, so the default
+ behaviour is unchanged; therefore there is no new revision. Fix #4868.
*kdegraphics-3.0.3 (19 Aug 2002)
diff --git a/kde-base/kdegraphics/kdegraphics-3.0.3.ebuild b/kde-base/kdegraphics/kdegraphics-3.0.3.ebuild
index 59189c95c751..0abadcd8ba0a 100644
--- a/kde-base/kdegraphics/kdegraphics-3.0.3.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-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/kdegraphics/kdegraphics-3.0.3.ebuild,v 1.1 2002/08/19 09:34:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.0.3.ebuild,v 1.2 2002/09/20 10:21:13 danarmak Exp $
inherit kde-dist
DESCRIPTION="KDE $PV - graphics-related apps"
@@ -9,7 +9,7 @@ KEYWORDS="x86 ppc"
newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 >=media-libs/libgpio-20010607 )
sys-devel/perl
- media-gfx/sane-backends
+ scanner? ( media-gfx/sane-backends )
tetex? ( >=app-text/tetex-1.0.7 )
media-libs/imlib
app-text/ghostscript"
@@ -21,5 +21,18 @@ use gphoto2 && myconf="$myconf --with-kamera --with-gphoto2-includes=/usr/includ
use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+use scanner || KDE_REMOVE_DIR="kooka libkscan"
+
myconf="$myconf --with-imlib --with-imlib-config=/usr/bin "
+src_unpack() {
+
+ base_src_unpack
+
+ if [ -z "`use scanner`" ]; then
+ cd $S
+ mv Makefile.am Makefile.am.orig
+ sed -e 's:$(KSCANDIR)::' Makefile.am.orig > Makefile.am
+ fi
+
+} \ No newline at end of file
diff --git a/kde-base/kdegraphics/kdegraphics-3.1_beta1.ebuild b/kde-base/kdegraphics/kdegraphics-3.1_beta1.ebuild
index 911a024374d6..463fa667d97f 100644
--- a/kde-base/kdegraphics/kdegraphics-3.1_beta1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.1_beta1.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/kdegraphics/kdegraphics-3.1_beta1.ebuild,v 1.1 2002/08/22 21:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.1_beta1.ebuild,v 1.2 2002/09/20 10:21:13 danarmak Exp $
inherit kde-dist
DESCRIPTION="KDE $PV - graphics-related apps"
@@ -23,5 +23,7 @@ use gphoto2 && myconf="$myconf --with-kamera --with-gphoto2-includes=/usr/includ
use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+use scanner || KDE_REMOVE_DIR="kooka libkscan"
+
myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"