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 1848959CA3 for ; Sun, 14 Feb 2016 15:28:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C65921C00B; Sun, 14 Feb 2016 15:28:43 +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 5CD1A21C010 for ; Sun, 14 Feb 2016 15:28:42 +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 67D5A340B6C for ; Sun, 14 Feb 2016 15:28:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6204B15DF for ; Sun, 14 Feb 2016 15:28:37 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1455413899.67e6f29cf44b13abfee0a7fed8c3fabf0862aa36.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdepim/kdepim-15.12.1-r1.ebuild kde-apps/kdepim/kdepim-15.12.1.ebuild kde-apps/kdepim/kdepim-15.12.49.9999.ebuild kde-apps/kdepim/kdepim-9999.ebuild X-VCS-Directories: kde-apps/kdepim/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 67e6f29cf44b13abfee0a7fed8c3fabf0862aa36 X-VCS-Branch: master Date: Sun, 14 Feb 2016 15:28:37 +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: 992e3c60-1cbf-43cc-90f5-aa53ebea1b0d X-Archives-Hash: 81de29635022060a54dc13adeb9f6d9c commit: 67e6f29cf44b13abfee0a7fed8c3fabf0862aa36 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Feb 13 22:41:53 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Feb 14 01:38:19 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=67e6f29c kde-apps/kdepim: Split out kdepim-icons Package-Manager: portage-2.2.27 ...depim-15.12.1.ebuild => kdepim-15.12.1-r1.ebuild} | 4 +++- kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 20 +++++++++++--------- kde-apps/kdepim/kdepim-9999.ebuild | 1 - 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/kde-apps/kdepim/kdepim-15.12.1.ebuild b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild similarity index 99% rename from kde-apps/kdepim/kdepim-15.12.1.ebuild rename to kde-apps/kdepim/kdepim-15.12.1-r1.ebuild index a7a0bdc..23a0f8d 100644 --- a/kde-apps/kdepim/kdepim-15.12.1.ebuild +++ b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild @@ -140,7 +140,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 - !kde-apps/kdepim-icons:4 !kde-apps/kdepim-runtime:4 !kde-apps/kjots:4 !kde-apps/kleopatra:4 @@ -168,6 +167,7 @@ src_prepare() { composereditor-ng \ eventviews \ grantleetheme \ + icons \ incidenceeditor-ng \ kaddressbookgrantlee \ kdgantt2 \ @@ -189,6 +189,8 @@ src_prepare() { templateparser \ || die "Failed to remove split libraries" + comment_add_subdirectory icons + use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ -i CMakeLists.txt || die diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild index e8ed99c..c6a75ab 100644 --- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild +++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -KDE_HANDBOOK=true -KDE_TEST=true +KDE_HANDBOOK="true" +KDE_TEST="true" VIRTUALX_REQUIRED="test" inherit kde5 @@ -96,10 +96,6 @@ COMMON_DEPEND=" $(add_kdeapps_dep pimcommon) $(add_kdeapps_dep syndication) $(add_kdeapps_dep templateparser) - >=app-crypt/gpgme-1.3.2 - dev-libs/boost:= - dev-libs/grantlee:5 - dev-libs/libxslt $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) @@ -111,6 +107,10 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) + >=app-crypt/gpgme-1.3.2 + dev-libs/boost:= + dev-libs/grantlee:5 + dev-libs/libxslt media-libs/phonon[qt5] designer? ( $(add_qt_dep designer) ) google? ( net-libs/libkgapi:5 ) @@ -140,7 +140,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 - !kde-apps/kdepim-icons:4 !kde-apps/kdepim-runtime:4 !kde-apps/kjots:4 !kde-apps/kleopatra:4 @@ -168,6 +167,7 @@ src_prepare() { composereditor-ng \ eventviews \ grantleetheme \ + icons \ incidenceeditor-ng \ kaddressbookgrantlee \ kdgantt2 \ @@ -189,6 +189,8 @@ src_prepare() { templateparser \ || die "Failed to remove split libraries" + cmake_comment_add_subdirectory icons + use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ -i CMakeLists.txt || die @@ -203,7 +205,7 @@ src_prepare() { # applications for pim_ft in ${PIM_FTS}; do - use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft} + use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft} done } diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index dcf477b..f79b3ab 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -124,7 +124,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 - !kde-apps/kdepim-icons:4 !kde-apps/kdepim-runtime:4 !kde-apps/kjots:4 !kde-apps/kmail:4