commit: 532423fcf84a3c18df2612bde5921a58fb4a466a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 15:15:02 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 23:00:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532423fc
app-office/calligra: Drop USE=attica, bump EAPI 6, config w/ PG9.6
Drop USE=attica, obsolete by GHNS default off
Drop unused build options: cstester, pqxx
Add upstream patch to detect PostgreSQL 9.6
Package-Manager: portage-2.3.3
app-office/calligra/calligra-2.9.11-r1.ebuild | 130 ++++++++++-----------
.../files/calligra-2.9.11-postgresql-9.6.patch | 19 +++
2 files changed, 78 insertions(+), 71 deletions(-)
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 795c6aa..9fcd32a 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
# krita/CMakeLists.txt
-EAPI=5
+EAPI=6
CHECKREQS_DISK_BUILD="4G"
KDE_HANDBOOK="optional"
@@ -40,10 +40,9 @@ 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 +lcms marble mysql
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
+IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr
++pdf +pim 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"
@@ -67,12 +66,11 @@ RDEPEND="
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
- media-libs/libpng:0
+ media-libs/libpng:0=
sys-libs/zlib
virtual/libiconv
- attica? ( dev-libs/libattica )
color-management? ( media-libs/opencolorio )
- crypt? ( app-crypt/qca:2[qt4(+)] )
+ crypt? ( app-crypt/qca:2[qt4] )
eigen? ( dev-cpp/eigen:3 )
exif? ( media-gfx/exiv2:= )
fftw? ( sci-libs/fftw:3.0 )
@@ -80,7 +78,7 @@ RDEPEND="
freetds? ( dev-db/freetds )
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
- gsl? ( sci-libs/gsl )
+ gsl? ( sci-libs/gsl:= )
import-filter? (
app-text/libetonyek
app-text/libodfgen
@@ -99,12 +97,12 @@ RDEPEND="
)
marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
- okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
+ okular? ( kde-apps/okular:4=[aqua=] )
+ openexr? ( media-libs/openexr:= )
opengl? (
media-libs/glew:0
virtual/glu
)
- openexr? ( media-libs/openexr )
pdf? (
app-text/poppler:=
media-gfx/pstoedit
@@ -121,7 +119,7 @@ RDEPEND="
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
- >=dev-db/sqlite-3.8.7:3[extensions(+)]
+ dev-db/sqlite:3[extensions(+)]
dev-libs/icu:=
)
calligra_features_krita? (
@@ -142,7 +140,10 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
# bug 394273
RESTRICT=test
-PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
+ "${FILESDIR}"/${P}-postgresql-9.6.patch
+)
pkg_pretend() {
check-reqs_pkg_pretend
@@ -154,10 +155,10 @@ pkg_setup() {
}
src_prepare() {
+ kde4-base_src_prepare
if ! use webkit; then
sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
fi
- kde4-base_src_prepare
}
src_configure() {
@@ -165,70 +166,57 @@ src_configure() {
# 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}" )
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
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"
- "-DWITH_KActivities=OFF" # deprecated Plasma 4
activities integration
- )
-
# 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 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 pim KdepimLibs)
- $(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)
+ -DCREATIVEONLY=OFF
+ -DPACKAGERS_BUILD=OFF
+ -DWITH_Soprano=OFF
+ -DWITH_KActivities=OFF
+ -DWITH_Iconv=ON
+ -DWITH_OCIO=$(usex color-management)
+ -DWITH_QCA2=$(usex crypt)
+ -DWITH_Eigen3=$(usex eigen)
+ -DWITH_Exiv2=$(usex exif)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ -DWITH_FreeTDS=$(usex freetds)
+ -DWITH_GLIB2=$(usex glib)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OpenJPEG=$(usex jpeg2k)
+ -DWITH_Kdcraw=$(usex kdcraw)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_CalligraMarble=$(usex marble)
+ -DWITH_MySQL=$(usex mysql)
+ -DWITH_Okular=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DUSEOPENGL=$(usex opengl)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Pstoedit=$(usex pdf)
+ -DWITH_KdepimLibs=$(usex pim)
+ -DWITH_CalligraPostgreSQL=$(usex postgres)
+ -DWITH_Spnav=$(usex spacenav)
+ -DWITH_FreeTDS=$(usex sybase)
+ -DWITH_Threads=$(usex threads)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_Vc=$(usex vc)
+ -DWITH_XBase=$(usex xbase)
)
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+ use test && mycmakeargs+=( -DENABLE_CSTESTER_TESTING=$(usex test) )
kde4-base_src_configure
}
diff --git a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
new file mode 100644
index 00000000..617a0c3
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
@@ -0,0 +1,19 @@
+commit 843c41decfa85e351349f7a410893ac85c9d60b7
+Author: Pino Toscano <p...@kde.org>
+Date: Sat Oct 8 16:17:17 2016 +0200
+
+ cmake: find PostgreSQL 9.6
+
+diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake
b/cmake/modules/FindCalligraPostgreSQL.cmake
+index 035508b..98a1e88 100644
+--- a/cmake/modules/FindCalligraPostgreSQL.cmake
++++ b/cmake/modules/FindCalligraPostgreSQL.cmake
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT
system variable to wher
+
+
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+- "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++ "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
