1 |
commit: ebcb2e11aa3ba5e343419d5bb415fdb9495a7517 |
2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 27 21:48:41 2011 +0000 |
4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 27 21:53:00 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ebcb2e11 |
7 |
|
8 |
Moved revbumped pkgs to tree |
9 |
|
10 |
--- |
11 |
kde-base/kactivities/kactivities-4.7.1.ebuild | 50 --- |
12 |
.../kdelibs/files/kdelibs-4.7.1-clearbutton.patch | 82 ----- |
13 |
kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild | 313 -------------------- |
14 |
.../plasma-workspace-4.7.1-r1.ebuild | 143 --------- |
15 |
4 files changed, 0 insertions(+), 588 deletions(-) |
16 |
|
17 |
diff --git a/kde-base/kactivities/kactivities-4.7.1.ebuild b/kde-base/kactivities/kactivities-4.7.1.ebuild |
18 |
deleted file mode 100644 |
19 |
index 667f248..0000000 |
20 |
--- a/kde-base/kactivities/kactivities-4.7.1.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,50 +0,0 @@ |
23 |
-# Copyright 1999-2011 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: $ |
26 |
- |
27 |
-EAPI=4 |
28 |
- |
29 |
-KDE_SCM="git" |
30 |
-KMNAME="kdelibs" |
31 |
- |
32 |
-inherit kde4-base |
33 |
- |
34 |
-DESCRIPTION="KDE Activity Manager" |
35 |
- |
36 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
37 |
-IUSE="" |
38 |
- |
39 |
-RESTRICT="test" |
40 |
- |
41 |
-# Split out from kdelibs in 4.7.1-r2 |
42 |
-add_blocker kdelibs 4.7.1-r1 |
43 |
- |
44 |
-src_unpack() { |
45 |
- kde4-base_src_unpack |
46 |
- # Move the unpacked sources to where they are expected to be |
47 |
- [[ $(echo *-${PV}) != ${P} ]] && { mv *-${PV} ${P} || die; } |
48 |
-} |
49 |
- |
50 |
-src_prepare() { |
51 |
- kde4-base_src_prepare |
52 |
- |
53 |
- sed -i -e '/libkdeclarative/s:^:#DONOTWANT:' experimental/CMakeLists.txt || die |
54 |
-} |
55 |
- |
56 |
-src_configure() { |
57 |
- local S="${WORKDIR}/${P}/experimental" |
58 |
- |
59 |
- kde4-base_src_configure |
60 |
-} |
61 |
- |
62 |
-src_compile() { |
63 |
- local S="${WORKDIR}/${P}/experimental" |
64 |
- |
65 |
- kde4-base_src_compile |
66 |
-} |
67 |
- |
68 |
-src_install() { |
69 |
- local S="${WORKDIR}/${P}/experimental" |
70 |
- |
71 |
- kde4-base_src_install |
72 |
-} |
73 |
|
74 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch |
75 |
deleted file mode 100644 |
76 |
index c177b28..0000000 |
77 |
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch |
78 |
+++ /dev/null |
79 |
@@ -1,82 +0,0 @@ |
80 |
-commit 07d20a558da67fb9f849e2b20c52cf275ea01794 |
81 |
-Author: Andrea Iacovitti <aiacovitti@××××××.it> |
82 |
-Date: Sat Sep 17 10:12:04 2011 +0200 |
83 |
- |
84 |
- -Do not set WA_OpaquePaintEvent attribute for line edit clearButton |
85 |
- (should fix the not transparent background bug) |
86 |
- -Optimize a bit the code to enable/disable it |
87 |
- |
88 |
- BUG: 230024 |
89 |
- CCBUG: 280226 |
90 |
- FIXED-IN: 4.7.2 |
91 |
- |
92 |
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp |
93 |
-index 715e182..c919b99 100644 |
94 |
---- a/kdeui/widgets/klineedit.cpp |
95 |
-+++ b/kdeui/widgets/klineedit.cpp |
96 |
-@@ -291,6 +291,7 @@ void KLineEdit::setClearButtonShown(bool show) |
97 |
- } |
98 |
- |
99 |
- d->clearButton = new KLineEditButton(this); |
100 |
-+ d->clearButton->setObjectName("KLineEditButton"); |
101 |
- d->clearButton->setCursor( Qt::ArrowCursor ); |
102 |
- d->clearButton->setToolTip( i18nc( "@action:button Clear current text in the line edit", "Clear text" ) ); |
103 |
- |
104 |
-diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp |
105 |
-index 1db9b1a..28dbac3 100644 |
106 |
---- a/khtml/khtmlview.cpp |
107 |
-+++ b/khtml/khtmlview.cpp |
108 |
-@@ -1363,7 +1363,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse ) |
109 |
- if (kw && kw->m_kwp->isRedirected()) |
110 |
- setCursor = false; |
111 |
- else if (QLineEdit* le = qobject_cast<QLineEdit*>(rw->widget())) { |
112 |
-- QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KHTMLLineEditButton" ); |
113 |
-+ QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KLineEditButton" ); |
114 |
- // force arrow cursor above lineedit clear button |
115 |
- foreach (QWidget*w, wl) { |
116 |
- if (w->underMouse()) { |
117 |
-@@ -1942,7 +1942,10 @@ static void handleWidget(QWidget* w, KHTMLView* view, bool recurse=true) |
118 |
- w->setAttribute( Qt::WA_NoSystemBackground ); |
119 |
- |
120 |
- w->setAttribute(Qt::WA_WState_InPaintEvent); |
121 |
-- w->setAttribute(Qt::WA_OpaquePaintEvent); |
122 |
-+ |
123 |
-+ if (!(w->objectName() == "KLineEditButton")) |
124 |
-+ w->setAttribute(Qt::WA_OpaquePaintEvent); |
125 |
-+ |
126 |
- w->installEventFilter(view); |
127 |
- |
128 |
- if (!recurse) |
129 |
-diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp |
130 |
-index 845db1a..3302920 100644 |
131 |
---- a/khtml/rendering/render_form.cpp |
132 |
-+++ b/khtml/rendering/render_form.cpp |
133 |
-@@ -1044,20 +1044,21 @@ void RenderLineEdit::setStyle(RenderStyle* _style) |
134 |
- RenderFormElement::setStyle( _style ); |
135 |
- |
136 |
- widget()->setAlignment(textAlignment()); |
137 |
-+ |
138 |
- bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage()); |
139 |
-- widget()->setClearButtonShown( showClearButton ); |
140 |
-- if (showClearButton) { |
141 |
-+ |
142 |
-+ if (!showClearButton && widget()->isClearButtonShown()) { |
143 |
-+ widget()->setClearButtonShown(false); |
144 |
-+ } |
145 |
-+ else if (showClearButton && !widget()->isClearButtonShown()) { |
146 |
-+ widget()->setClearButtonShown(true); |
147 |
- QObjectList children = widget()->children(); |
148 |
- foreach (QObject* object, children) { |
149 |
- QWidget *w = qobject_cast<QWidget*>(object); |
150 |
-- if (w && !w->isWindow()) { |
151 |
-+ if (w && !w->isWindow() && (w->objectName() == "KLineEditButton")) { |
152 |
- // this duplicates KHTMLView's handleWidget but this widget |
153 |
- // is created on demand, so it might not be here at ChildPolished time |
154 |
-- w->setObjectName("KHTMLLineEditButton"); |
155 |
- w->installEventFilter(view()); |
156 |
-- w->setAttribute(Qt::WA_NoSystemBackground); |
157 |
-- w->setAttribute(Qt::WA_WState_InPaintEvent); |
158 |
-- w->setAttribute(Qt::WA_OpaquePaintEvent); |
159 |
- } |
160 |
- } |
161 |
- } |
162 |
|
163 |
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild |
164 |
deleted file mode 100644 |
165 |
index 666193f..0000000 |
166 |
--- a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild |
167 |
+++ /dev/null |
168 |
@@ -1,313 +0,0 @@ |
169 |
-# Copyright 1999-2011 Gentoo Foundation |
170 |
-# Distributed under the terms of the GNU General Public License v2 |
171 |
-# $Header: $ |
172 |
- |
173 |
-EAPI=4 |
174 |
- |
175 |
-CPPUNIT_REQUIRED="optional" |
176 |
-DECLARATIVE_REQUIRED="always" |
177 |
-OPENGL_REQUIRED="optional" |
178 |
-KDE_SCM="git" |
179 |
-inherit kde4-base fdo-mime toolchain-funcs |
180 |
- |
181 |
-DESCRIPTION="KDE libraries needed by all KDE programs." |
182 |
-HOMEPAGE="http://www.kde.org/" |
183 |
- |
184 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
185 |
-LICENSE="LGPL-2.1" |
186 |
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos |
187 |
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev |
188 |
-+udisks +upower upnp zeroconf" |
189 |
- |
190 |
-REQUIRED_USE=" |
191 |
- udisks? ( udev ) |
192 |
- upower? ( udev ) |
193 |
-" |
194 |
- |
195 |
-# needs the kate regression testsuite from svn |
196 |
-RESTRICT="test" |
197 |
- |
198 |
-COMMONDEPEND=" |
199 |
- app-crypt/qca:2 |
200 |
- >=app-misc/strigi-0.7.6 |
201 |
- app-text/docbook-xml-dtd:4.2 |
202 |
- app-text/docbook-xsl-stylesheets |
203 |
- >=dev-libs/libattica-0.1.90 |
204 |
- >=dev-libs/libdbusmenu-qt-0.3.2 |
205 |
- dev-libs/libpcre[unicode] |
206 |
- dev-libs/libxml2 |
207 |
- dev-libs/libxslt |
208 |
- media-libs/fontconfig |
209 |
- media-libs/freetype:2 |
210 |
- media-libs/giflib |
211 |
- >=media-libs/libpng-1.4 |
212 |
- >=media-libs/phonon-4.4.3 |
213 |
- sys-libs/zlib |
214 |
- virtual/jpeg |
215 |
- >=x11-misc/shared-mime-info-0.60 |
216 |
- acl? ( virtual/acl ) |
217 |
- alsa? ( media-libs/alsa-lib ) |
218 |
- !aqua? ( |
219 |
- x11-libs/libICE |
220 |
- x11-libs/libSM |
221 |
- x11-libs/libX11 |
222 |
- x11-libs/libXau |
223 |
- x11-libs/libXcursor |
224 |
- x11-libs/libXdmcp |
225 |
- x11-libs/libXext |
226 |
- x11-libs/libXfixes |
227 |
- x11-libs/libXft |
228 |
- x11-libs/libXpm |
229 |
- x11-libs/libXrender |
230 |
- x11-libs/libXScrnSaver |
231 |
- x11-libs/libXtst |
232 |
- !kernel_SunOS? ( sys-libs/libutempter ) |
233 |
- ) |
234 |
- bzip2? ( app-arch/bzip2 ) |
235 |
- fam? ( virtual/fam ) |
236 |
- jpeg2k? ( media-libs/jasper ) |
237 |
- kerberos? ( virtual/krb5 ) |
238 |
- lzma? ( app-arch/xz-utils ) |
239 |
- openexr? ( |
240 |
- media-libs/openexr |
241 |
- media-libs/ilmbase |
242 |
- ) |
243 |
- policykit? ( >=sys-auth/polkit-qt-0.99 ) |
244 |
- semantic-desktop? ( |
245 |
- >=dev-libs/shared-desktop-ontologies-0.6.50 |
246 |
- >=dev-libs/soprano-2.6.51[dbus,raptor,redland] |
247 |
- ) |
248 |
- spell? ( app-text/enchant ) |
249 |
- ssl? ( dev-libs/openssl ) |
250 |
- udev? ( sys-fs/udev ) |
251 |
- upnp? ( media-libs/herqq ) |
252 |
- zeroconf? ( |
253 |
- || ( |
254 |
- net-dns/avahi[mdnsresponder-compat] |
255 |
- !bindist? ( net-misc/mDNSResponder ) |
256 |
- ) |
257 |
- ) |
258 |
-" |
259 |
-DEPEND="${COMMONDEPEND} |
260 |
- doc? ( app-doc/doxygen ) |
261 |
- nls? ( virtual/libintl ) |
262 |
-" |
263 |
-RDEPEND="${COMMONDEPEND} |
264 |
- !x11-libs/qt-phonon |
265 |
- >=app-crypt/gnupg-2.0.11 |
266 |
- app-misc/ca-certificates |
267 |
- $(add_kdebase_dep kde-env) |
268 |
- !aqua? ( |
269 |
- x11-apps/iceauth |
270 |
- x11-apps/rgb |
271 |
- >=x11-misc/xdg-utils-1.0.2-r3 |
272 |
- udisks? ( sys-fs/udisks ) |
273 |
- upower? ( sys-power/upower ) |
274 |
- ) |
275 |
-" |
276 |
-PDEPEND=" |
277 |
- || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) |
278 |
- handbook? ( $(add_kdebase_dep khelpcenter) ) |
279 |
- policykit? ( |
280 |
- >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 |
281 |
- >=sys-auth/polkit-kde-agent-0.99 |
282 |
- ) |
283 |
- semantic-desktop? ( $(add_kdebase_dep nepomuk) ) |
284 |
-" |
285 |
- |
286 |
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities |
287 |
-add_blocker plasma-workspace 4.7.1 |
288 |
- |
289 |
-PATCHES=( |
290 |
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
291 |
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
292 |
- "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" |
293 |
- "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
294 |
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
295 |
- "${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
296 |
- "${FILESDIR}/${PN}-4.7.1-clearbutton.patch" |
297 |
- "${FILESDIR}/${PN}-4.7.1-libpng15.patch" |
298 |
-) |
299 |
- |
300 |
-pkg_pretend() { |
301 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
302 |
- [[ $(gcc-major-version) -lt 4 ]] || \ |
303 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
304 |
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
305 |
- fi |
306 |
-} |
307 |
- |
308 |
-src_prepare() { |
309 |
- kde4-base_src_prepare |
310 |
- use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
311 |
- |
312 |
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
313 |
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
314 |
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
315 |
- |
316 |
- if use aqua; then |
317 |
- sed -i -e \ |
318 |
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
319 |
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
320 |
- |
321 |
- #if [[ ${CHOST} == *-darwin8 ]]; then |
322 |
- sed -i -e \ |
323 |
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
324 |
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
325 |
- #fi |
326 |
- |
327 |
- # solid/solid/backends/iokit doesn't properly link, so disable it. |
328 |
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
329 |
- || die "disabling solid/solid/backends/iokit failed" |
330 |
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
331 |
- || die "disabling solid/solid/backends/iokit failed" |
332 |
- |
333 |
- # There's no fdatasync on OSX and the check fails to detect that. |
334 |
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
335 |
- || die "disabling fdatasync failed" |
336 |
- |
337 |
- # Fix nameser include to nameser8_compat |
338 |
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
339 |
- || die "fixing nameser include failed" |
340 |
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
341 |
- |
342 |
- # Try to fix kkeyserver_mac |
343 |
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
344 |
- fi |
345 |
- |
346 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
347 |
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" |
348 |
- # getgrouplist not in solaris libc |
349 |
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" |
350 |
- # solaris has no d_type element in dir_ent |
351 |
- epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" |
352 |
- fi |
353 |
-} |
354 |
- |
355 |
-src_configure() { |
356 |
- if use zeroconf; then |
357 |
- if has_version net-dns/avahi; then |
358 |
- mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) |
359 |
- elif has_version net-misc/mDNSResponder; then |
360 |
- mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) |
361 |
- else |
362 |
- die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." |
363 |
- fi |
364 |
- else |
365 |
- mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) |
366 |
- fi |
367 |
- mycmakeargs+=( |
368 |
- -DWITH_HSPELL=OFF |
369 |
- -DWITH_ASPELL=OFF |
370 |
- -DKDE_DEFAULT_HOME=.kde4 |
371 |
- -DKAUTH_BACKEND=POLKITQT-1 |
372 |
- -DBUILD_libkactivities=OFF |
373 |
- $(cmake-utils_use_build handbook doc) |
374 |
- $(cmake-utils_use_has 3dnow X86_3DNOW) |
375 |
- $(cmake-utils_use_has altivec PPC_ALTIVEC) |
376 |
- $(cmake-utils_use_has mmx X86_MMX) |
377 |
- $(cmake-utils_use_has sse X86_SSE) |
378 |
- $(cmake-utils_use_has sse2 X86_SSE2) |
379 |
- $(cmake-utils_use_with acl) |
380 |
- $(cmake-utils_use_with alsa) |
381 |
- $(cmake-utils_use_with bzip2 BZip2) |
382 |
- $(cmake-utils_use_with fam) |
383 |
- $(cmake-utils_use_with jpeg2k Jasper) |
384 |
- $(cmake-utils_use_with kerberos GSSAPI) |
385 |
- $(cmake-utils_use_with lzma LibLZMA) |
386 |
- $(cmake-utils_use_with nls Libintl) |
387 |
- $(cmake-utils_use_with openexr OpenEXR) |
388 |
- $(cmake-utils_use_with opengl OpenGL) |
389 |
- $(cmake-utils_use_with policykit PolkitQt-1) |
390 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
391 |
- $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) |
392 |
- $(cmake-utils_use_with spell ENCHANT) |
393 |
- $(cmake-utils_use_with ssl OpenSSL) |
394 |
- $(cmake-utils_use_with udev UDev) |
395 |
- $(cmake-utils_use_with upnp HUpnp) |
396 |
- ) |
397 |
- kde4-base_src_configure |
398 |
-} |
399 |
- |
400 |
-src_compile() { |
401 |
- kde4-base_src_compile |
402 |
- |
403 |
- # The building of apidox is not managed anymore by the build system |
404 |
- if use doc; then |
405 |
- einfo "Building API documentation" |
406 |
- cd "${S}"/doc/api/ |
407 |
- ./doxygen.sh "${S}" || die "APIDOX generation failed" |
408 |
- fi |
409 |
-} |
410 |
- |
411 |
-src_install() { |
412 |
- kde4-base_src_install |
413 |
- |
414 |
- # use system certificates |
415 |
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
416 |
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
417 |
- |
418 |
- if use doc; then |
419 |
- einfo "Installing API documentation. This could take a bit of time." |
420 |
- cd "${S}"/doc/api/ |
421 |
- docinto /HTML/en/kdelibs-apidox |
422 |
- dohtml -r ${P}-apidocs/* |
423 |
- fi |
424 |
- |
425 |
- if use aqua; then |
426 |
- einfo "fixing ${PN} plugins" |
427 |
- |
428 |
- local _PV=${PV:0:3}.0 |
429 |
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
430 |
- |
431 |
- install_name_tool -id \ |
432 |
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
433 |
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
434 |
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
435 |
- |
436 |
- einfo "fixing ${PN} cmake detection files" |
437 |
- #sed -i -e \ |
438 |
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
439 |
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
440 |
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
441 |
- || die "failed fixing FindXKB.cmake" |
442 |
- fi |
443 |
- |
444 |
- einfo Installing environment file. |
445 |
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
446 |
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
447 |
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
448 |
- doenvd "${T}/77kde" |
449 |
-} |
450 |
- |
451 |
-pkg_postinst() { |
452 |
- fdo-mime_mime_database_update |
453 |
- |
454 |
- if use zeroconf; then |
455 |
- echo |
456 |
- elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
457 |
- elog "is running." |
458 |
- echo |
459 |
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
460 |
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
461 |
- einfo "to include 'mdns', e.g.:" |
462 |
- einfo " hosts: files mdns dns" |
463 |
- echo |
464 |
- fi |
465 |
- |
466 |
- elog "Your homedir is set to \${HOME}/.kde4" |
467 |
- echo |
468 |
- |
469 |
- kde4-base_pkg_postinst |
470 |
-} |
471 |
- |
472 |
-pkg_prerm() { |
473 |
- # Remove ksycoca4 global database |
474 |
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
475 |
-} |
476 |
- |
477 |
-pkg_postrm() { |
478 |
- fdo-mime_mime_database_update |
479 |
- |
480 |
- kde4-base_pkg_postrm |
481 |
-} |
482 |
|
483 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild |
484 |
deleted file mode 100644 |
485 |
index 800c0d7..0000000 |
486 |
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.1-r1.ebuild |
487 |
+++ /dev/null |
488 |
@@ -1,143 +0,0 @@ |
489 |
-# Copyright 1999-2011 Gentoo Foundation |
490 |
-# Distributed under the terms of the GNU General Public License v2 |
491 |
-# $Header: $ |
492 |
- |
493 |
-EAPI=3 |
494 |
- |
495 |
-KDE_HANDBOOK="optional" |
496 |
-KMNAME="kde-workspace" |
497 |
-KMMODULE="plasma" |
498 |
-PYTHON_DEPEND="python? 2" |
499 |
-inherit python kde4-meta |
500 |
- |
501 |
-DESCRIPTION="Plasma: KDE desktop framework" |
502 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
503 |
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama" |
504 |
- |
505 |
-COMMONDEPEND=" |
506 |
- $(add_kdebase_dep kactivities) |
507 |
- $(add_kdebase_dep kdelibs 'semantic-desktop=') |
508 |
- $(add_kdebase_dep kephal) |
509 |
- $(add_kdebase_dep ksysguard) |
510 |
- $(add_kdebase_dep libkworkspace) |
511 |
- $(add_kdebase_dep libplasmagenericshell) |
512 |
- $(add_kdebase_dep libtaskmanager) |
513 |
- $(add_kdebase_dep solid) |
514 |
- x11-libs/libXcomposite |
515 |
- x11-libs/libXdamage |
516 |
- x11-libs/libXfixes |
517 |
- x11-libs/libXrender |
518 |
- google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] ) |
519 |
- gps? ( >=sci-geosciences/gpsd-2.37 ) |
520 |
- python? ( |
521 |
- >=dev-python/PyQt4-4.4.0[X] |
522 |
- >=dev-python/sip-4.7.1 |
523 |
- $(add_kdebase_dep pykde4) |
524 |
- ) |
525 |
- qalculate? ( sci-libs/libqalculate ) |
526 |
- rss? ( |
527 |
- $(add_kdebase_dep kdepimlibs 'semantic-desktop=') |
528 |
- $(add_kdebase_dep libplasmaclock 'holidays') |
529 |
- ) |
530 |
- !rss? ( $(add_kdebase_dep libplasmaclock '-holidays') ) |
531 |
- xinerama? ( x11-libs/libXinerama ) |
532 |
-" |
533 |
-DEPEND="${COMMONDEPEND} |
534 |
- rss? ( dev-libs/boost ) |
535 |
- x11-proto/compositeproto |
536 |
- x11-proto/damageproto |
537 |
- x11-proto/fixesproto |
538 |
- x11-proto/renderproto |
539 |
- xinerama? ( x11-proto/xineramaproto ) |
540 |
-" |
541 |
-RDEPEND="${COMMONDEPEND} |
542 |
- $(add_kdebase_dep activitymanager) |
543 |
- $(add_kdebase_dep plasma-runtime) |
544 |
-" |
545 |
- |
546 |
-KMEXTRA=" |
547 |
- statusnotifierwatcher/ |
548 |
-" |
549 |
-KMEXTRACTONLY=" |
550 |
- krunner/dbus/org.freedesktop.ScreenSaver.xml |
551 |
- krunner/dbus/org.kde.krunner.App.xml |
552 |
- ksmserver/org.kde.KSMServerInterface.xml |
553 |
- libs/kephal/ |
554 |
- libs/kworkspace/ |
555 |
- libs/taskmanager/ |
556 |
- libs/plasmagenericshell/ |
557 |
- libs/ksysguard/ |
558 |
- ksysguard/ |
559 |
-" |
560 |
- |
561 |
-KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" |
562 |
- |
563 |
-PATCHES=( |
564 |
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" |
565 |
-) |
566 |
- |
567 |
-pkg_setup() { |
568 |
- python_set_active_version 2 |
569 |
- kde4-meta_pkg_setup |
570 |
-} |
571 |
- |
572 |
-src_unpack() { |
573 |
- if use handbook; then |
574 |
- KMEXTRA+=" doc/plasma-desktop" |
575 |
- fi |
576 |
- |
577 |
- kde4-meta_src_unpack |
578 |
-} |
579 |
- |
580 |
-src_prepare() { |
581 |
- sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die |
582 |
- |
583 |
- kde4-meta_src_prepare |
584 |
-} |
585 |
- |
586 |
-src_configure() { |
587 |
- mycmakeargs=( |
588 |
- $(cmake-utils_use_with google-gadgets Googlegadgets) |
589 |
- $(cmake-utils_use_with gps libgps) |
590 |
- $(cmake-utils_use_with python SIP) |
591 |
- $(cmake-utils_use_with python PyQt4) |
592 |
- $(cmake-utils_use_with python PyKDE4) |
593 |
- $(cmake-utils_use_with qalculate) |
594 |
- $(cmake-utils_use_with rss KdepimLibs) |
595 |
- $(cmake-utils_use_with semantic-desktop Akonadi) |
596 |
- $(cmake-utils_use_with semantic-desktop Nepomuk) |
597 |
- $(cmake-utils_use_with semantic-desktop Soprano) |
598 |
- $(cmake-utils_use_with xinerama X11_Xinerama) |
599 |
- -DWITH_Xmms=OFF |
600 |
- ) |
601 |
- |
602 |
- kde4-meta_src_configure |
603 |
-} |
604 |
- |
605 |
-src_install() { |
606 |
- kde4-meta_src_install |
607 |
- |
608 |
- rm -f \ |
609 |
- "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ |
610 |
- "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] |
611 |
-} |
612 |
- |
613 |
-pkg_postinst() { |
614 |
- kde4-meta_pkg_postinst |
615 |
- |
616 |
- if use python; then |
617 |
- python_mod_optimize \ |
618 |
- PyKDE4 \ |
619 |
- /usr/share/apps/plasma_scriptengine_python |
620 |
- fi |
621 |
-} |
622 |
- |
623 |
-pkg_postrm() { |
624 |
- kde4-meta_pkg_postrm |
625 |
- |
626 |
- if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then |
627 |
- python_mod_cleanup \ |
628 |
- PyKDE4 \ |
629 |
- /usr/share/apps/plasma_scriptengine_python |
630 |
- fi |
631 |
-} |