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