summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2004-09-02 14:39:33 +0000
committerCaleb Tennis <caleb@gentoo.org>2004-09-02 14:39:33 +0000
commit51aedd2ea97afedb2094d53725adaf8a5e1ec978 (patch)
tree78c450307e85158496607cf02db800692322760c /kde-base
parentpatch to fix a crash (#62296) (Manifest recommit) (diff)
downloadgentoo-2-51aedd2ea97afedb2094d53725adaf8a5e1ec978.tar.gz
gentoo-2-51aedd2ea97afedb2094d53725adaf8a5e1ec978.tar.bz2
gentoo-2-51aedd2ea97afedb2094d53725adaf8a5e1ec978.zip
Make imlib dep optional
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdegraphics/ChangeLog5
-rw-r--r--kde-base/kdegraphics/kdegraphics-3.3.0.ebuild11
2 files changed, 11 insertions, 5 deletions
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index b803ae09de49..96ceec94b9ac 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdegraphics
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.104 2004/08/30 15:45:01 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.105 2004/09/02 14:39:33 caleb Exp $
+
+ 02 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild:
+ Make imlib dep optional
30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
kdegraphics-3.1.5.ebuild, kdegraphics-3.2.1.ebuild,
diff --git a/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild b/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild
index 1ebc88517aae..e15dec50e30a 100644
--- a/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild,v 1.5 2004/08/30 15:45:01 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.0.ebuild,v 1.6 2004/09/02 14:39:33 caleb Exp $
inherit kde-dist eutils
DESCRIPTION="KDE graphics-related apps"
KEYWORDS="~x86 ~amd64 ppc64 ~sparc ppc"
-IUSE="gphoto2 tetex scanner opengl"
+IUSE="gphoto2 imlib opengl scanner tetex"
DEPEND="~kde-base/kdebase-${PV}
gphoto2? ( media-gfx/gphoto2 )
@@ -15,7 +15,7 @@ DEPEND="~kde-base/kdebase-${PV}
tetex? ( virtual/tetex )
dev-libs/fribidi
opengl? ( virtual/glut virtual/opengl )
- media-libs/imlib
+ imlib? ( media-libs/imlib )
virtual/ghostscript
media-libs/tiff
x86? ( scanner? sys-libs/libieee1284 )
@@ -39,6 +39,9 @@ src_compile() {
use scanner || DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
- myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
+ use imlib \
+ && myconf="$myconf --with-imlib --with-imlib-config=/usr/bin" \
+ || myconf="$myconf --without-imlib"
+
kde_src_compile
}