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

Gentoo Archives: gentoo-commits

From: "Dror Levin (spatz)" <spatz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.4.2.ebuild
Date: Tue, 30 Mar 2010 20:44:01
Message-Id: E1NwiI2-0000Hu-Gp@stork.gentoo.org
1 spatz 10/03/30 20:43:58
2
3 Modified: ChangeLog
4 Added: kdelibs-4.4.2.ebuild
5 Log:
6 Version bump KDE 4.4.2
7 (Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
8
9 Revision Changes Path
10 1.676 kde-base/kdelibs/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.676&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.676&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.675&r2=1.676
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
19 retrieving revision 1.675
20 retrieving revision 1.676
21 diff -u -r1.675 -r1.676
22 --- ChangeLog 11 Mar 2010 18:36:32 -0000 1.675
23 +++ ChangeLog 30 Mar 2010 20:43:58 -0000 1.676
24 @@ -1,6 +1,12 @@
25 # ChangeLog for kde-base/kdelibs
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.675 2010/03/11 18:36:32 ranger Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.676 2010/03/30 20:43:58 spatz Exp $
29 +
30 +*kdelibs-4.4.2 (30 Mar 2010)
31 +
32 + 30 Mar 2010; Dror Levin <spatz@g.o> +kdelibs-4.4.2.ebuild,
33 + +files/kdelibs-4.4.66-macos-unbundle.patch:
34 + Version bump
35
36 11 Mar 2010; Brent Baude <ranger@g.o> kdelibs-4.3.5.ebuild:
37 Marking kdelibs-4.3.5 ppc stable for bug 300393
38
39
40
41 1.1 kde-base/kdelibs/kdelibs-4.4.2.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: kdelibs-4.4.2.ebuild
47 ===================================================================
48 # Copyright 1999-2010 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.1 2010/03/30 20:43:58 spatz Exp $
51
52 EAPI="3"
53
54 CPPUNIT_REQUIRED="optional"
55 OPENGL_REQUIRED="optional"
56 WEBKIT_REQUIRED="always"
57 inherit kde4-base fdo-mime
58
59 DESCRIPTION="KDE libraries needed by all KDE programs."
60 HOMEPAGE="http://www.kde.org/"
61
62 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
63 LICENSE="LGPL-2.1"
64 IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
65 lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl zeroconf"
66
67 # needs the kate regression testsuite from svn
68 RESTRICT="test"
69
70 COMMONDEPEND="
71 app-crypt/qca:2
72 >=app-misc/strigi-0.6.3
73 dev-libs/libattica
74 dev-libs/libpcre[unicode]
75 dev-libs/libxml2
76 dev-libs/libxslt
77 >=kde-base/automoc-0.9.87
78 media-libs/fontconfig
79 media-libs/freetype:2
80 media-libs/giflib
81 media-libs/jpeg:0
82 media-libs/libpng
83 sys-libs/zlib
84 >=x11-misc/shared-mime-info-0.60
85 acl? ( virtual/acl )
86 alsa? ( media-libs/alsa-lib )
87 aqua? (
88 >=media-sound/phonon-4.3.80
89 sys-apps/dbus
90 )
91 !aqua? (
92 >=media-sound/phonon-4.3.80[xcb]
93 sys-apps/dbus[X]
94 x11-libs/libICE
95 x11-libs/libSM
96 x11-libs/libX11
97 x11-libs/libXau
98 x11-libs/libXcursor
99 x11-libs/libXdmcp
100 x11-libs/libXext
101 x11-libs/libXfixes
102 x11-libs/libXft
103 x11-libs/libXpm
104 x11-libs/libXrender
105 x11-libs/libXtst
106 !kernel_SunOS? ( sys-libs/libutempter )
107 )
108 bzip2? ( app-arch/bzip2 )
109 fam? ( virtual/fam )
110 jpeg2k? ( media-libs/jasper )
111 kerberos? ( virtual/krb5 )
112 lzma? ( app-arch/xz-utils )
113 openexr? (
114 media-libs/openexr
115 media-libs/ilmbase
116 )
117 policykit? ( sys-auth/polkit-qt )
118 semantic-desktop? (
119 >=dev-libs/shared-desktop-ontologies-0.2
120 >=dev-libs/soprano-2.3.73[dbus,raptor,redland]
121 )
122 spell? (
123 app-dicts/aspell-en
124 app-text/aspell
125 app-text/enchant
126 )
127 ssl? ( dev-libs/openssl )
128 zeroconf? (
129 || (
130 net-dns/avahi[mdnsresponder-compat]
131 !bindist? ( net-misc/mDNSResponder )
132 )
133 )
134 "
135 DEPEND="${COMMONDEPEND}
136 doc? ( app-doc/doxygen )
137 nls? ( virtual/libintl )
138 "
139 RDEPEND="${COMMONDEPEND}
140 !dev-libs/conversion
141 !dev-libs/kunitconversion
142 !x11-libs/qt-phonon
143 !<=kde-misc/kdnssd-avahi-0.1.2:0
144 >=app-crypt/gnupg-2.0.11
145 app-misc/ca-certificates
146 $(add_kdebase_dep kde-env)
147 !aqua? (
148 x11-apps/iceauth
149 x11-apps/rgb
150 >=x11-misc/xdg-utils-1.0.2-r3
151 )
152 "
153
154 # Blockers added due to packages from old versions, removed in the meanwhile
155 # as well as for file collisions
156 add_blocker libknotificationitem
157 add_blocker libkworkspace '<4.3.66'
158 # @since 4.4 - kpilot is gone (blocker added to help upgrades)
159 add_blocker kpilot
160 # Block some old versions of KDE-3.5 packages that don't work well with KDE-4
161 add_blocker kdebase 0 3.5.9-r4:3.5
162 add_blocker kdebase-startkde 0 3.5.10:3.5
163 add_blocker kdelibs 0 '<3.5.10:3.5'
164 # libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
165 add_blocker plasma-workspace '<4.3.75'
166
167 PATCHES=(
168 "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
169 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
170 "${FILESDIR}/dist/23_solid_no_double_build.patch"
171 "${FILESDIR}/${PN}-4.3.80-module-suffix.patch"
172 "${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
173 "${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
174 "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
175 "${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
176 )
177
178 src_prepare() {
179 kde4-base_src_prepare
180
181 # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
182 local menu_prefix="kde-${SLOT}-"
183 sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
184 -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
185 sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \
186 -i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
187
188 if use aqua; then
189 sed -i -e \
190 "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
191 cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
192
193 #if [[ ${CHOST} == *-darwin8 ]]; then
194 sed -i -e \
195 "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
196 cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
197 #fi
198
199 # solid/solid/backends/iokit doesn't properly link, so disable it.
200 sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
201 || die "disabling solid/solid/backends/iokit failed"
202 sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
203 || die "disabling solid/solid/backends/iokit failed"
204
205 # There's no fdatasync on OSX and the check fails to detect that.
206 sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
207 || die "disabling fdatasync failed"
208
209 # Fix nameser include to nameser8_compat
210 sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
211 || die "fixing nameser include failed"
212 append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
213
214 # Try to fix kkeyserver_mac
215 epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
216 fi
217
218 if [[ ${CHOST} == *-solaris* ]] ; then
219 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
220 # getgrouplist not in solaris libc
221 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
222 # solaris has no d_type element in dir_ent
223 epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
224 fi
225 }
226
227 src_configure() {
228 if use zeroconf; then
229 if has_version net-dns/avahi; then
230 mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
231 elif has_version net-misc/mDNSResponder; then
232 mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
233 else
234 die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
235 fi
236 else
237 mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
238 fi
239 if use kdeprefix; then
240 HME=".kde${SLOT}"
241 else
242 HME=".kde4"
243 fi
244 mycmakeargs+=(
245 -DWITH_HSPELL=OFF
246 -DKDE_DEFAULT_HOME=${HME}
247 -DKAUTH_BACKEND=POLKITQT-1
248 $(cmake-utils_use_build handbook doc)
249 $(cmake-utils_use_has 3dnow X86_3DNOW)
250 $(cmake-utils_use_has altivec PPC_ALTIVEC)
251 $(cmake-utils_use_has mmx X86_MMX)
252 $(cmake-utils_use_has sse X86_SSE)
253 $(cmake-utils_use_has sse2 X86_SSE2)
254 $(cmake-utils_use_with acl)
255 $(cmake-utils_use_with alsa)
256 $(cmake-utils_use_with bzip2 BZip2)
257 $(cmake-utils_use_with fam)
258 $(cmake-utils_use_with jpeg2k Jasper)
259 $(cmake-utils_use_with kerberos GSSAPI)
260 $(cmake-utils_use_with lzma LibLZMA)
261 $(cmake-utils_use_with nls Libintl)
262 $(cmake-utils_use_with openexr OpenEXR)
263 $(cmake-utils_use_with opengl OpenGL)
264 $(cmake-utils_use_with policykit PolkitQt-1)
265 $(cmake-utils_use_with semantic-desktop Soprano)
266 $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
267 $(cmake-utils_use_with spell ASPELL)
268 $(cmake-utils_use_with spell ENCHANT)
269 $(cmake-utils_use_with ssl OpenSSL)
270 )
271 kde4-base_src_configure
272 }
273
274 src_compile() {
275 kde4-base_src_compile
276
277 # The building of apidox is not managed anymore by the build system
278 if use doc; then
279 einfo "Building API documentation"
280 cd "${S}"/doc/api/
281 ./doxygen.sh "${S}" || die "APIDOX generation failed"
282 fi
283 }
284
285 src_install() {
286 kde4-base_src_install
287
288 # use system certificates
289 rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
290 dosym /etc/ssl/certs/ca-certificates.crt \
291 "${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die
292
293 if use doc; then
294 einfo "Installing API documentation. This could take a bit of time."
295 cd "${S}"/doc/api/
296 docinto /HTML/en/kdelibs-apidox
297 dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
298 fi
299
300 if use aqua; then
301 einfo "fixing ${PN} plugins"
302
303 local _PV=${PV:0:3}.0
304 local _dir=${EKDEDIR}/$(get_libdir)/kde4/plugins/script
305
306 install_name_tool -id \
307 "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
308 "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
309 || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
310
311 einfo "fixing ${PN} cmake detection files"
312 #sed -i -e \
313 # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
314 echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
315 "${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
316 || die "failed fixing FindXKB.cmake"
317 fi
318 }
319
320 pkg_postinst() {
321 fdo-mime_mime_database_update
322
323 if use zeroconf; then
324 echo
325 elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
326 elog "is running."
327 echo
328 einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
329 einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
330 einfo "to include 'mdns', e.g.:"
331 einfo " hosts: files mdns dns"
332 echo
333 fi
334
335 elog "Your homedir is set to \${HOME}/${HME}"
336 echo
337
338 if ! has_version sys-apps/hal; then
339 echo
340 ewarn "You need sys-apps/hal for new device notifications, power management and any"
341 ewarn "other hardware related functionalities to work."
342 echo
343 fi
344
345 kde4-base_pkg_postinst
346 }
347
348 pkg_prerm() {
349 # Remove ksycoca4 global database
350 rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
351 }
352
353 pkg_postrm() {
354 fdo-mime_mime_database_update
355
356 kde4-base_pkg_postrm
357 }
Report Message
Find on MARC Find on Google Groups