From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6778313832E for ; Sat, 20 Aug 2016 17:22:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F077E0B1F; Sat, 20 Aug 2016 17:22:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 144B0E0B1F for ; Sat, 20 Aug 2016 17:22:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C030B3405BB for ; Sat, 20 Aug 2016 17:22:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC7432455 for ; Sat, 20 Aug 2016 17:22:24 +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: <1471713736.076dffa869ba6536e223556755ebddf0e631d394.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-9999.ebuild app-office/calligra/metadata.xml X-VCS-Directories: app-office/calligra/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 076dffa869ba6536e223556755ebddf0e631d394 X-VCS-Branch: master Date: Sat, 20 Aug 2016 17:22:24 +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: e274cde5-8008-4b05-b91f-206f35c112fc X-Archives-Hash: 4ee2dbfdf45bced48e42c6ec39e7a255 commit: 076dffa869ba6536e223556755ebddf0e631d394 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Aug 20 10:21:44 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 20 17:22:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=076dffa8 app-office/calligra: Fix DEPENDs, drop unported CALLIGRA_FEATURES Gentoo-bug: 589358 Package-Manager: portage-2.2.28 app-office/calligra/calligra-9999.ebuild | 69 ++++++++++++++++++++------------ app-office/calligra/metadata.xml | 3 +- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 84ff3bd..fa80431 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -26,11 +26,11 @@ LICENSE="GPL-2" [[ ${KDE_BUILD_TYPE} == release ]] && \ KEYWORDS="~amd64 ~x86" -IUSE="activities +crypt +eigen +fontconfig +glib gsl import-filter +lcms kdepim - marble okular openexr opengl +pdf spacenav +threads +truetype vc +xml X" +IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms kdepim + marble okular openexr +pdf spacenav +truetype vc +webkit +xml X" # Don't use Active, it's broken on desktops. -CAL_FTS="author braindump flow gemini karbon plan sheets stage words" +CAL_FTS="author braindump karbon plan sheets stage words" for cal_ft in ${CAL_FTS}; do IUSE+=" calligra_features_${cal_ft}" done @@ -38,15 +38,11 @@ unset cal_ft REQUIRED_USE=" calligra_features_author? ( calligra_features_words ) - calligra_features_gemini? ( opengl ) calligra_features_sheets? ( eigen ) + calligra_features_stage? ( webkit ) test? ( calligra_features_karbon ) " -# calligra_features_gemini ( -# dev-libs/libgit2 -# dev-libs/libqgit2 # needs porting (currently doesn't build) -# ) # drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -97,7 +93,6 @@ COMMON_DEPEND=" crypt? ( app-crypt/qca:2[qt5] ) eigen? ( dev-cpp/eigen:3 ) fontconfig? ( media-libs/fontconfig ) - glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) import-filter? ( $(add_frameworks_dep khtml) @@ -111,23 +106,17 @@ COMMON_DEPEND=" ) lcms? ( media-libs/lcms:2 ) marble? ( $(add_kdeapps_dep marble) ) - okular? ( $(add_kdeapps_dep okular) ) - opengl? ( $(add_qt_dep qtopengl) ) openexr? ( media-libs/openexr ) - pdf? ( - app-text/poppler:= - media-gfx/pstoedit - ) + pdf? ( app-text/poppler:=[qt5] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) - vc? ( dev-libs/vc ) X? ( $(add_qt_dep qtx11extras) x11-libs/libX11 ) + calligra_features_braindump? ( webkit? ( $(add_qt_dep qtwebkit) ) ) calligra_features_plan? ( $(add_qt_dep qtcore '' '' '5=') - $(add_frameworks_dep kdelibs4support) $(add_kdeapps_dep kdiagram) $(add_kdeapps_dep kproperty) $(add_kdeapps_dep kreport) @@ -139,14 +128,22 @@ COMMON_DEPEND=" $(add_kdeapps_dep kdgantt2) ) ) - calligra_features_sheets? ( $(add_frameworks_dep kdelibs4support) ) - calligra_features_words? ( dev-libs/libxslt ) + calligra_features_stage? ( + $(add_qt_dep qtwebkit) + okular? ( $(add_kdeapps_dep okular) ) + ) + calligra_features_words? ( + dev-libs/libxslt + okular? ( $(add_kdeapps_dep okular) ) + ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext x11-misc/shared-mime-info + vc? ( >=dev-libs/vc-1.1.0 ) " RDEPEND="${COMMON_DEPEND} + calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 " @@ -162,6 +159,30 @@ pkg_setup() { check-reqs_pkg_setup } +src_prepare() { + kde5_src_prepare + + # Unconditionally disable deprecated deps (required by QtQuick1) + punt_bogus_dep Qt5 Declarative + punt_bogus_dep Qt5 OpenGL + + if ! use webkit; then + punt_bogus_dep Qt5 WebKitWidgets + punt_bogus_dep Qt5 WebKit + fi + + # Hack around the excessive use of CMake macros + if use okular && ! use calligra_features_words; then + sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ + extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" + fi + + if use okular && ! use calligra_features_stage; then + sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ + extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" + fi +} + src_configure() { local cal_ft myproducts @@ -181,7 +202,6 @@ src_configure() { -DWITH_Qca-qt5=$(usex crypt) -DWITH_Eigen3=$(usex eigen) -DWITH_Fontconfig=$(usex fontconfig) - -DWITH_GLIB2=$(usex glib) -DWITH_GSL=$(usex gsl) -DWITH_LibEtonyek=$(usex import-filter) -DWITH_LibOdfGen=$(usex import-filter) @@ -197,16 +217,15 @@ src_configure() { $(cmake-utils_use_find_package kdepim KGantt) -DWITH_LCMS2=$(usex lcms) -DWITH_CalligraMarble=$(usex marble) - -DWITH_Okular=$(usex okular) + -DWITH_Okular5=$(usex okular) -DWITH_OpenEXR=$(usex openexr) - -DUSEOPENGL=$(usex opengl) -DWITH_Poppler=$(usex pdf) - -DWITH_Pstoedit=$(usex pdf) -DWITH_Spnav=$(usex spacenav) - -DBUILD_cstester=$(usex test) - -DWITH_Threads=$(usex threads) + -ENABLE_CSTESTER_TESTING=$(usex test) -DWITH_Freetype=$(usex truetype) -DWITH_Vc=$(usex vc) + -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON ) kde5_src_configure diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index e40c4ea..bf486c6 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -12,12 +12,11 @@ Enable kactivities support Enable dev-cpp/eigen mathematical templates support - Enable support for C library routines from dev-libs/glib Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote Enable support for KDEPIM resources integration Enable displaying of maps using Marble Enable bindings for kde-apps/okular Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav - Enable support for dev-libs/vc, could be a significant speed boost on krita + Build with dev-libs/vc, could be a significant speed boost