Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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