commit: 672b717433bdc954ce415bf3279e993deaab840a Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Feb 3 00:09:31 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Feb 9 10:55:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=672b7174
kde-apps/kdepim: Drop kleopatra from build Package-Manager: portage-2.2.27 kde-apps/kdepim/kdepim-9999.ebuild | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index b3b0bb8..dcf477b 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -2,10 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -KDE_HANDBOOK=true -KDE_TEST=true +FRAMEWORKS_MINIMAL="5.19.0" +KDE_HANDBOOK="true" +KDE_TEST="true" VIRTUALX_REQUIRED="test" inherit kde5 @@ -13,7 +14,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" +PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kmail knotes kontact korganizer ktnef" IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})" COMMON_DEPEND=" @@ -87,10 +88,6 @@ COMMON_DEPEND=" $(add_kdeapps_dep messagelib) $(add_kdeapps_dep pimcommon) $(add_kdeapps_dep syndication) - >=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) @@ -102,14 +99,13 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) + dev-libs/boost:= + dev-libs/grantlee:5 + dev-libs/libxslt media-libs/phonon[qt5] designer? ( $(add_qt_dep designer) ) google? ( net-libs/libkgapi:5 ) prison? ( media-libs/prison:5 ) - kdepim_features_kleopatra? ( - dev-libs/libassuan - dev-libs/libgpg-error - ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext @@ -131,7 +127,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-icons:4 !kde-apps/kdepim-runtime:4 !kde-apps/kjots:4 - !kde-apps/kleopatra:4 !kde-apps/kmail:4 !kde-apps/knode:4 !kde-apps/knotes:4 @@ -141,7 +136,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/ktimetracker:4 !kde-apps/ktnef:4 $(add_kdeapps_dep kdepim-runtime) - kdepim_features_kleopatra? ( app-crypt/gnupg ) " # kontact: summary plugin; kalarm: email scheduler REQUIRED_USE=" @@ -152,12 +146,15 @@ 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 # 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 }
