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

Gentoo Archives: gentoo-commits

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