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() {
