Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs/, kde-frameworks/kdelibs/files/
Date: Sun, 12 Feb 2017 15:56:28
Message-Id: 1486914979.7f047c71a00763546e1061c0989ae801089d75bb.johu@gentoo
1 commit: 7f047c71a00763546e1061c0989ae801089d75bb
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 15:56:02 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 15:56:19 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f047c71
7
8 kde-frameworks/kdelibs: Remove 4.14.24
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 kde-frameworks/kdelibs/Manifest | 1 -
13 .../files/kdelibs-4.14.20-strigi-optional.patch | 24 --
14 kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild | 300 ---------------------
15 3 files changed, 325 deletions(-)
16
17 diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
18 index c211c46f73..a46cca1e3f 100644
19 --- a/kde-frameworks/kdelibs/Manifest
20 +++ b/kde-frameworks/kdelibs/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894 WHIRLPOOL 2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2
23 DIST kdelibs-4.14.28.tar.xz 11639996 SHA256 c07b3d3bba44d3d703ef3f29eeb51d5d829a637affbe5f0cf4e5f0214ef64de4 SHA512 f407509ee9c298a3c6079ebc7348dbaa93e42af00d8a45991c0b4d2447fb1e31b0b4fe0c6baed7cea935f84d368099b9867c00cc29b58371c323d5269e808306 WHIRLPOOL 277e8c366036cbd033a972b0f2e089f3ebb2a15bc91b1874493365c482b2b284cfe3fbbbbfbbe789e1b84f96ff0085e624ecf3c3b315f49d12baecf756736339
24 DIST kdelibs-4.14.29.tar.xz 11643940 SHA256 1b538ddecaf818ae69b3de8ee11324bf92f4da5b3943f728cb0afdcd34037c77 SHA512 caf5f840533bd99c42d74583ef97004500de4d73f14bf442e6b3d83bbf6bb1130e735a8f7a45955d60b318a3587e4e08f168c11e1159c26445875b907f5f0976 WHIRLPOOL 007c8605c22bfa3417c6b3b841cb4c6c7f99484463acb7b954b5eb75615b58515363281d75ebdfb175d90d4830d7fbe3bb7ed786943cb2de66d1519a792a1d11
25
26 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
27 deleted file mode 100644
28 index c9e96551cf..0000000000
29 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
30 +++ /dev/null
31 @@ -1,24 +0,0 @@
32 -diff --git a/CMakeLists.txt b/CMakeLists.txt
33 -index e7b2bea..87147b5 100644
34 ---- a/CMakeLists.txt
35 -+++ b/CMakeLists.txt
36 -@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed
37 - )
38 -
39 - find_package(Strigi 0.6.3)
40 --if (WIN32)
41 -- set (STRIGI_TYPE "OPTIONAL")
42 -- set (STRIGI_EXTRA_TEXT "")
43 --else (WIN32)
44 -- set (STRIGI_TYPE "REQUIRED")
45 -- set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves")
46 --endif (WIN32)
47 - set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support"
48 - URL "http://strigi.sourceforge.net"
49 -- TYPE ${STRIGI_TYPE}
50 -- PURPOSE ${STRIGI_EXTRA_TEXT}
51 -+ TYPE OPTIONAL
52 -+ PURPOSE "Required by some kioslaves for metadata support"
53 - )
54 -
55 - find_package(LibAttica 0.4.2)
56
57 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild
58 deleted file mode 100644
59 index cc2ff8c6ab..0000000000
60 --- a/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild
61 +++ /dev/null
62 @@ -1,300 +0,0 @@
63 -# Copyright 1999-2017 Gentoo Foundation
64 -# Distributed under the terms of the GNU General Public License v2
65 -# $Id$
66 -
67 -EAPI=6
68 -
69 -CPPUNIT_REQUIRED="optional"
70 -DECLARATIVE_REQUIRED="always"
71 -KDE_HANDBOOK="optional"
72 -OPENGL_REQUIRED="optional"
73 -WEBKIT_REQUIRED="optional"
74 -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
75 -
76 -APPS_VERSION="16.08.1" # Don't forget to bump this
77 -
78 -DESCRIPTION="KDE libraries needed by all KDE programs"
79 -[[ ${KDE_BUILD_TYPE} != live ]] && \
80 -SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
81 -
82 -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
83 -LICENSE="LGPL-2.1"
84 -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
85 -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
86 -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
87 -
88 -REQUIRED_USE="
89 - udisks? ( udev )
90 - upower? ( udev )
91 -"
92 -
93 -# needs the kate regression testsuite from svn
94 -RESTRICT="test"
95 -
96 -COMMONDEPEND="
97 - app-text/docbook-xml-dtd:4.2
98 - app-text/docbook-xsl-stylesheets
99 - >=dev-libs/libattica-0.4.2
100 - dev-libs/libdbusmenu-qt[qt4]
101 - dev-libs/libpcre[unicode]
102 - dev-libs/libxml2
103 - dev-libs/libxslt
104 - media-libs/fontconfig
105 - media-libs/freetype:2
106 - media-libs/giflib:=
107 - media-libs/libpng:0=
108 - media-libs/phonon[qt4]
109 - sys-libs/zlib
110 - virtual/jpeg:0
111 - x11-misc/shared-mime-info
112 - acl? ( virtual/acl )
113 - !aqua? (
114 - x11-libs/libICE
115 - x11-libs/libSM
116 - x11-libs/libX11
117 - x11-libs/libXau
118 - x11-libs/libXcursor
119 - x11-libs/libXdmcp
120 - x11-libs/libXext
121 - x11-libs/libXfixes
122 - x11-libs/libXft
123 - x11-libs/libXpm
124 - x11-libs/libXrender
125 - x11-libs/libXScrnSaver
126 - x11-libs/libXtst
127 - !kernel_SunOS? (
128 - || (
129 - sys-libs/libutempter
130 - >=sys-freebsd/freebsd-lib-9.0
131 - )
132 - )
133 - )
134 - bzip2? ( app-arch/bzip2 )
135 - crypt? ( app-crypt/qca:2[qt4] )
136 - fam? ( virtual/fam )
137 - jpeg2k? ( media-libs/jasper:= )
138 - kerberos? ( virtual/krb5 )
139 - openexr? (
140 - media-libs/openexr:=
141 - media-libs/ilmbase:=
142 - )
143 - policykit? ( sys-auth/polkit-qt[qt4] )
144 - spell? ( app-text/enchant )
145 - ssl? (
146 - libressl? ( dev-libs/libressl:0= )
147 - !libressl? ( dev-libs/openssl:0= )
148 - )
149 - udev? ( virtual/udev )
150 - zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
151 -"
152 -DEPEND="${COMMONDEPEND}
153 - doc? ( app-doc/doxygen )
154 - nls? ( virtual/libintl )
155 -"
156 -RDEPEND="${COMMONDEPEND}
157 - !dev-qt/qtphonon
158 - >=app-crypt/gnupg-2.0.11
159 - app-misc/ca-certificates
160 - kde-frameworks/kdelibs-env:4
161 - sys-apps/dbus[X]
162 - !aqua? (
163 - udisks? ( sys-fs/udisks:2 )
164 - x11-apps/iceauth
165 - x11-apps/rgb
166 - x11-misc/xdg-utils
167 - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
168 - )
169 - udev? ( app-misc/media-player-info )
170 -"
171 -PDEPEND="
172 - $(add_kdeapps_dep katepart '' 4.14.3)
173 - || (
174 - $(add_kdeapps_dep kfmclient '' 4.14.3)
175 - x11-misc/xdg-utils
176 - )
177 - handbook? ( kde-apps/khelpcenter:* )
178 - policykit? ( || (
179 - >=sys-auth/polkit-kde-agent-0.99
180 - kde-plasma/polkit-kde-agent
181 - ) )
182 -"
183 -
184 -PATCHES=(
185 - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
186 - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
187 - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
188 - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
189 - "${FILESDIR}/${PN}-4.4.90-xslt.patch"
190 - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
191 - "${FILESDIR}/${PN}-4.8.1-norpath.patch"
192 - "${FILESDIR}/${PN}-4.9.3-werror.patch"
193 - "${FILESDIR}/${PN}-4.10.0-udisks.patch"
194 - "${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
195 - "${FILESDIR}/${PN}-4.14.20-strigi-optional.patch"
196 - "${FILESDIR}/${PN}-4.14.22-webkit.patch"
197 -)
198 -
199 -pkg_pretend() {
200 - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
201 - [[ $(gcc-major-version) -lt 4 ]] || \
202 - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
203 - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
204 - fi
205 -}
206 -
207 -src_prepare() {
208 - kde4-base_src_prepare
209 -
210 - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
211 - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
212 - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
213 -
214 - if use aqua; then
215 - sed -i -e \
216 - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
217 - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
218 -
219 - #if [[ ${CHOST} == *-darwin8 ]]; then
220 - sed -i -e \
221 - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
222 - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
223 - #fi
224 -
225 - # solid/solid/backends/iokit doesn't properly link, so disable it.
226 - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
227 - || die "disabling solid/solid/backends/iokit failed"
228 - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
229 - || die "disabling solid/solid/backends/iokit failed"
230 -
231 - # There's no fdatasync on OSX and the check fails to detect that.
232 - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
233 - || die "disabling fdatasync failed"
234 -
235 - # Fix nameser include to nameser8_compat
236 - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
237 - || die "fixing nameser include failed"
238 - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
239 -
240 - # Try to fix kkeyserver_mac
241 - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
242 - fi
243 -}
244 -
245 -src_configure() {
246 - local mycmakeargs=(
247 - -DWITH_HSPELL=OFF
248 - -DWITH_ASPELL=OFF
249 - -DKDE_DEFAULT_HOME=.kde4
250 - -DKAUTH_BACKEND=POLKITQT-1
251 - -DWITH_Soprano=OFF
252 - -DWITH_SharedDesktopOntologies=OFF
253 - -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
254 - -DBUILD_doc=$(usex handbook)
255 - -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
256 - -DHAVE_PPC_ALTIVEC=$(usex altivec)
257 - -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
258 - -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
259 - -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
260 - -DWITH_ACL=$(usex acl)
261 - -DWITH_BZip2=$(usex bzip2)
262 - -DWITH_QCA2=$(usex crypt)
263 - -DWITH_FAM=$(usex fam)
264 - -DWITH_Jasper=$(usex jpeg2k)
265 - -DWITH_GSSAPI=$(usex kerberos)
266 - -DWITH_LibLZMA=$(usex lzma)
267 - -DWITH_Libintl=$(usex nls)
268 - -DWITH_OpenEXR=$(usex openexr)
269 - -DWITH_OpenGL=$(usex opengl)
270 - -DWITH_PolkitQt-1=$(usex policykit)
271 - -DWITH_ENCHANT=$(usex spell)
272 - -DWITH_OpenSSL=$(usex ssl)
273 - -DWITH_UDev=$(usex udev)
274 - -DWITH_SOLID_UDISKS2=$(usex udisks)
275 - -DWITH_Avahi=$(usex zeroconf)
276 - -DWITH_KDEWEBKIT=$(usex webkit)
277 - )
278 -
279 - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
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 avahi 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 - 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 -}