1 |
commit: 532423fcf84a3c18df2612bde5921a58fb4a466a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 29 15:15:02 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 23:00:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532423fc |
7 |
|
8 |
app-office/calligra: Drop USE=attica, bump EAPI 6, config w/ PG9.6 |
9 |
|
10 |
Drop USE=attica, obsolete by GHNS default off |
11 |
Drop unused build options: cstester, pqxx |
12 |
Add upstream patch to detect PostgreSQL 9.6 |
13 |
|
14 |
Package-Manager: portage-2.3.3 |
15 |
|
16 |
app-office/calligra/calligra-2.9.11-r1.ebuild | 130 ++++++++++----------- |
17 |
.../files/calligra-2.9.11-postgresql-9.6.patch | 19 +++ |
18 |
2 files changed, 78 insertions(+), 71 deletions(-) |
19 |
|
20 |
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild |
21 |
index 795c6aa..9fcd32a 100644 |
22 |
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild |
23 |
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2016 Gentoo Foundation |
26 |
+# Copyright 1999-2017 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
@@ -6,7 +6,7 @@ |
31 |
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt |
32 |
# krita/CMakeLists.txt |
33 |
|
34 |
-EAPI=5 |
35 |
+EAPI=6 |
36 |
|
37 |
CHECKREQS_DISK_BUILD="4G" |
38 |
KDE_HANDBOOK="optional" |
39 |
@@ -40,10 +40,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
40 |
KEYWORDS="~amd64 ~arm ~x86" |
41 |
fi |
42 |
|
43 |
-IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds |
44 |
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql |
45 |
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads |
46 |
-+truetype vc xbase +xml" |
47 |
+IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib |
48 |
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr |
49 |
++pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml" |
50 |
|
51 |
# Don't use Active, it's broken on desktops. |
52 |
CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words" |
53 |
@@ -67,12 +66,11 @@ RDEPEND=" |
54 |
dev-lang/perl |
55 |
dev-libs/boost |
56 |
dev-qt/qtcore:4[exceptions] |
57 |
- media-libs/libpng:0 |
58 |
+ media-libs/libpng:0= |
59 |
sys-libs/zlib |
60 |
virtual/libiconv |
61 |
- attica? ( dev-libs/libattica ) |
62 |
color-management? ( media-libs/opencolorio ) |
63 |
- crypt? ( app-crypt/qca:2[qt4(+)] ) |
64 |
+ crypt? ( app-crypt/qca:2[qt4] ) |
65 |
eigen? ( dev-cpp/eigen:3 ) |
66 |
exif? ( media-gfx/exiv2:= ) |
67 |
fftw? ( sci-libs/fftw:3.0 ) |
68 |
@@ -80,7 +78,7 @@ RDEPEND=" |
69 |
freetds? ( dev-db/freetds ) |
70 |
glib? ( dev-libs/glib:2 ) |
71 |
gsf? ( gnome-extra/libgsf ) |
72 |
- gsl? ( sci-libs/gsl ) |
73 |
+ gsl? ( sci-libs/gsl:= ) |
74 |
import-filter? ( |
75 |
app-text/libetonyek |
76 |
app-text/libodfgen |
77 |
@@ -99,12 +97,12 @@ RDEPEND=" |
78 |
) |
79 |
marble? ( $(add_kdeapps_dep marble) ) |
80 |
mysql? ( virtual/mysql ) |
81 |
- okular? ( >=kde-apps/okular-4.4:4=[aqua=] ) |
82 |
+ okular? ( kde-apps/okular:4=[aqua=] ) |
83 |
+ openexr? ( media-libs/openexr:= ) |
84 |
opengl? ( |
85 |
media-libs/glew:0 |
86 |
virtual/glu |
87 |
) |
88 |
- openexr? ( media-libs/openexr ) |
89 |
pdf? ( |
90 |
app-text/poppler:= |
91 |
media-gfx/pstoedit |
92 |
@@ -121,7 +119,7 @@ RDEPEND=" |
93 |
vc? ( <dev-libs/vc-1.0.0 ) |
94 |
xbase? ( dev-db/xbase ) |
95 |
calligra_features_kexi? ( |
96 |
- >=dev-db/sqlite-3.8.7:3[extensions(+)] |
97 |
+ dev-db/sqlite:3[extensions(+)] |
98 |
dev-libs/icu:= |
99 |
) |
100 |
calligra_features_krita? ( |
101 |
@@ -142,7 +140,10 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" |
102 |
# bug 394273 |
103 |
RESTRICT=test |
104 |
|
105 |
-PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch ) |
106 |
+PATCHES=( |
107 |
+ "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch |
108 |
+ "${FILESDIR}"/${P}-postgresql-9.6.patch |
109 |
+) |
110 |
|
111 |
pkg_pretend() { |
112 |
check-reqs_pkg_pretend |
113 |
@@ -154,10 +155,10 @@ pkg_setup() { |
114 |
} |
115 |
|
116 |
src_prepare() { |
117 |
+ kde4-base_src_prepare |
118 |
if ! use webkit; then |
119 |
sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die |
120 |
fi |
121 |
- kde4-base_src_prepare |
122 |
} |
123 |
|
124 |
src_configure() { |
125 |
@@ -165,70 +166,57 @@ src_configure() { |
126 |
|
127 |
# applications |
128 |
for cal_ft in ${CAL_FTS}; do |
129 |
- # Switch to ^^ when we switch to EAPI=6. |
130 |
- #local prod=${cal_ft^^} |
131 |
- local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}") |
132 |
- use calligra_features_${cal_ft} && myproducts+=( "${prod}" ) |
133 |
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
134 |
done |
135 |
|
136 |
local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) |
137 |
|
138 |
- # first write out things we want to hard-enable |
139 |
- mycmakeargs+=( |
140 |
- "-DWITH_Iconv=ON" # available on all supported arches and many more |
141 |
- ) |
142 |
- |
143 |
- # default disablers |
144 |
- mycmakeargs+=( |
145 |
- "-DCREATIVEONLY=OFF" |
146 |
- "-DPACKAGERS_BUILD=OFF" |
147 |
- "-DWITH_Soprano=OFF" |
148 |
- "-DWITH_KActivities=OFF" # deprecated Plasma 4 activities integration |
149 |
- ) |
150 |
- |
151 |
# regular options |
152 |
mycmakeargs+=( |
153 |
- $(cmake-utils_use_with attica LibAttica) |
154 |
- $(cmake-utils_use_with color-management OCIO) |
155 |
- $(cmake-utils_use_with crypt QCA2) |
156 |
- $(cmake-utils_use_with eigen Eigen3) |
157 |
- $(cmake-utils_use_with exif Exiv2) |
158 |
- $(cmake-utils_use_with fftw FFTW3) |
159 |
- $(cmake-utils_use_with fontconfig Fontconfig) |
160 |
- $(cmake-utils_use_with freetds FreeTDS) |
161 |
- $(cmake-utils_use_with glib GLIB2) |
162 |
- $(cmake-utils_use_with gsl GSL) |
163 |
- $(cmake-utils_use_with import-filter LibEtonyek) |
164 |
- $(cmake-utils_use_with import-filter LibOdfGen) |
165 |
- $(cmake-utils_use_with import-filter LibRevenge) |
166 |
- $(cmake-utils_use_with import-filter LibVisio) |
167 |
- $(cmake-utils_use_with import-filter LibWpd) |
168 |
- $(cmake-utils_use_with import-filter LibWpg) |
169 |
- $(cmake-utils_use_with import-filter LibWps) |
170 |
- $(cmake-utils_use_with jpeg JPEG) |
171 |
- $(cmake-utils_use_with jpeg2k OpenJPEG) |
172 |
- $(cmake-utils_use_with kdcraw Kdcraw) |
173 |
- $(cmake-utils_use_with lcms LCMS2) |
174 |
- $(cmake-utils_use_with marble CalligraMarble) |
175 |
- $(cmake-utils_use_with mysql MySQL) |
176 |
- $(cmake-utils_use_with okular Okular) |
177 |
- $(cmake-utils_use_with openexr OpenEXR) |
178 |
- $(cmake-utils_use opengl USEOPENGL) |
179 |
- $(cmake-utils_use_with pdf Poppler) |
180 |
- $(cmake-utils_use_with pdf Pstoedit) |
181 |
- $(cmake-utils_use_with pim KdepimLibs) |
182 |
- $(cmake-utils_use_with postgres CalligraPostgreSQL) |
183 |
- $(cmake-utils_use_build postgres pqxx) |
184 |
- $(cmake-utils_use_with spacenav Spnav) |
185 |
- $(cmake-utils_use_with sybase FreeTDS) |
186 |
- $(cmake-utils_use_with tiff TIFF) |
187 |
- $(cmake-utils_use_with threads Threads) |
188 |
- $(cmake-utils_use_with truetype Freetype) |
189 |
- $(cmake-utils_use_with vc Vc) |
190 |
- $(cmake-utils_use_with xbase XBase) |
191 |
+ -DCREATIVEONLY=OFF |
192 |
+ -DPACKAGERS_BUILD=OFF |
193 |
+ -DWITH_Soprano=OFF |
194 |
+ -DWITH_KActivities=OFF |
195 |
+ -DWITH_Iconv=ON |
196 |
+ -DWITH_OCIO=$(usex color-management) |
197 |
+ -DWITH_QCA2=$(usex crypt) |
198 |
+ -DWITH_Eigen3=$(usex eigen) |
199 |
+ -DWITH_Exiv2=$(usex exif) |
200 |
+ -DWITH_FFTW3=$(usex fftw) |
201 |
+ -DWITH_Fontconfig=$(usex fontconfig) |
202 |
+ -DWITH_FreeTDS=$(usex freetds) |
203 |
+ -DWITH_GLIB2=$(usex glib) |
204 |
+ -DWITH_GSL=$(usex gsl) |
205 |
+ -DWITH_LibEtonyek=$(usex import-filter) |
206 |
+ -DWITH_LibOdfGen=$(usex import-filter) |
207 |
+ -DWITH_LibRevenge=$(usex import-filter) |
208 |
+ -DWITH_LibVisio=$(usex import-filter) |
209 |
+ -DWITH_LibWpd=$(usex import-filter) |
210 |
+ -DWITH_LibWpg=$(usex import-filter) |
211 |
+ -DWITH_LibWps=$(usex import-filter) |
212 |
+ -DWITH_JPEG=$(usex jpeg) |
213 |
+ -DWITH_OpenJPEG=$(usex jpeg2k) |
214 |
+ -DWITH_Kdcraw=$(usex kdcraw) |
215 |
+ -DWITH_LCMS2=$(usex lcms) |
216 |
+ -DWITH_CalligraMarble=$(usex marble) |
217 |
+ -DWITH_MySQL=$(usex mysql) |
218 |
+ -DWITH_Okular=$(usex okular) |
219 |
+ -DWITH_OpenEXR=$(usex openexr) |
220 |
+ -DUSEOPENGL=$(usex opengl) |
221 |
+ -DWITH_Poppler=$(usex pdf) |
222 |
+ -DWITH_Pstoedit=$(usex pdf) |
223 |
+ -DWITH_KdepimLibs=$(usex pim) |
224 |
+ -DWITH_CalligraPostgreSQL=$(usex postgres) |
225 |
+ -DWITH_Spnav=$(usex spacenav) |
226 |
+ -DWITH_FreeTDS=$(usex sybase) |
227 |
+ -DWITH_Threads=$(usex threads) |
228 |
+ -DWITH_TIFF=$(usex tiff) |
229 |
+ -DWITH_Freetype=$(usex truetype) |
230 |
+ -DWITH_Vc=$(usex vc) |
231 |
+ -DWITH_XBase=$(usex xbase) |
232 |
) |
233 |
|
234 |
- mycmakeargs+=( $(cmake-utils_use_build test cstester) ) |
235 |
+ use test && mycmakeargs+=( -DENABLE_CSTESTER_TESTING=$(usex test) ) |
236 |
|
237 |
kde4-base_src_configure |
238 |
} |
239 |
|
240 |
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 |
241 |
new file mode 100644 |
242 |
index 00000000..617a0c3 |
243 |
--- /dev/null |
244 |
+++ b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch |
245 |
@@ -0,0 +1,19 @@ |
246 |
+commit 843c41decfa85e351349f7a410893ac85c9d60b7 |
247 |
+Author: Pino Toscano <pino@×××.org> |
248 |
+Date: Sat Oct 8 16:17:17 2016 +0200 |
249 |
+ |
250 |
+ cmake: find PostgreSQL 9.6 |
251 |
+ |
252 |
+diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake |
253 |
+index 035508b..98a1e88 100644 |
254 |
+--- a/cmake/modules/FindCalligraPostgreSQL.cmake |
255 |
++++ b/cmake/modules/FindCalligraPostgreSQL.cmake |
256 |
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher |
257 |
+ |
258 |
+ |
259 |
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} |
260 |
+- "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") |
261 |
++ "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") |
262 |
+ |
263 |
+ # Define additional search paths for root directories. |
264 |
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) |