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 6D66D1388BF for ; Thu, 18 Feb 2016 14:44:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E92121C00E; Thu, 18 Feb 2016 14:44: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 7201B21C00D for ; Thu, 18 Feb 2016 14:44: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 5478C33FE7D for ; Thu, 18 Feb 2016 14:44:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 266AE15FB for ; Thu, 18 Feb 2016 14:44:39 +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: <1455805436.c798f38f62ace521936fd58108931ce26dcf0b9d.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.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: c798f38f62ace521936fd58108931ce26dcf0b9d X-VCS-Branch: master Date: Thu, 18 Feb 2016 14:44:39 +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: 002bde8b-9774-4536-b180-2c5a705ee366 X-Archives-Hash: 7dbdf7c8ad686310fffb712e56aed6dc commit: c798f38f62ace521936fd58108931ce26dcf0b9d Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Feb 14 20:08:11 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Feb 18 14:23:56 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c798f38f kde-apps/kdepim: Drop split out KDEPIM_FEATURES Namely: akonadiconsole, akregator, blogilo, console, kaddressbook, knotes, ktnef Package-Manager: portage-2.2.27 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 82 ++++++++--------------------- kde-apps/kdepim/kdepim-9999.ebuild | 40 ++++++-------- 2 files changed, 38 insertions(+), 84 deletions(-) diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild index c0f103f..16b4f32 100644 --- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild +++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild @@ -4,7 +4,12 @@ EAPI=6 +PIM_FTS="kalarm kleopatra kmail kontact korganizer" + KDE_HANDBOOK="true" +KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor importwizard korgac +mboximporter pimsettingexporter plugins sieveeditor storageservicemanager" +KDE_PIM_KONTACTPLUGIN="true" KDE_TEST="true" VIRTUALX_REQUIRED="test" inherit kde5 @@ -13,8 +18,7 @@ DESCRIPTION="Personal Information Management Suite" HOMEPAGE="https://www.kde.org/applications/office/kontact/" KEYWORDS="" -PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef" -IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})" +IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -59,12 +63,10 @@ COMMON_DEPEND=" $(add_kdeapps_dep calendarsupport) $(add_kdeapps_dep composereditor) $(add_kdeapps_dep eventviews) - $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep grantleetheme) $(add_kdeapps_dep incidenceeditor) $(add_kdeapps_dep kaddressbookgrantlee) $(add_kdeapps_dep kalarmcal) - $(add_kdeapps_dep kblog) $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kdepim-kioslaves) @@ -78,13 +80,11 @@ COMMON_DEPEND=" $(add_kdeapps_dep kmime) $(add_kdeapps_dep kontactinterface) $(add_kdeapps_dep kpimtextedit) - $(add_kdeapps_dep ktnef) $(add_kdeapps_dep libakonadi) $(add_kdeapps_dep libfollowupreminder) $(add_kdeapps_dep libgravatar) $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep libkdepimdbusinterfaces) - $(add_kdeapps_dep libkleo) $(add_kdeapps_dep libksieve) $(add_kdeapps_dep libsendlater) $(add_kdeapps_dep mailcommon) @@ -107,20 +107,17 @@ 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] - google? ( net-libs/libkgapi:5 ) - prison? ( media-libs/prison:5 ) kdepim_features_kleopatra? ( + $(add_kdeapps_dep gpgmepp) + $(add_kdeapps_dep libkleo) + >=app-crypt/gpgme-1.3.2 dev-libs/libassuan dev-libs/libgpg-error ) - kdepim_features_knotes? ( - $(add_kdeapps_dep noteshared) - ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext @@ -131,12 +128,7 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} - !kde-apps/akonadiconsole:4 - !kde-apps/akregator:4 - !kde-apps/blogilo:4 - !kde-apps/calendarjanitor:4 !kde-apps/kabcclient:4 - !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-runtime:4 @@ -144,12 +136,9 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kleopatra:4 !kde-apps/kmail:4 !kde-apps/knode:4 - !kde-apps/knotes:4 - !kde-apps/konsolekalendar:4 !kde-apps/kontact:4 !kde-apps/korganizer:4 !kde-apps/ktimetracker:4 - !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) kdepim_features_kleopatra? ( app-crypt/gnupg ) " @@ -162,45 +151,18 @@ REQUIRED_USE=" src_prepare() { kde5_src_prepare - rm -r calendarsupport \ - composereditor-ng \ - eventviews \ - grantleetheme \ - icons \ - incidenceeditor-ng \ - kaddressbookgrantlee \ - kdgantt2 \ - libfollowupreminder \ - libgravatar \ - libkdepim \ - libkdepimdbusinterfaces \ - libkleo \ - libksieve \ - libsendlater \ - mailcommon \ - mailimporter \ - messagecomposer \ - messagecore \ - messagelist \ - messageviewer \ - noteshared \ - pimcommon \ - templateparser \ - || die "Failed to remove split libraries" - - cmake_comment_add_subdirectory icons - - use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ - -i CMakeLists.txt || die + rm -r agents/notesagent || die "Failed to remove split notesagent" + sed -e '/add_subdirectory(notesagent)/ s/^/#DONT/' \ + -i agents/CMakeLists.txt || die - if ! use kdepim_features_knotes ; then - sed -i \ - -e '/find_package(KF5NoteShared/ s/^/#DONT/' \ - CMakeLists.txt || die - sed -i \ - -e '/add_subdirectory(notesagent)/ s/^/#DONT/' \ - agents/CMakeLists.txt || die - fi + sed -i \ + -e "/akregator/ s/^/#DONT/" \ + -e "/blogilo/ s/^/#DONT/" \ + -e "/kleopatra/ s/^/#DONT/" \ + -e "/knotes/ s/^/#DONT/" \ + -e "/konsolekalendar/ s/^/#DONT/" \ + -e "/ktnef/ s/^/#DONT/" \ + doc/CMakeLists.txt || die "Failed to disable split docs" # applications for pim_ft in ${PIM_FTS}; do @@ -211,9 +173,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON - $(cmake-utils_use_find_package google KF5GAPI) - $(cmake-utils_use_find_package prison KF5Prison) ) kde5_src_configure diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index 60a099f..b511cb0 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -4,8 +4,13 @@ EAPI=6 +PIM_FTS="kalarm kmail kontact korganizer" + FRAMEWORKS_MINIMAL="5.19.0" KDE_HANDBOOK="true" +KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor importwizard korgac +mboximporter pimsettingexporter plugins sieveeditor storageservicemanager" +KDE_PIM_KONTACTPLUGIN="true" KDE_TEST="true" VIRTUALX_REQUIRED="test" inherit kde5 @@ -14,8 +19,7 @@ DESCRIPTION="Personal Information Management Suite" HOMEPAGE="https://www.kde.org/applications/office/kontact/" KEYWORDS="" -PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kmail knotes kontact korganizer ktnef" -IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})" +IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -59,11 +63,9 @@ COMMON_DEPEND=" $(add_kdeapps_dep akonadi-socialutils) $(add_kdeapps_dep calendarsupport) $(add_kdeapps_dep eventviews) - $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep grantleetheme) $(add_kdeapps_dep incidenceeditor) $(add_kdeapps_dep kalarmcal) - $(add_kdeapps_dep kblog) $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kdepim-apps-libs) @@ -78,10 +80,8 @@ COMMON_DEPEND=" $(add_kdeapps_dep kmime) $(add_kdeapps_dep kontactinterface) $(add_kdeapps_dep kpimtextedit) - $(add_kdeapps_dep ktnef) $(add_kdeapps_dep libgravatar) $(add_kdeapps_dep libkdepim) - $(add_kdeapps_dep libkleo) $(add_kdeapps_dep libksieve) $(add_kdeapps_dep mailcommon) $(add_kdeapps_dep mailimporter) @@ -103,8 +103,6 @@ COMMON_DEPEND=" dev-libs/grantlee:5 dev-libs/libxslt media-libs/phonon[qt5] - google? ( net-libs/libkgapi:5 ) - prison? ( media-libs/prison:5 ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext @@ -114,25 +112,16 @@ DEPEND="${COMMON_DEPEND} ) " RDEPEND="${COMMON_DEPEND} - !kde-apps/noteshared - !kde-apps/akonadiconsole:4 - !kde-apps/akregator:4 - !kde-apps/blogilo:4 - !kde-apps/calendarjanitor:4 !kde-apps/kabcclient:4 - !kde-apps/kaddressbook:4 !kde-apps/kalarm:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-runtime:4 !kde-apps/kjots:4 !kde-apps/kmail:4 !kde-apps/knode:4 - !kde-apps/knotes:4 - !kde-apps/konsolekalendar:4 !kde-apps/kontact:4 !kde-apps/korganizer:4 !kde-apps/ktimetracker:4 - !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) " # kontact: summary plugin; kalarm: email scheduler @@ -144,11 +133,14 @@ REQUIRED_USE=" src_prepare() { kde5_src_prepare - rm -r kleopatra || die "Failed to remove kleopatra subdirectory" - cmake_comment_add_subdirectory kleopatra - - use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ - -i CMakeLists.txt || die + sed -i \ + -e "/akregator/ s/^/#DONT/" \ + -e "/blogilo/ s/^/#DONT/" \ + -e "/kleopatra/ s/^/#DONT/" \ + -e "/knotes/ s/^/#DONT/" \ + -e "/konsolekalendar/ s/^/#DONT/" \ + -e "/ktnef/ s/^/#DONT/" \ + doc/CMakeLists.txt || die "Failed to disable split docs" # applications for pim_ft in ${PIM_FTS}; do @@ -158,9 +150,9 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON - $(cmake-utils_use_find_package google KF5GAPI) - $(cmake-utils_use_find_package prison KF5Prison) ) kde5_src_configure