From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D8A5E1384AE for ; Sat, 19 Sep 2015 20:01:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 583B8E0879; Sat, 19 Sep 2015 20:01:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFB0FE0879 for ; Sat, 19 Sep 2015 20:01:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C865D340634 for ; Sat, 19 Sep 2015 20:01:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E56A818C for ; Sat, 19 Sep 2015 20:01:25 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1442692856.b00082619558b9f98dbf506abbcec1c61b6bb2b6.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch media-plugins/kipi-plugins/kipi-plugins-9999.ebuild X-VCS-Directories: media-plugins/kipi-plugins/ media-plugins/kipi-plugins/files/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: b00082619558b9f98dbf506abbcec1c61b6bb2b6 X-VCS-Branch: master Date: Sat, 19 Sep 2015 20:01:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5cd20de9-4c49-4637-94d3-e58fa41c960a X-Archives-Hash: 483bb3e8d05819c1a44d5e6d151e52ba commit: b00082619558b9f98dbf506abbcec1c61b6bb2b6 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Sep 19 17:12:12 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 20:00:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0008261 media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch Package-Manager: portage-2.2.20.1 .../kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch | 9 ++++----- media-plugins/kipi-plugins/kipi-plugins-9999.ebuild | 5 ----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch index d548f34..2293826 100644 --- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch +++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch @@ -1,14 +1,13 @@ --- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200 +++ b/CMakeLists.txt 2015-09-15 19:07:39.000000000 +0200 -@@ -310,7 +310,10 @@ +@@ -310,7 +310,9 @@ add_subdirectory(kmlexport) add_subdirectory(sendimages) add_subdirectory(flashexport) - add_subdirectory(expoblending) -+ + if(ENABLE_expoblending) + add_subdirectory(expoblending) + endif() - - if(BUILD_VIEWERS) - add_subdirectory(advancedslideshow) + add_subdirectory(flickr) + add_subdirectory(smug) + add_subdirectory(imageshack) diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild index c78bc7c..cba7fba 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild @@ -80,10 +80,6 @@ COMMONDEPEND=" media-libs/tiff:0 virtual/jpeg:0 calendar? ( $(add_kdeapps_dep kcalcore) ) - geolocator? ( - $(add_frameworks_dep kbookmarks) - $(add_kdeapps_dep libkgeomap) - ) mediawiki? ( net-libs/libmediawiki:5 ) opengl? ( dev-qt/qtopengl:5 @@ -127,7 +123,6 @@ src_prepare() { sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die } - undetect_lib geolocator KGEOMAP undetect_lib mediawiki undetect_lib vkontakte KVKONTAKTE