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