1 |
johu 12/08/01 22:17:12 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: kdelibs-4.9.0.ebuild |
5 |
Log: |
6 |
Version bump KDE SC 4.9.0 |
7 |
|
8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.855 kde-base/kdelibs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.855&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.855&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.854&r2=1.855 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
20 |
retrieving revision 1.854 |
21 |
retrieving revision 1.855 |
22 |
diff -u -r1.854 -r1.855 |
23 |
--- ChangeLog 9 Jul 2012 16:36:48 -0000 1.854 |
24 |
+++ ChangeLog 1 Aug 2012 22:17:12 -0000 1.855 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for kde-base/kdelibs |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.854 2012/07/09 16:36:48 johu Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.855 2012/08/01 22:17:12 johu Exp $ |
30 |
+ |
31 |
+*kdelibs-4.9.0 (01 Aug 2012) |
32 |
+ |
33 |
+ 01 Aug 2012; Johannes Huber <johu@g.o> |
34 |
+ +files/kdelibs-4.8.95-udisks2-includes.patch, +kdelibs-4.9.0.ebuild, |
35 |
+ metadata.xml: |
36 |
+ Version bump KDE SC 4.9.0 |
37 |
|
38 |
09 Jul 2012; Johannes Huber <johu@g.o> -kdelibs-4.8.4.ebuild, |
39 |
kdelibs-4.8.4-r1.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.13 kde-base/kdelibs/metadata.xml |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/metadata.xml?rev=1.13&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/metadata.xml?rev=1.13&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/metadata.xml?r1=1.12&r2=1.13 |
48 |
|
49 |
Index: metadata.xml |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/metadata.xml,v |
52 |
retrieving revision 1.12 |
53 |
retrieving revision 1.13 |
54 |
diff -u -r1.12 -r1.13 |
55 |
--- metadata.xml 7 Aug 2011 16:54:15 -0000 1.12 |
56 |
+++ metadata.xml 1 Aug 2012 22:17:12 -0000 1.13 |
57 |
@@ -3,8 +3,9 @@ |
58 |
<pkgmetadata> |
59 |
<herd>kde</herd> |
60 |
<use> |
61 |
- <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag> |
62 |
- <flag name="udisks">Use udisks for block device access (e.g., automounting)</flag> |
63 |
+ <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag> |
64 |
+ <flag name="udisks">Use udisks for block device access (e.g., automounting)</flag> |
65 |
+ <flag name="udisks2">Use the udisks2 support backported from kf5</flag> |
66 |
<flag name="upower">Use upower for power management</flag> |
67 |
<flag name="upnp">Enable UPnP support</flag> |
68 |
</use> |
69 |
|
70 |
|
71 |
|
72 |
1.1 kde-base/kdelibs/kdelibs-4.9.0.ebuild |
73 |
|
74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.9.0.ebuild?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.9.0.ebuild?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: kdelibs-4.9.0.ebuild |
78 |
=================================================================== |
79 |
# Copyright 1999-2012 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.9.0.ebuild,v 1.1 2012/08/01 22:17:12 johu Exp $ |
82 |
|
83 |
EAPI=4 |
84 |
|
85 |
CPPUNIT_REQUIRED="optional" |
86 |
DECLARATIVE_REQUIRED="always" |
87 |
OPENGL_REQUIRED="optional" |
88 |
KDE_HANDBOOK="optional" |
89 |
KDE_SCM="git" |
90 |
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
91 |
|
92 |
# The "master" branch is out of date, so use KDE/4.9 per upstream's |
93 |
# recommendation. |
94 |
EGIT_BRANCH="KDE/4.9" |
95 |
|
96 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
97 |
HOMEPAGE="http://www.kde.org/" |
98 |
SRC_URI+=" http://dev.gentoo.org/~johu/distfiles/${PN}-4.8.95-udisks2.patch.xz" |
99 |
|
100 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
101 |
LICENSE="LGPL-2.1" |
102 |
IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma |
103 |
mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks |
104 |
udisks2 +upower upnp zeroconf" |
105 |
|
106 |
REQUIRED_USE=" |
107 |
udisks? ( udev ) |
108 |
udisks2? ( udisks ) |
109 |
upower? ( udev ) |
110 |
" |
111 |
|
112 |
# needs the kate regression testsuite from svn |
113 |
RESTRICT="test" |
114 |
|
115 |
COMMONDEPEND=" |
116 |
app-crypt/qca:2 |
117 |
>=app-misc/strigi-0.7.7 |
118 |
>=dev-libs/libattica-0.1.90 |
119 |
>=dev-libs/libdbusmenu-qt-0.3.2 |
120 |
dev-libs/libpcre[unicode] |
121 |
dev-libs/libxml2 |
122 |
dev-libs/libxslt |
123 |
media-libs/fontconfig |
124 |
media-libs/freetype:2 |
125 |
media-libs/giflib |
126 |
>=media-libs/libpng-1.4 |
127 |
>=media-libs/phonon-4.4.3 |
128 |
sys-libs/zlib |
129 |
virtual/jpeg |
130 |
>=x11-misc/shared-mime-info-0.60 |
131 |
acl? ( virtual/acl ) |
132 |
alsa? ( media-libs/alsa-lib ) |
133 |
!aqua? ( |
134 |
x11-libs/libICE |
135 |
x11-libs/libSM |
136 |
x11-libs/libX11 |
137 |
x11-libs/libXau |
138 |
x11-libs/libXcursor |
139 |
x11-libs/libXdmcp |
140 |
x11-libs/libXext |
141 |
x11-libs/libXfixes |
142 |
x11-libs/libXft |
143 |
x11-libs/libXpm |
144 |
x11-libs/libXrender |
145 |
x11-libs/libXScrnSaver |
146 |
x11-libs/libXtst |
147 |
!kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) |
148 |
) |
149 |
bzip2? ( app-arch/bzip2 ) |
150 |
fam? ( virtual/fam ) |
151 |
jpeg2k? ( media-libs/jasper ) |
152 |
kerberos? ( virtual/krb5 ) |
153 |
openexr? ( |
154 |
media-libs/openexr |
155 |
media-libs/ilmbase |
156 |
) |
157 |
policykit? ( >=sys-auth/polkit-qt-0.103.0 ) |
158 |
semantic-desktop? ( |
159 |
>=dev-libs/shared-desktop-ontologies-0.10.0 |
160 |
>=dev-libs/soprano-2.8.0[dbus,raptor,redland] |
161 |
) |
162 |
spell? ( app-text/enchant ) |
163 |
ssl? ( dev-libs/openssl ) |
164 |
udev? ( sys-fs/udev ) |
165 |
upnp? ( media-libs/herqq ) |
166 |
zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
167 |
" |
168 |
DEPEND="${COMMONDEPEND} |
169 |
doc? ( app-doc/doxygen ) |
170 |
nls? ( virtual/libintl ) |
171 |
" |
172 |
RDEPEND="${COMMONDEPEND} |
173 |
!x11-libs/qt-phonon |
174 |
>=app-crypt/gnupg-2.0.11 |
175 |
app-misc/ca-certificates |
176 |
$(add_kdebase_dep kde-env) |
177 |
!aqua? ( |
178 |
x11-apps/iceauth |
179 |
x11-apps/rgb |
180 |
>=x11-misc/xdg-utils-1.0.2-r3 |
181 |
udisks? ( |
182 |
udisks2? ( sys-fs/udisks:2 ) |
183 |
!udisks2? ( sys-fs/udisks:0 ) |
184 |
) |
185 |
upower? ( sys-power/upower ) |
186 |
) |
187 |
udev? ( app-misc/media-player-info ) |
188 |
" |
189 |
PDEPEND=" |
190 |
$(add_kdebase_dep katepart) |
191 |
|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) |
192 |
handbook? ( $(add_kdebase_dep khelpcenter) ) |
193 |
policykit? ( |
194 |
>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 |
195 |
>=sys-auth/polkit-kde-agent-0.99 |
196 |
) |
197 |
semantic-desktop? ( $(add_kdebase_dep nepomuk-core) ) |
198 |
" |
199 |
|
200 |
# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities |
201 |
add_blocker plasma-workspace 4.7.1 |
202 |
|
203 |
# file collision, bug 394991 |
204 |
add_blocker kcontrol 4.4.50 |
205 |
|
206 |
PATCHES=( |
207 |
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
208 |
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
209 |
"${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
210 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
211 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
212 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
213 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
214 |
"${FILESDIR}/${PN}-4.8.4-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 |
if use udisks2; then |
230 |
epatch "${WORKDIR}/${PN}-4.8.95-udisks2.patch" |
231 |
epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch" |
232 |
fi |
233 |
|
234 |
# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
235 |
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
236 |
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
237 |
|
238 |
if use aqua; then |
239 |
sed -i -e \ |
240 |
"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
241 |
cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
242 |
|
243 |
#if [[ ${CHOST} == *-darwin8 ]]; then |
244 |
sed -i -e \ |
245 |
"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
246 |
cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
247 |
#fi |
248 |
|
249 |
# solid/solid/backends/iokit doesn't properly link, so disable it. |
250 |
sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
251 |
|| die "disabling solid/solid/backends/iokit failed" |
252 |
sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
253 |
|| die "disabling solid/solid/backends/iokit failed" |
254 |
|
255 |
# There's no fdatasync on OSX and the check fails to detect that. |
256 |
sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
257 |
|| die "disabling fdatasync failed" |
258 |
|
259 |
# Fix nameser include to nameser8_compat |
260 |
sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
261 |
|| die "fixing nameser include failed" |
262 |
append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
263 |
|
264 |
# Try to fix kkeyserver_mac |
265 |
epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
266 |
fi |
267 |
|
268 |
if [[ ${CHOST} == *-solaris* ]] ; then |
269 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" |
270 |
# getgrouplist not in solaris libc |
271 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" |
272 |
# solaris has no d_type element in dir_ent |
273 |
epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" |
274 |
fi |
275 |
} |
276 |
|
277 |
src_configure() { |
278 |
if use zeroconf; then |
279 |
if has_version net-dns/avahi; then |
280 |
mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) |
281 |
else |
282 |
die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found." |
283 |
fi |
284 |
else |
285 |
mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |
286 |
fi |
287 |
mycmakeargs+=( |
288 |
-DWITH_HSPELL=OFF |
289 |
-DWITH_ASPELL=OFF |
290 |
-DKDE_DEFAULT_HOME=.kde4 |
291 |
-DKAUTH_BACKEND=POLKITQT-1 |
292 |
-DBUILD_libkactivities=OFF |
293 |
$(cmake-utils_use_build handbook doc) |
294 |
$(cmake-utils_use_has 3dnow X86_3DNOW) |
295 |
$(cmake-utils_use_has altivec PPC_ALTIVEC) |
296 |
$(cmake-utils_use_has mmx X86_MMX) |
297 |
$(cmake-utils_use_has sse X86_SSE) |
298 |
$(cmake-utils_use_has sse2 X86_SSE2) |
299 |
$(cmake-utils_use_with acl) |
300 |
$(cmake-utils_use_with alsa) |
301 |
$(cmake-utils_use_with bzip2 BZip2) |
302 |
$(cmake-utils_use_with fam) |
303 |
$(cmake-utils_use_with jpeg2k Jasper) |
304 |
$(cmake-utils_use_with kerberos GSSAPI) |
305 |
$(cmake-utils_use_with lzma LibLZMA) |
306 |
$(cmake-utils_use_with nls Libintl) |
307 |
$(cmake-utils_use_with openexr OpenEXR) |
308 |
$(cmake-utils_use_with opengl OpenGL) |
309 |
$(cmake-utils_use_with policykit PolkitQt-1) |
310 |
$(cmake-utils_use_with semantic-desktop Soprano) |
311 |
$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) |
312 |
$(cmake-utils_use_with spell ENCHANT) |
313 |
$(cmake-utils_use_with ssl OpenSSL) |
314 |
$(cmake-utils_use_with udev UDev) |
315 |
$(cmake-utils_use_with upnp HUpnp) |
316 |
) |
317 |
kde4-base_src_configure |
318 |
} |
319 |
|
320 |
src_compile() { |
321 |
kde4-base_src_compile |
322 |
|
323 |
# The building of apidox is not managed anymore by the build system |
324 |
if use doc; then |
325 |
einfo "Building API documentation" |
326 |
cd "${S}"/doc/api/ |
327 |
./doxygen.sh "${S}" || die "APIDOX generation failed" |
328 |
fi |
329 |
} |
330 |
|
331 |
src_install() { |
332 |
kde4-base_src_install |
333 |
|
334 |
# use system certificates |
335 |
rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
336 |
dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
337 |
|
338 |
if use doc; then |
339 |
einfo "Installing API documentation. This could take a bit of time." |
340 |
cd "${S}"/doc/api/ |
341 |
docinto /HTML/en/kdelibs-apidox |
342 |
dohtml -r ${P}-apidocs/* |
343 |
fi |
344 |
|
345 |
if use aqua; then |
346 |
einfo "fixing ${PN} plugins" |
347 |
|
348 |
local _PV=${PV:0:3}.0 |
349 |
local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
350 |
|
351 |
install_name_tool -id \ |
352 |
"${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
353 |
"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
354 |
|| die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
355 |
|
356 |
einfo "fixing ${PN} cmake detection files" |
357 |
#sed -i -e \ |
358 |
# "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
359 |
echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
360 |
"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
361 |
|| die "failed fixing FindXKB.cmake" |
362 |
fi |
363 |
|
364 |
einfo Installing environment file. |
365 |
# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
366 |
echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
367 |
echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
368 |
doenvd "${T}/77kde" |
369 |
} |
370 |
|
371 |
pkg_postinst() { |
372 |
fdo-mime_mime_database_update |
373 |
|
374 |
if use zeroconf; then |
375 |
echo |
376 |
elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
377 |
elog "is running." |
378 |
echo |
379 |
einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
380 |
einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
381 |
einfo "to include 'mdns', e.g.:" |
382 |
einfo " hosts: files mdns dns" |
383 |
echo |
384 |
fi |
385 |
|
386 |
elog "Your homedir is set to \${HOME}/.kde4" |
387 |
echo |
388 |
|
389 |
kde4-base_pkg_postinst |
390 |
} |
391 |
|
392 |
pkg_prerm() { |
393 |
# Remove ksycoca4 global database |
394 |
rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
395 |
} |
396 |
|
397 |
pkg_postrm() { |
398 |
fdo-mime_mime_database_update |
399 |
|
400 |
kde4-base_pkg_postrm |
401 |
} |