public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligra/
Date: Thu,  8 Dec 2016 08:31:26 +0000 (UTC)	[thread overview]
Message-ID: <1481185785.c865a0cd1076b830cc67e7788147ab19f61f8af2.johu@gentoo> (raw)

commit:     c865a0cd1076b830cc67e7788147ab19f61f8af2
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 18:23:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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 <johu <AT> 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() {


             reply	other threads:[~2016-12-08  8:31 UTC|newest]

Thread overview: 104+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-08  8:31 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-18 22:01 [gentoo-commits] proj/kde:master commit in: app-office/calligra/ Andreas Sturmlechner
2025-03-30 19:15 Andreas Sturmlechner
2025-02-12 17:10 Andreas Sturmlechner
2025-02-12 17:06 Andreas Sturmlechner
2025-02-12 17:06 Andreas Sturmlechner
2024-09-19 18:50 Andreas Sturmlechner
2024-09-09 18:34 Andreas Sturmlechner
2024-09-09 18:34 Andreas Sturmlechner
2024-08-11  6:58 Andreas Sturmlechner
2024-03-11  9:55 Andreas Sturmlechner
2023-03-31 19:11 Andreas Sturmlechner
2023-03-31 19:11 Andreas Sturmlechner
2022-10-11 15:18 Andreas Sturmlechner
2022-10-06  9:02 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-12-20 13:24 Andreas Sturmlechner
2021-07-22 20:12 Andreas Sturmlechner
2021-05-14 16:05 Andreas Sturmlechner
2021-04-11 20:03 Andreas Sturmlechner
2020-12-13 10:52 Andreas Sturmlechner
2020-10-18 16:01 Andreas Sturmlechner
2020-08-30 19:02 Andreas Sturmlechner
2020-06-28 16:18 Andreas Sturmlechner
2020-05-20 19:35 Andreas Sturmlechner
2020-04-24 18:42 Andreas Sturmlechner
2020-04-09  8:46 Andreas Sturmlechner
2020-03-09 20:34 Andreas Sturmlechner
2020-03-08 16:31 Andreas Sturmlechner
2020-03-08 13:10 Andreas Sturmlechner
2019-10-24 18:37 Andreas Sturmlechner
2019-08-16 14:47 Andreas Sturmlechner
2019-08-16 14:47 Andreas Sturmlechner
2019-03-03 23:09 Andreas Sturmlechner
2019-02-17 11:11 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2019-01-01 21:46 Andreas Sturmlechner
2019-01-01 21:46 Andreas Sturmlechner
2018-04-15 14:09 Andreas Sturmlechner
2018-04-05 18:01 Andreas Sturmlechner
2018-03-13 11:50 Michael Palimaka
2018-03-06 22:10 Andreas Sturmlechner
2018-02-22 13:17 Andreas Sturmlechner
2018-01-31 17:49 Andreas Sturmlechner
2017-12-31 21:23 Andreas Sturmlechner
2017-12-31 21:23 Andreas Sturmlechner
2017-09-10 12:21 Johannes Huber
2017-08-23 19:37 Andreas Sturmlechner
2017-08-08 23:49 Andreas Sturmlechner
2017-06-18 12:08 Michael Palimaka
2017-01-07 10:59 Andreas Sturmlechner
2017-01-06 22:46 Andreas Sturmlechner
2016-12-30  0:56 Andreas Sturmlechner
2016-12-23  8:55 Johannes Huber
2016-12-23  8:45 Johannes Huber
2016-11-12 10:57 Michael Palimaka
2016-08-20 17:22 Michael Palimaka
2016-08-11 18:52 Michael Palimaka
2016-04-04 18:59 Johannes Huber
2016-04-04 18:59 Johannes Huber
2014-11-27  7:58 Michael Palimaka
2014-11-15 14:01 Michael Palimaka
2014-11-14 18:44 Manuel Rüger
2014-06-16 10:48 Michael Palimaka
2014-06-12 19:08 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:34 Michael Palimaka
2014-06-12 18:03 Michael Palimaka
2014-06-12 18:00 Michael Palimaka
2014-06-12 17:55 Michael Palimaka
2014-06-12 17:55 Michael Palimaka
2014-05-24 11:31 Johannes Huber
2014-05-13 18:51 Johannes Huber
2014-05-13 11:43 Johannes Huber
2014-05-04 23:44 Johannes Huber
2014-05-04 12:59 Johannes Huber
2014-04-06 11:42 Johannes Huber
2014-04-05 12:53 Johannes Huber
2014-04-05 12:19 Johannes Huber
2014-04-05 12:15 Johannes Huber
2014-03-11 10:21 Johannes Huber
2014-03-06 12:45 David Heidelberger
2013-09-14 13:59 Johannes Huber
2013-08-28 16:05 Michael Palimaka
2013-08-06  7:45 Michael Palimaka
2013-08-03 10:52 David Heidelberger
2013-07-06 15:15 Johannes Huber
2013-06-01 11:35 David Heidelberger
2013-05-09 11:21 David Heidelberger
2011-08-26 20:54 Andreas Hüttel
2011-07-22 15:11 Andreas Hüttel
2011-07-21 20:44 Andreas Hüttel
2011-07-21 20:22 Andreas Hüttel
2011-05-24 10:58 Tomas Chvatal
2011-05-16  9:08 Tomas Chvatal
2011-05-16  8:53 Tomas Chvatal
2011-05-15 20:54 Andreas K. Huettel
2011-05-15 16:55 Tomas Chvatal
2011-05-15 16:53 Tomas Chvatal
2011-05-13  9:16 Tomas Chvatal
2011-05-12  9:33 Tomas Chvatal
2011-05-05 16:47 Tomas Chvatal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1481185785.c865a0cd1076b830cc67e7788147ab19f61f8af2.johu@gentoo \
    --to=johu@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox