summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:18:01 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-08 14:18:01 +0000
commite919249dee289e9d703615b4ec52a95981d8be25 (patch)
tree64ef3cb8686536e29a75ab1378b72db023b43a23 /kde-base/nepomuk
parentSemi-automatic merge, Update deps. (diff)
downloadgentoo-2-e919249dee289e9d703615b4ec52a95981d8be25.tar.gz
gentoo-2-e919249dee289e9d703615b4ec52a95981d8be25.tar.bz2
gentoo-2-e919249dee289e9d703615b4ec52a95981d8be25.zip
Semi-automatic merge, Update deps.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'kde-base/nepomuk')
-rw-r--r--kde-base/nepomuk/ChangeLog5
-rw-r--r--kde-base/nepomuk/nepomuk-4.2.1.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index 83b778621f69..de924ffad0b0 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/nepomuk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.21 2009/03/04 22:48:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/ChangeLog,v 1.22 2009/03/08 14:18:01 scarabeus Exp $
+
+ 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> nepomuk-4.2.1.ebuild:
+ Semi-automatic merge, Update deps.
*nepomuk-4.2.1 (04 Mar 2009)
diff --git a/kde-base/nepomuk/nepomuk-4.2.1.ebuild b/kde-base/nepomuk/nepomuk-4.2.1.ebuild
index 30f231d680e8..b35451c042bb 100644
--- a/kde-base/nepomuk/nepomuk-4.2.1.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.2.1.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/nepomuk/nepomuk-4.2.1.ebuild,v 1.1 2009/03/04 22:48:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nepomuk/nepomuk-4.2.1.ebuild,v 1.2 2009/03/08 14:18:01 scarabeus Exp $
EAPI="2"
@@ -12,7 +12,10 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug"
DEPEND="
- dev-libs/soprano[clucene]
- >=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop]
+ || (
+ dev-libs/soprano[clucene,redland]
+ dev-libs/soprano[clucene,sesame2]
+ )
+ >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop]
"
RDEPEND="${DEPEND}"