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 3E1FA138334 for ; Tue, 1 Jan 2019 21:46:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37FB4E0CBB; Tue, 1 Jan 2019 21:46:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00915E0CBB for ; Tue, 1 Jan 2019 21:46:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F3B0335CEF for ; Tue, 1 Jan 2019 21:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D49BB502 for ; Tue, 1 Jan 2019 21:46:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1546379139.db2cde57c5d6e41198378844df710f64bcf6c435.asturm@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 X-VCS-Directories: app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: db2cde57c5d6e41198378844df710f64bcf6c435 X-VCS-Branch: master Date: Tue, 1 Jan 2019 21:46:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 119f86ef-30ae-45ff-84cf-5b16d759042c X-Archives-Hash: f511847a78c7d8a41ae95ed2d35b45b0 commit: db2cde57c5d6e41198378844df710f64bcf6c435 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 1 17:28:56 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 1 21:45:39 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=db2cde57 app-office/calligra: Move stage into CALLIGRA_FEATURES Simplifies ebuild. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-9999.ebuild | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 1c65c68094..f2912e9e58 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -16,12 +16,11 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -CAL_FTS=( karbon sheets words ) +CAL_FTS=( karbon sheets stage words ) LICENSE="GPL-2" IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf - phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) - calligra_experimental_features_stage" + phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) # Required for the matlab/octave formula tool @@ -95,13 +94,11 @@ COMMON_DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libX11 ) - calligra_experimental_features_stage? ( - okular? ( $(add_kdeapps_dep okular) ) - ) calligra_features_sheets? ( dev-cpp/eigen:3 dev-libs/kdiagram:5 ) + calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) ) calligra_features_words? ( dev-libs/libxslt okular? ( $(add_kdeapps_dep okular) ) @@ -149,7 +146,7 @@ src_prepare() { extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" fi - if use okular && ! use calligra_experimental_features_stage; then + 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 @@ -163,8 +160,6 @@ src_configure() { use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) done - use calligra_experimental_features_stage && myproducts+=( STAGE ) - use lcms && myproducts+=( PLUGIN_COLORENGINES ) use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) @@ -193,7 +188,7 @@ src_configure() { -DWITH_OpenEXR=$(usex openexr) -DWITH_Poppler=$(usex pdf) -DWITH_Eigen3=$(usex calligra_features_sheets) - -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) + -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) -ENABLE_CSTESTER_TESTING=$(usex test) -DWITH_Freetype=$(usex truetype) )