summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dawson <matthew@mjdsystems.ca>2015-12-27 11:50:32 -0500
committerMichael Palimaka <kensington@gentoo.org>2015-12-31 01:13:07 +1100
commit627d2440902e45b27712a556d5b1eff43fdc67e1 (patch)
tree1d15d91875069d9e5346903fec7b7cde0f126019
parentmate-base/mate-applets: don't run python_fix_shebang on a missing dir #567468 (diff)
downloadgentoo-627d2440902e45b27712a556d5b1eff43fdc67e1.tar.gz
gentoo-627d2440902e45b27712a556d5b1eff43fdc67e1.tar.bz2
gentoo-627d2440902e45b27712a556d5b1eff43fdc67e1.zip
app-office/calligra: Bump version to 2.9.10
Also fix ebuild to handle revision version numbers >=10, and disables GHNS as it isn't supported by upstream.
-rw-r--r--app-office/calligra/Manifest1
-rw-r--r--app-office/calligra/calligra-2.9.10.ebuild223
-rw-r--r--app-office/calligra/calligra-9999.ebuild6
3 files changed, 225 insertions, 5 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index a8a38428f4e..37f49a0ead2 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,5 @@
DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
+DIST calligra-2.9.10.tar.xz 194841508 SHA256 a9d16f0523e03141a3d2cd2e28e484a8aa0f0fead2352ac2c385688066a1d1ef SHA512 50b14b938ecbc70aed36d83e475225cbed8ecb72e0f407e4a1089472a43122c9278d768dad258d1b65534a0e42322295bab5c493d580d69730daf63e936a6df6 WHIRLPOOL 3679b2ec00f00844b640d38dafce6925abf8ef2c851c72d7ad0a4046d85a432367b20436bc6dbbd28527102d0e58df61e5683042508f15a134dc34c002162c29
DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
DIST calligra-2.9.7.tar.xz 194348264 SHA256 7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 SHA512 89b6b43113dfd7304c9d88c79fe8ecce9d1cf5e6a82a401df6d0c5bad28c450af6e4012e859ccb1595f638513f79bb00f15cbc9f8cad03801c5aa1440b1b8a1f WHIRLPOOL d15fcf5458b25ae30e98031c541c85cac1658a435c8fa432fc7d3de44ebda7fa56ffab61b642c196d639d1bc9737f386e76dc75d7d51baa2efc0ed79d51dd9fc
diff --git a/app-office/calligra/calligra-2.9.10.ebuild b/app-office/calligra/calligra-2.9.10.ebuild
new file mode 100644
index 00000000000..04f1143cdc4
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.10.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=5
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+inherit check-reqs kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+ 2.[456789].[789]?)
+ # beta or rc releases
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+ 2.[456789].?|2.[456789].??)
+ # stable releases
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+ 2.[456789].9999)
+ # stable branch live ebuild
+ SRC_URI="" ;;
+ 9999)
+ # master branch live ebuild
+ SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
+for cal_ft in ${CAL_FTS}; do
+ IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+ calligra_features_author? ( calligra_features_words )
+ calligra_features_gemini? ( opengl )
+ calligra_features_krita? ( eigen exif lcms opengl )
+ calligra_features_plan? ( kdepim )
+ calligra_features_sheets? ( eigen )
+ vc? ( calligra_features_krita )
+ test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+ dev-lang/perl
+ dev-libs/boost
+ dev-qt/qtcore:4[exceptions]
+ media-libs/libpng:0
+ sys-libs/zlib
+ virtual/libiconv
+ attica? ( dev-libs/libattica )
+ color-management? ( media-libs/opencolorio )
+ crypt? ( app-crypt/qca:2[qt4(+)] )
+ eigen? ( dev-cpp/eigen:3 )
+ exif? ( media-gfx/exiv2:= )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ freetds? ( dev-db/freetds )
+ glib? ( dev-libs/glib:2 )
+ gsf? ( gnome-extra/libgsf )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ app-text/libwps
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ kdcraw? ( $(add_kdeapps_dep libkdcraw) )
+ kde? ( $(add_kdebase_dep kactivities) )
+ kdepim? ( $(add_kdeapps_dep kdepimlibs) )
+ lcms? (
+ media-libs/lcms:2
+ x11-libs/libX11
+ )
+ marble? ( $(add_kdeapps_dep marble) )
+ mysql? ( virtual/mysql )
+ okular? ( $(add_kdeapps_dep okular) )
+ opengl? (
+ media-libs/glew
+ virtual/glu
+ )
+ openexr? ( media-libs/openexr )
+ pdf? (
+ app-text/poppler:=
+ media-gfx/pstoedit
+ )
+ postgres? (
+ dev-db/postgresql:*
+ dev-libs/libpqxx
+ )
+ spacenav? ( dev-libs/libspnav )
+ sybase? ( dev-db/freetds )
+ tiff? ( media-libs/tiff:0 )
+ truetype? ( media-libs/freetype:2 )
+ vc? ( dev-libs/vc )
+ xbase? ( dev-db/xbase )
+ calligra_features_kexi? (
+ >=dev-db/sqlite-3.8.7:3[extensions(+)]
+ dev-libs/icu:=
+ )
+ calligra_features_krita? (
+ dev-qt/qtdeclarative:4
+ x11-libs/libX11
+ x11-libs/libXi
+ )
+ calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+# bug 394273
+RESTRICT=test
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde4-base_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ # Switch to ^^ when we switch to EAPI=6.
+ #local prod=${cal_ft^^}
+ local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
+ use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ # first write out things we want to hard-enable
+ mycmakeargs+=(
+ "-DWITH_Iconv=ON" # available on all supported arches and many more
+ )
+
+ # default disablers
+ mycmakeargs+=(
+ "-DCREATIVEONLY=OFF"
+ "-DPACKAGERS_BUILD=OFF"
+ "-DWITH_Soprano=OFF"
+ )
+
+ # regular options
+ mycmakeargs+=(
+ $(cmake-utils_use_with attica LibAttica)
+ $(cmake-utils_use_with color-management OCIO)
+ $(cmake-utils_use_with crypt QCA2)
+ $(cmake-utils_use_with eigen Eigen3)
+ $(cmake-utils_use_with exif Exiv2)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fontconfig Fontconfig)
+ $(cmake-utils_use_with freetds FreeTDS)
+ $(cmake-utils_use_with glib GLIB2)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with import-filter LibEtonyek)
+ $(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibRevenge)
+ $(cmake-utils_use_with import-filter LibVisio)
+ $(cmake-utils_use_with import-filter LibWpd)
+ $(cmake-utils_use_with import-filter LibWpg)
+ $(cmake-utils_use_with import-filter LibWps)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with kdcraw Kdcraw)
+ $(cmake-utils_use_with kde KActivities)
+ $(cmake-utils_use_with kdepim KdepimLibs)
+ $(cmake-utils_use_with lcms LCMS2)
+ $(cmake-utils_use_with marble CalligraMarble)
+ $(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_with okular Okular)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use opengl USEOPENGL)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with pdf Pstoedit)
+ $(cmake-utils_use_with postgres CalligraPostgreSQL)
+ $(cmake-utils_use_build postgres pqxx)
+ $(cmake-utils_use_with spacenav Spnav)
+ $(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with threads Threads)
+ $(cmake-utils_use_with truetype Freetype)
+ $(cmake-utils_use_with vc Vc)
+ $(cmake-utils_use_with xbase XBase)
+ )
+
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+ kde4-base_src_configure
+}
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index db56918f1f6..04f1143cdc4 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
2.[456789].[789]?)
# beta or rc releases
SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
- 2.[456789].?)
+ 2.[456789].?|2.[456789].??)
# stable releases
SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
2.[456789].9999)
@@ -62,7 +62,6 @@ REQUIRED_USE="
"
RDEPEND="
- $(add_kdeapps_dep knewstuff)
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
@@ -141,8 +140,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
# bug 394273
RESTRICT=test
-PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
-
pkg_pretend() {
check-reqs_pkg_pretend
}
@@ -167,7 +164,6 @@ src_configure() {
# first write out things we want to hard-enable
mycmakeargs+=(
- "-DGHNS=ON"
"-DWITH_Iconv=ON" # available on all supported arches and many more
)