scarabeus    09/03/15 14:18:07

  Modified:             ChangeLog gwenview-4.2.1-r1.ebuild
  Log:
  Automatic-merge: merge updates for 4.2.1 from kde-testing.
  (Portage version: 2.2_rc25/cvs/Linux x86_64)

Revision  Changes    Path
1.24                 kde-base/gwenview/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	8 Mar 2009 18:55:28 -0000	1.23
+++ ChangeLog	15 Mar 2009 14:18:07 -0000	1.24
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/gwenview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.23 2009/03/08 18:55:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/ChangeLog,v 1.24 2009/03/15 14:18:07 scarabeus Exp $
+
+  15 Mar 2009; Tomas Chvatal <scarabeus@g.o>
+  gwenview-4.2.1-r1.ebuild:
+  Automatic-merge: merge updates for 4.2.1 from kde-testing.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@g.o> -gwenview-4.2.0.ebuild:
   Drop KDE 4.2.0



1.2                  kde-base/gwenview/gwenview-4.2.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild?r1=1.1&r2=1.2

Index: gwenview-4.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwenview-4.2.1-r1.ebuild	6 Mar 2009 01:16:28 -0000	1.1
+++ gwenview-4.2.1-r1.ebuild	15 Mar 2009 14:18:07 -0000	1.2
@@ -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/gwenview/gwenview-4.2.1-r1.ebuild,v 1.1 2009/03/06 01:16:28 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild,v 1.2 2009/03/15 14:18:07 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,11 +15,12 @@
 DEPEND="
 	media-gfx/exiv2
 	media-libs/jpeg
-	kipi? ( >=kde-base/libkipi-${PV}:${SLOT} )
-	>=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop?]
+	kipi? ( >=kde-base/libkipi-${PV}:${SLOT}[kdeprefix=] )
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
 "
-
-RDEPEND="${DEPEND}"
 
 PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${KDEDIR}/$(get_libdir)/pkgconfig"