summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-12-22 23:36:27 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-12-22 23:36:27 +0000
commitb461d9eac3ba90f719d56514570c13167b7f380c (patch)
tree5d3b2af3e82d5aaa919640048b879b29d7db9c93 /kde-base/kdebase-kioslaves
parentMask libnemesi (unfetchable). (diff)
downloadhistorical-b461d9eac3ba90f719d56514570c13167b7f380c.tar.gz
historical-b461d9eac3ba90f719d56514570c13167b7f380c.tar.bz2
historical-b461d9eac3ba90f719d56514570c13167b7f380c.zip
Pull in changes from overlay and prefix support
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base/kdebase-kioslaves')
-rw-r--r--kde-base/kdebase-kioslaves/ChangeLog6
-rw-r--r--kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild17
2 files changed, 16 insertions, 7 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 308b566b1342..2330eb9c78a8 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdebase-kioslaves
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.178 2009/12/11 17:08:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.179 2009/12/22 23:36:27 abcd Exp $
+
+ 22 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+ kdebase-kioslaves-4.3.4.ebuild:
+ Pull in changes from overlay and prefix support
11 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-kdebase-kioslaves-4.3.3-r1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild
index 4b18231f5dda..cb17cdd98d63 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild,v 1.1 2009/12/01 10:16:56 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.3.4.ebuild,v 1.2 2009/12/22 23:36:27 abcd Exp $
EAPI="2"
@@ -16,17 +16,22 @@ IUSE="+bzip2 debug lzma +handbook openexr samba"
RESTRICT="test"
DEPEND="
- x11-libs/libXcursor
+ !aqua? ( x11-libs/libXcursor )
bzip2? ( app-arch/bzip2 )
lzma? ( app-arch/xz-utils )
openexr? ( media-libs/openexr )
- samba? ( || ( net-fs/samba >=net-fs/samba-libs-3.4[smbclient] ) )
+ samba? (
+ || (
+ net-fs/samba
+ >=net-fs/samba-libs-3.4[smbclient]
+ )
+ )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
$(add_kdebase_dep kdialog)
- virtual/eject
virtual/ssh
+ !aqua? ( !kernel_SunOS? ( virtual/eject ) )
"
KMEXTRA="
@@ -35,12 +40,12 @@ KMEXTRA="
"
src_configure() {
- mycmakeargs="${mycmakeargs}
+ mycmakeargs=(
$(cmake-utils_use_with bzip2 BZip2)
$(cmake-utils_use_with lzma LibLZMA)
$(cmake-utils_use_with openexr OpenEXR)
$(cmake-utils_use_with samba)
- "
+ )
kde4-meta_src_configure
}