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.11.3-r1.ebuild ChangeLog kdelibs-4.11.3.ebuild
Date: Thu, 21 Nov 2013 21:09:46
Message-Id: 20131121210940.9CA502004B@flycatcher.gentoo.org
1 johu 13/11/21 21:09:40
2
3 Modified: ChangeLog
4 Added: kdelibs-4.11.3-r1.ebuild
5 Removed: kdelibs-4.11.3.ebuild
6 Log:
7 Revision bump drops man pages conflicting with kf5.
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
10
11 Revision Changes Path
12 1.958 kde-base/kdelibs/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.958&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.958&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.957&r2=1.958
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
21 retrieving revision 1.957
22 retrieving revision 1.958
23 diff -u -r1.957 -r1.958
24 --- ChangeLog 5 Nov 2013 22:22:57 -0000 1.957
25 +++ ChangeLog 21 Nov 2013 21:09:40 -0000 1.958
26 @@ -1,6 +1,12 @@
27 # ChangeLog for kde-base/kdelibs
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.957 2013/11/05 22:22:57 dilfridge Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.958 2013/11/21 21:09:40 johu Exp $
31 +
32 +*kdelibs-4.11.3-r1 (21 Nov 2013)
33 +
34 + 21 Nov 2013; Johannes Huber <johu@g.o> +kdelibs-4.11.3-r1.ebuild,
35 + -kdelibs-4.11.3.ebuild:
36 + Revision bump drops man pages conflicting with kf5.
37
38 *kdelibs-4.11.3 (05 Nov 2013)
39
40
41
42
43 1.1 kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.11.3-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: kdelibs-4.11.3-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2013 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.11.3-r1.ebuild,v 1.1 2013/11/21 21:09:40 johu Exp $
53
54 EAPI=5
55
56 CPPUNIT_REQUIRED="optional"
57 DECLARATIVE_REQUIRED="always"
58 OPENGL_REQUIRED="optional"
59 KDE_HANDBOOK="optional"
60 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
61
62 EGIT_BRANCH="KDE/4.11"
63
64 DESCRIPTION="KDE libraries needed by all KDE programs."
65
66 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
67 LICENSE="LGPL-2.1"
68 IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma
69 mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
70 +upower zeroconf"
71
72 REQUIRED_USE="
73 udisks? ( udev )
74 upower? ( udev )
75 "
76
77 # needs the kate regression testsuite from svn
78 RESTRICT="test"
79
80 COMMONDEPEND="
81 app-crypt/qca:2
82 >=app-misc/strigi-0.7.7
83 app-text/docbook-xml-dtd:4.2
84 app-text/docbook-xsl-stylesheets
85 >=dev-libs/libattica-0.4.2
86 >=dev-libs/libdbusmenu-qt-0.3.2
87 dev-libs/libpcre[unicode]
88 dev-libs/libxml2
89 dev-libs/libxslt
90 media-libs/fontconfig
91 media-libs/freetype:2
92 media-libs/giflib
93 media-libs/libpng:0=
94 >=media-libs/phonon-4.4.3
95 sys-libs/zlib
96 virtual/jpeg:0
97 >=x11-misc/shared-mime-info-0.60
98 acl? ( virtual/acl )
99 alsa? ( media-libs/alsa-lib )
100 !aqua? (
101 x11-libs/libICE
102 x11-libs/libSM
103 x11-libs/libX11
104 x11-libs/libXau
105 x11-libs/libXcursor
106 x11-libs/libXdmcp
107 x11-libs/libXext
108 x11-libs/libXfixes
109 x11-libs/libXft
110 x11-libs/libXpm
111 x11-libs/libXrender
112 x11-libs/libXScrnSaver
113 x11-libs/libXtst
114 !kernel_SunOS? (
115 || (
116 sys-libs/libutempter
117 >=sys-freebsd/freebsd-lib-9.0
118 )
119 )
120 )
121 bzip2? ( app-arch/bzip2 )
122 fam? ( virtual/fam )
123 jpeg2k? ( media-libs/jasper )
124 kerberos? ( virtual/krb5 )
125 openexr? (
126 media-libs/openexr:=
127 media-libs/ilmbase:=
128 )
129 policykit? ( >=sys-auth/polkit-qt-0.103.0 )
130 semantic-desktop? (
131 >=dev-libs/shared-desktop-ontologies-0.11.0
132 >=dev-libs/soprano-2.9.0[dbus,raptor,redland]
133 )
134 spell? ( app-text/enchant )
135 ssl? ( dev-libs/openssl )
136 udev? ( virtual/udev )
137 zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
138 "
139 DEPEND="${COMMONDEPEND}
140 doc? ( app-doc/doxygen )
141 nls? ( virtual/libintl )
142 "
143 RDEPEND="${COMMONDEPEND}
144 !dev-qt/qtphonon
145 !<=kde-base/plasma-workspace-4.7.1:4
146 !<=kde-base/kcontrol-4.4.50:4
147 >=app-crypt/gnupg-2.0.11
148 app-misc/ca-certificates
149 $(add_kdebase_dep kde-env)
150 sys-apps/dbus[X]
151 !aqua? (
152 udisks? ( sys-fs/udisks:2 )
153 x11-apps/iceauth
154 x11-apps/rgb
155 >=x11-misc/xdg-utils-1.0.2-r3
156 upower? ( sys-power/upower )
157 )
158 udev? ( app-misc/media-player-info )
159 "
160 PDEPEND="
161 $(add_kdebase_dep katepart)
162 || (
163 $(add_kdebase_dep kfmclient)
164 x11-misc/xdg-utils
165 )
166 handbook? ( $(add_kdebase_dep khelpcenter) )
167 policykit? (
168 >=sys-auth/polkit-kde-agent-0.99
169 )
170 semantic-desktop? (
171 $(add_kdebase_dep nepomuk-core)
172 $(add_kdebase_dep nepomuk-widgets)
173 )
174 "
175
176 PATCHES=(
177 "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
178 "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
179 "${FILESDIR}/${PN}-4.7.96-mimetypes.patch"
180 "${FILESDIR}/${PN}-4.4.90-xslt.patch"
181 "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
182 "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
183 "${FILESDIR}/${PN}-4.8.1-norpath.patch"
184 "${FILESDIR}/${PN}-4.9.3-werror.patch"
185 "${FILESDIR}/${PN}-4.10.0-udisks.patch"
186 )
187
188 pkg_pretend() {
189 if [[ ${MERGE_TYPE} != binary ]]; then
190 [[ $(gcc-major-version) -lt 4 ]] || \
191 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
192 && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
193 fi
194 }
195
196 src_prepare() {
197 kde4-base_src_prepare
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
234 src_configure() {
235 mycmakeargs=(
236 -DWITH_HSPELL=OFF
237 -DWITH_ASPELL=OFF
238 -DWITH_DNSSD=OFF
239 -DKDE_DEFAULT_HOME=.kde4
240 -DKAUTH_BACKEND=POLKITQT-1
241 -DBUILD_libkactivities=OFF
242 $(cmake-utils_use_build handbook doc)
243 $(cmake-utils_use_has 3dnow X86_3DNOW)
244 $(cmake-utils_use_has altivec PPC_ALTIVEC)
245 $(cmake-utils_use_has mmx X86_MMX)
246 $(cmake-utils_use_has sse X86_SSE)
247 $(cmake-utils_use_has sse2 X86_SSE2)
248 $(cmake-utils_use_with acl)
249 $(cmake-utils_use_with alsa)
250 $(cmake-utils_use_with bzip2 BZip2)
251 $(cmake-utils_use_with fam)
252 $(cmake-utils_use_with jpeg2k Jasper)
253 $(cmake-utils_use_with kerberos GSSAPI)
254 $(cmake-utils_use_with lzma LibLZMA)
255 $(cmake-utils_use_with nls Libintl)
256 $(cmake-utils_use_with openexr OpenEXR)
257 $(cmake-utils_use_with opengl OpenGL)
258 $(cmake-utils_use_with policykit PolkitQt-1)
259 $(cmake-utils_use_with semantic-desktop Soprano)
260 $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
261 $(cmake-utils_use_with spell ENCHANT)
262 $(cmake-utils_use_with ssl OpenSSL)
263 $(cmake-utils_use_with udev UDev)
264 $(cmake-utils_use_with udisks SOLID_UDISKS2)
265 $(cmake-utils_use_with zeroconf Avahi)
266 )
267 kde4-base_src_configure
268 }
269
270 src_compile() {
271 kde4-base_src_compile
272
273 # The building of apidox is not managed anymore by the build system
274 if use doc; then
275 einfo "Building API documentation"
276 cd "${S}"/doc/api/
277 ./doxygen.sh "${S}" || die "APIDOX generation failed"
278 fi
279 }
280
281 src_install() {
282 kde4-base_src_install
283
284 # use system certificates
285 rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
286 dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
287
288 # conflict with kf5 tier2 - kdoctools
289 rm -rf "${ED}"/usr/share/man/ || die
290
291 if use doc; then
292 einfo "Installing API documentation. This could take a bit of time."
293 cd "${S}"/doc/api/
294 docinto /HTML/en/kdelibs-apidox
295 dohtml -r ${P}-apidocs/*
296 fi
297
298 if use aqua; then
299 einfo "fixing ${PN} plugins"
300
301 local _PV=${PV:0:3}.0
302 local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
303
304 install_name_tool -id \
305 "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
306 "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
307 || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
308
309 einfo "fixing ${PN} cmake detection files"
310 #sed -i -e \
311 # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
312 echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
313 "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
314 || die "failed fixing FindXKB.cmake"
315 fi
316
317 einfo Installing environment file.
318 # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
319 echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
320 echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
321 doenvd "${T}/77kde"
322 }
323
324 pkg_postinst() {
325 fdo-mime_mime_database_update
326
327 if use zeroconf; then
328 echo
329 elog "To make zeroconf support available in KDE make sure that the avahi daemon"
330 elog "is running."
331 echo
332 einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
333 einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
334 einfo "to include 'mdns', e.g.:"
335 einfo " hosts: files mdns dns"
336 echo
337 fi
338
339 kde4-base_pkg_postinst
340 }
341
342 pkg_prerm() {
343 # Remove ksycoca4 global database
344 rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
345 }
346
347 pkg_postrm() {
348 fdo-mime_mime_database_update
349
350 kde4-base_pkg_postrm
351 }
Report Message
Find on MARC Find on Google Groups