[gentoo-commits] proj/kde:master commit in: kde-base/kdepim-runtime/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     e32df3e9599482a5c6d47ed95a1455e7f24bd661
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Jun 19 19:58:46 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 19:58:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e32df3e9

[kde-base/kdepim-runtime] Needs libkgapi now, has been added to main tree

(Portage version: 2.2.0_alpha110/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 .../kdepim-runtime/kdepim-runtime-4.8.90.ebuild    |    7 ++++---
 kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.8.90.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.8.90.ebuild
index 5ebd2b0..57a3575 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.8.90.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.8.90.ebuild
@@ -24,17 +24,18 @@ DEPEND="
 	>=dev-libs/shared-desktop-ontologies-0.10.0
 	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	x11-misc/shared-mime-info
-	google? ( net-libs/libkgoogle[-oldpim] )
+	google? ( >=net-libs/libkgapi-0.4.0[-oldpim] )
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-icons)
+	!kde-misc/akonadi-google
 "
 
 # nepomuk_email_feeder moved here in 4.8
 add_blocker kdepim-common-libs 4.7.50
 
 src_prepare() {
-	sed -e "s:find_package(LibKGoogle):macro_optional_find_package(LibKGoogle):g" \
+	sed -e "s:find_package(LibKGAPI QUIET NO_MODULE):macro_optional_find_package(LibKGAPI):g" \
 	    -i "${S}/CMakeLists.txt" || die "fixing automagic dependencies failed"
 
 	kde4-base_src_prepare
@@ -42,7 +43,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with google LibKGoogle)
+		$(cmake-utils_use_with google LibKGAPI)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
index 8a09475..371069c 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -24,17 +24,18 @@ DEPEND="
 	>=dev-libs/shared-desktop-ontologies-0.10.0
 	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	x11-misc/shared-mime-info
-	google? ( net-libs/libkgoogle[-oldpim] )
+	google? ( >=net-libs/libkgapi-0.4.0[-oldpim] )
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-icons)
+	!kde-misc/akonadi-google
 "
 
 # nepomuk_email_feeder moved here in 4.8
 add_blocker kdepim-common-libs 4.7.50
 
 src_prepare() {
-	sed -e "s:find_package(LibKGoogle):macro_optional_find_package(LibKGoogle):g" \
+	sed -e "s:find_package(LibKGAPI QUIET NO_MODULE):macro_optional_find_package(LibKGAPI):g" \
 	    -i "${S}/CMakeLists.txt" || die "fixing automagic dependencies failed"
 
 	kde4-base_src_prepare
@@ -42,7 +43,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with google LibKGoogle)
+		$(cmake-utils_use_with google LibKGAPI)
 	)
 
 	kde4-base_src_configure