1 |
commit: 235b4ae0a7efd5bd178adfce56fbcafb9c6cdc70 |
2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 26 19:04:33 2011 +0000 |
4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 26 22:26:01 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=235b4ae0 |
7 |
|
8 |
[kde-base/kdelibs] Re-add a -9999 version that actually uses KDE/4.7 |
9 |
|
10 |
--- |
11 |
.../package.keywords/.kde-live/kdelibs-live | 2 +- |
12 |
Documentation/package.keywords/kde-live.keywords | 2 +- |
13 |
Documentation/package.unmask/kde-live | 2 +- |
14 |
eclass/kde4-functions.eclass | 5 - |
15 |
kde-base/kdelibs/kdelibs-9999.ebuild | 316 ++++++++++++++++++++ |
16 |
sets/kdelibs-live | 2 +- |
17 |
6 files changed, 320 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/Documentation/package.keywords/.kde-live/kdelibs-live b/Documentation/package.keywords/.kde-live/kdelibs-live |
20 |
index e9ce955..57ae337 100644 |
21 |
--- a/Documentation/package.keywords/.kde-live/kdelibs-live |
22 |
+++ b/Documentation/package.keywords/.kde-live/kdelibs-live |
23 |
@@ -1,6 +1,6 @@ |
24 |
~kde-base/kactivities-9999 ** |
25 |
~kde-base/kde-env-9999 ** |
26 |
-~kde-base/kdelibs-4.7.49.9999 ** |
27 |
+~kde-base/kdelibs-9999 ** |
28 |
~kde-base/kdepimlibs-9999 ** |
29 |
~kde-base/oxygen-icons-9999 ** |
30 |
~kde-base/katepart-9999 ** |
31 |
|
32 |
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords |
33 |
index d01e80c..171623f 100644 |
34 |
--- a/Documentation/package.keywords/kde-live.keywords |
35 |
+++ b/Documentation/package.keywords/kde-live.keywords |
36 |
@@ -223,7 +223,7 @@ |
37 |
~kde-base/thumbnailers-9999 ** |
38 |
~kde-base/kactivities-9999 ** |
39 |
~kde-base/kde-env-9999 ** |
40 |
-~kde-base/kdelibs-4.7.49.9999 ** |
41 |
+~kde-base/kdelibs-9999 ** |
42 |
~kde-base/kdepimlibs-9999 ** |
43 |
~kde-base/oxygen-icons-9999 ** |
44 |
~kde-base/katepart-9999 ** |
45 |
|
46 |
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live |
47 |
index bec0bcb..ef92383 100644 |
48 |
--- a/Documentation/package.unmask/kde-live |
49 |
+++ b/Documentation/package.unmask/kde-live |
50 |
@@ -223,7 +223,7 @@ |
51 |
~kde-base/thumbnailers-9999 |
52 |
~kde-base/kactivities-9999 |
53 |
~kde-base/kde-env-9999 |
54 |
-~kde-base/kdelibs-4.7.49.9999 |
55 |
+~kde-base/kdelibs-9999 |
56 |
~kde-base/kdepimlibs-9999 |
57 |
~kde-base/oxygen-icons-9999 |
58 |
~kde-base/katepart-9999 |
59 |
|
60 |
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass |
61 |
index ad15b6e..45c68bd 100644 |
62 |
--- a/eclass/kde4-functions.eclass |
63 |
+++ b/eclass/kde4-functions.eclass |
64 |
@@ -418,11 +418,6 @@ add_kdebase_dep() { |
65 |
|
66 |
[[ -z ${1} ]] && die "Missing parameter" |
67 |
|
68 |
- # There will be no kdelibs 4.8+ (the next kdelibs will be a non-BC 5.0, apparently) |
69 |
- if [[ ${1} == kdelibs ]] && version_is_at_least 4.7.50 ${ver}; then |
70 |
- ver=4.7.1 |
71 |
- fi |
72 |
- |
73 |
echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]" |
74 |
} |
75 |
|
76 |
|
77 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
78 |
new file mode 100644 |
79 |
index 0000000..a58ce79 |
80 |
--- /dev/null |
81 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
82 |
@@ -0,0 +1,316 @@ |
83 |
+# Copyright 1999-2011 Gentoo Foundation |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+# $Header: $ |
86 |
+ |
87 |
+EAPI=4 |
88 |
+ |
89 |
+CPPUNIT_REQUIRED="optional" |
90 |
+DECLARATIVE_REQUIRED="always" |
91 |
+OPENGL_REQUIRED="optional" |
92 |
+KDE_SCM="git" |
93 |
+inherit kde4-base fdo-mime toolchain-funcs |
94 |
+ |
95 |
+# The "master" branch is out of date, so use KDE/4.7 per upstream's |
96 |
+# recommendation (KDE/4.8 will be branched off of KDE/4.7) |
97 |
+EGIT_BRANCH="KDE/4.7" |
98 |
+ |
99 |
+DESCRIPTION="KDE libraries needed by all KDE programs." |
100 |
+HOMEPAGE="http://www.kde.org/" |
101 |
+ |
102 |
+KEYWORDS="" |
103 |
+LICENSE="LGPL-2.1" |
104 |
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos |
105 |
+lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
106 |
++udisks +upower upnp zeroconf" |
107 |
+ |
108 |
+REQUIRED_USE=" |
109 |
+ udisks? ( udev ) |
110 |
+ upower? ( udev ) |
111 |
+" |
112 |
+ |
113 |
+# needs the kate regression testsuite from svn |
114 |
+RESTRICT="test" |
115 |
+ |
116 |
+COMMONDEPEND=" |
117 |
+ app-crypt/qca:2 |
118 |
+ >=app-misc/strigi-0.7.6 |
119 |
+ app-text/docbook-xml-dtd:4.2 |
120 |
+ app-text/docbook-xsl-stylesheets |
121 |
+ >=dev-libs/libattica-0.1.90 |
122 |
+ >=dev-libs/libdbusmenu-qt-0.3.2 |
123 |
+ dev-libs/libpcre[unicode] |
124 |
+ dev-libs/libxml2 |
125 |
+ dev-libs/libxslt |
126 |
+ media-libs/fontconfig |
127 |
+ media-libs/freetype:2 |
128 |
+ media-libs/giflib |
129 |
+ >=media-libs/libpng-1.4 |
130 |
+ >=media-libs/phonon-4.4.3 |
131 |
+ sys-libs/zlib |
132 |
+ virtual/jpeg |
133 |
+ >=x11-misc/shared-mime-info-0.60 |
134 |
+ acl? ( virtual/acl ) |
135 |
+ alsa? ( media-libs/alsa-lib ) |
136 |
+ !aqua? ( |
137 |
+ x11-libs/libICE |
138 |
+ x11-libs/libSM |
139 |
+ x11-libs/libX11 |
140 |
+ x11-libs/libXau |
141 |
+ x11-libs/libXcursor |
142 |
+ x11-libs/libXdmcp |
143 |
+ x11-libs/libXext |
144 |
+ x11-libs/libXfixes |
145 |
+ x11-libs/libXft |
146 |
+ x11-libs/libXpm |
147 |
+ x11-libs/libXrender |
148 |
+ x11-libs/libXScrnSaver |
149 |
+ x11-libs/libXtst |
150 |
+ !kernel_SunOS? ( sys-libs/libutempter ) |
151 |
+ ) |
152 |
+ bzip2? ( app-arch/bzip2 ) |
153 |
+ fam? ( virtual/fam ) |
154 |
+ jpeg2k? ( media-libs/jasper ) |
155 |
+ kerberos? ( virtual/krb5 ) |
156 |
+ lzma? ( app-arch/xz-utils ) |
157 |
+ openexr? ( |
158 |
+ media-libs/openexr |
159 |
+ media-libs/ilmbase |
160 |
+ ) |
161 |
+ policykit? ( >=sys-auth/polkit-qt-0.99 ) |
162 |
+ semantic-desktop? ( |
163 |
+ >=dev-libs/shared-desktop-ontologies-0.6.50 |
164 |
+ >=dev-libs/soprano-2.6.51[dbus,raptor,redland] |
165 |
+ ) |
166 |
+ spell? ( app-text/enchant ) |
167 |
+ ssl? ( dev-libs/openssl ) |
168 |
+ udev? ( sys-fs/udev ) |
169 |
+ upnp? ( media-libs/herqq ) |
170 |
+ zeroconf? ( |
171 |
+ || ( |
172 |
+ net-dns/avahi[mdnsresponder-compat] |
173 |
+ !bindist? ( net-misc/mDNSResponder ) |
174 |
+ ) |
175 |
+ ) |
176 |
+" |
177 |
+DEPEND="${COMMONDEPEND} |
178 |
+ doc? ( app-doc/doxygen ) |
179 |
+ nls? ( virtual/libintl ) |
180 |
+" |
181 |
+RDEPEND="${COMMONDEPEND} |
182 |
+ !x11-libs/qt-phonon |
183 |
+ >=app-crypt/gnupg-2.0.11 |
184 |
+ app-misc/ca-certificates |
185 |
+ $(add_kdebase_dep kde-env) |
186 |
+ !aqua? ( |
187 |
+ x11-apps/iceauth |
188 |
+ x11-apps/rgb |
189 |
+ >=x11-misc/xdg-utils-1.0.2-r3 |
190 |
+ udisks? ( sys-fs/udisks ) |
191 |
+ upower? ( sys-power/upower ) |
192 |
+ ) |
193 |
+" |
194 |
+PDEPEND=" |
195 |
+ $(add_kdebase_dep katepart) |
196 |
+ || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) |
197 |
+ handbook? ( $(add_kdebase_dep khelpcenter) ) |
198 |
+ policykit? ( |
199 |
+ >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 |
200 |
+ >=sys-auth/polkit-kde-agent-0.99 |
201 |
+ ) |
202 |
+ semantic-desktop? ( $(add_kdebase_dep nepomuk) ) |
203 |
+" |
204 |
+ |
205 |
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities |
206 |
+add_blocker plasma-workspace 4.7.1 |
207 |
+ |
208 |
+PATCHES=( |
209 |
+ "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
210 |
+ "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
211 |
+ "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
212 |
+ "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
213 |
+ "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
214 |
+ "${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
215 |
+) |
216 |
+ |
217 |
+pkg_pretend() { |
218 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
219 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
220 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
221 |
+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
222 |
+ fi |
223 |
+} |
224 |
+ |
225 |
+src_prepare() { |
226 |
+ kde4-base_src_prepare |
227 |
+ use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
228 |
+ |
229 |
+ # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
230 |
+ sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
231 |
+ -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
232 |
+ |
233 |
+ if use aqua; then |
234 |
+ sed -i -e \ |
235 |
+ "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
236 |
+ cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
237 |
+ |
238 |
+ #if [[ ${CHOST} == *-darwin8 ]]; then |
239 |
+ sed -i -e \ |
240 |
+ "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
241 |
+ cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
242 |
+ #fi |
243 |
+ |
244 |
+ # solid/solid/backends/iokit doesn't properly link, so disable it. |
245 |
+ sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
246 |
+ || die "disabling solid/solid/backends/iokit failed" |
247 |
+ sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
248 |
+ || die "disabling solid/solid/backends/iokit failed" |
249 |
+ |
250 |
+ # There's no fdatasync on OSX and the check fails to detect that. |
251 |
+ sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
252 |
+ || die "disabling fdatasync failed" |
253 |
+ |
254 |
+ # Fix nameser include to nameser8_compat |
255 |
+ sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
256 |
+ || die "fixing nameser include failed" |
257 |
+ append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
258 |
+ |
259 |
+ # Try to fix kkeyserver_mac |
260 |
+ epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
261 |
+ fi |
262 |
+ |
263 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
264 |
+ epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" |
265 |
+ # getgrouplist not in solaris libc |
266 |
+ epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" |
267 |
+ # solaris has no d_type element in dir_ent |
268 |
+ epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" |
269 |
+ fi |
270 |
+} |
271 |
+ |
272 |
+src_configure() { |
273 |
+ if use zeroconf; then |
274 |
+ if has_version net-dns/avahi; then |
275 |
+ mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) |
276 |
+ elif has_version net-misc/mDNSResponder; then |
277 |
+ mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) |
278 |
+ else |
279 |
+ die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." |
280 |
+ fi |
281 |
+ else |
282 |
+ mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |
283 |
+ fi |
284 |
+ mycmakeargs+=( |
285 |
+ -DWITH_HSPELL=OFF |
286 |
+ -DWITH_ASPELL=OFF |
287 |
+ -DKDE_DEFAULT_HOME=.kde4 |
288 |
+ -DKAUTH_BACKEND=POLKITQT-1 |
289 |
+ -DBUILD_libkactivities=OFF |
290 |
+ $(cmake-utils_use_build handbook doc) |
291 |
+ $(cmake-utils_use_has 3dnow X86_3DNOW) |
292 |
+ $(cmake-utils_use_has altivec PPC_ALTIVEC) |
293 |
+ $(cmake-utils_use_has mmx X86_MMX) |
294 |
+ $(cmake-utils_use_has sse X86_SSE) |
295 |
+ $(cmake-utils_use_has sse2 X86_SSE2) |
296 |
+ $(cmake-utils_use_with acl) |
297 |
+ $(cmake-utils_use_with alsa) |
298 |
+ $(cmake-utils_use_with bzip2 BZip2) |
299 |
+ $(cmake-utils_use_with fam) |
300 |
+ $(cmake-utils_use_with jpeg2k Jasper) |
301 |
+ $(cmake-utils_use_with kerberos GSSAPI) |
302 |
+ $(cmake-utils_use_with lzma LibLZMA) |
303 |
+ $(cmake-utils_use_with nls Libintl) |
304 |
+ $(cmake-utils_use_with openexr OpenEXR) |
305 |
+ $(cmake-utils_use_with opengl OpenGL) |
306 |
+ $(cmake-utils_use_with policykit PolkitQt-1) |
307 |
+ $(cmake-utils_use_with semantic-desktop Soprano) |
308 |
+ $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) |
309 |
+ $(cmake-utils_use_with spell ENCHANT) |
310 |
+ $(cmake-utils_use_with ssl OpenSSL) |
311 |
+ $(cmake-utils_use_with udev UDev) |
312 |
+ $(cmake-utils_use_with upnp HUpnp) |
313 |
+ ) |
314 |
+ kde4-base_src_configure |
315 |
+} |
316 |
+ |
317 |
+src_compile() { |
318 |
+ kde4-base_src_compile |
319 |
+ |
320 |
+ # The building of apidox is not managed anymore by the build system |
321 |
+ if use doc; then |
322 |
+ einfo "Building API documentation" |
323 |
+ cd "${S}"/doc/api/ |
324 |
+ ./doxygen.sh "${S}" || die "APIDOX generation failed" |
325 |
+ fi |
326 |
+} |
327 |
+ |
328 |
+src_install() { |
329 |
+ kde4-base_src_install |
330 |
+ |
331 |
+ # use system certificates |
332 |
+ rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
333 |
+ dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
334 |
+ |
335 |
+ if use doc; then |
336 |
+ einfo "Installing API documentation. This could take a bit of time." |
337 |
+ cd "${S}"/doc/api/ |
338 |
+ docinto /HTML/en/kdelibs-apidox |
339 |
+ dohtml -r ${P}-apidocs/* |
340 |
+ fi |
341 |
+ |
342 |
+ if use aqua; then |
343 |
+ einfo "fixing ${PN} plugins" |
344 |
+ |
345 |
+ local _PV=${PV:0:3}.0 |
346 |
+ local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
347 |
+ |
348 |
+ install_name_tool -id \ |
349 |
+ "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
350 |
+ "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
351 |
+ || die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
352 |
+ |
353 |
+ einfo "fixing ${PN} cmake detection files" |
354 |
+ #sed -i -e \ |
355 |
+ # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
356 |
+ echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
357 |
+ "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
358 |
+ || die "failed fixing FindXKB.cmake" |
359 |
+ fi |
360 |
+ |
361 |
+ einfo Installing environment file. |
362 |
+ # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
363 |
+ echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
364 |
+ echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
365 |
+ doenvd "${T}/77kde" |
366 |
+} |
367 |
+ |
368 |
+pkg_postinst() { |
369 |
+ fdo-mime_mime_database_update |
370 |
+ |
371 |
+ if use zeroconf; then |
372 |
+ echo |
373 |
+ elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
374 |
+ elog "is running." |
375 |
+ echo |
376 |
+ einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
377 |
+ einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
378 |
+ einfo "to include 'mdns', e.g.:" |
379 |
+ einfo " hosts: files mdns dns" |
380 |
+ echo |
381 |
+ fi |
382 |
+ |
383 |
+ elog "Your homedir is set to \${HOME}/.kde4" |
384 |
+ echo |
385 |
+ |
386 |
+ kde4-base_pkg_postinst |
387 |
+} |
388 |
+ |
389 |
+pkg_prerm() { |
390 |
+ # Remove ksycoca4 global database |
391 |
+ rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
392 |
+} |
393 |
+ |
394 |
+pkg_postrm() { |
395 |
+ fdo-mime_mime_database_update |
396 |
+ |
397 |
+ kde4-base_pkg_postrm |
398 |
+} |
399 |
|
400 |
diff --git a/sets/kdelibs-live b/sets/kdelibs-live |
401 |
index ea91f65..519edc4 100644 |
402 |
--- a/sets/kdelibs-live |
403 |
+++ b/sets/kdelibs-live |
404 |
@@ -1,6 +1,6 @@ |
405 |
~kde-base/kactivities-9999 |
406 |
~kde-base/kde-env-9999 |
407 |
-~kde-base/kdelibs-4.7.49.9999 |
408 |
+~kde-base/kdelibs-9999 |
409 |
~kde-base/kdepimlibs-9999 |
410 |
~kde-base/oxygen-icons-9999 |
411 |
~kde-base/katepart-9999 |