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 790CD1395E5 for ; Thu, 8 Dec 2016 08:31:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9548E21C039; Thu, 8 Dec 2016 08:31: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 60B1721C039 for ; Thu, 8 Dec 2016 08:31: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 4ADD4341265 for ; Thu, 8 Dec 2016 08:31:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD2AB24B0 for ; Thu, 8 Dec 2016 08:31:26 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1481185785.c865a0cd1076b830cc67e7788147ab19f61f8af2.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/calligra/calligra-3.0.0.ebuild app-office/calligra/calligra-9999.ebuild X-VCS-Directories: app-office/calligra/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: c865a0cd1076b830cc67e7788147ab19f61f8af2 X-VCS-Branch: master Date: Thu, 8 Dec 2016 08:31:26 +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: 574a26c3-f74e-471b-a7bc-bd74cff136e7 X-Archives-Hash: 53267fe8b48568810f348c056da1b78d commit: c865a0cd1076b830cc67e7788147ab19f61f8af2 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Dec 5 18:23:29 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Dec 8 08:29:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c865a0cd app-office/calligra: 3.0.0 version bump Closes: #840 Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber gentoo.org> .../{calligra-9999.ebuild => calligra-3.0.0.ebuild} | 15 +++++++-------- app-office/calligra/calligra-9999.ebuild | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-3.0.0.ebuild similarity index 93% copy from app-office/calligra/calligra-9999.ebuild copy to app-office/calligra/calligra-3.0.0.ebuild index d65e6b5..80da5d8 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-3.0.0.ebuild @@ -15,10 +15,10 @@ HOMEPAGE="http://www.calligra.org/" case ${PV} in 3.[0123456789].[789]?) # beta or rc releases - SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; + SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;; 3.[0123456789].?) # stable releases - SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz" esac LICENSE="GPL-2" @@ -26,8 +26,8 @@ LICENSE="GPL-2" [[ ${KDE_BUILD_TYPE} == release ]] && \ KEYWORDS="~amd64 ~x86" -CAL_FTS=( plan sheets words ) -CAL_EXP_FTS=( braindump karbon stage ) +CAL_FTS=( karbon plan sheets words ) +CAL_EXP_FTS=( braindump stage ) IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) @@ -35,6 +35,8 @@ IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble ok REQUIRED_USE="calligra_features_sheets? ( eigen )" +# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) +# Required for the matlab/octave formula tool # drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -134,13 +136,10 @@ DEPEND="${COMMON_DEPEND} vc? ( >=dev-libs/vc-1.1.0 ) " RDEPEND="${COMMON_DEPEND} - calligra_experimental_features_karbon? ( media-gfx/pstoedit[plotutils] ) + calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 " -#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)" -#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" - PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" ) pkg_pretend() { diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index d65e6b5..80da5d8 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -15,10 +15,10 @@ HOMEPAGE="http://www.calligra.org/" case ${PV} in 3.[0123456789].[789]?) # beta or rc releases - SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; + SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;; 3.[0123456789].?) # stable releases - SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz" esac LICENSE="GPL-2" @@ -26,8 +26,8 @@ LICENSE="GPL-2" [[ ${KDE_BUILD_TYPE} == release ]] && \ KEYWORDS="~amd64 ~x86" -CAL_FTS=( plan sheets words ) -CAL_EXP_FTS=( braindump karbon stage ) +CAL_FTS=( karbon plan sheets words ) +CAL_EXP_FTS=( braindump stage ) IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) @@ -35,6 +35,8 @@ IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble ok REQUIRED_USE="calligra_features_sheets? ( eigen )" +# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) +# Required for the matlab/octave formula tool # drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -134,13 +136,10 @@ DEPEND="${COMMON_DEPEND} vc? ( >=dev-libs/vc-1.1.0 ) " RDEPEND="${COMMON_DEPEND} - calligra_experimental_features_karbon? ( media-gfx/pstoedit[plotutils] ) + calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 " -#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)" -#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" - PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" ) pkg_pretend() {