Gentoo Archives: gentoo-commits

From: Krzysztof Pawlik <nelchael@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/nelchael:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
Date: Fri, 30 Sep 2011 18:52:37
Message-Id: aac9aed0b1246c059b1b3ad9d24e846e2769c844.nelchael@gentoo
1 commit: aac9aed0b1246c059b1b3ad9d24e846e2769c844
2 Author: Krzysztof Pawlik <none <AT> none>
3 AuthorDate: Fri Sep 30 18:51:06 2011 +0000
4 Commit: Krzysztof Pawlik <nelchael <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 18:51:06 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/nelchael.git;a=commit;h=aac9aed0
7
8 Drop old version.
9
10 ---
11 kde-base/plasma-workspace/ChangeLog | 11 --
12 kde-base/plasma-workspace/Manifest | 4 -
13 ...-workspace-4.4.2-xinerama_cmake_automagic.patch | 18 ---
14 .../plasma-workspace/plasma-workspace-4.4.5.ebuild | 124 --------------------
15 4 files changed, 0 insertions(+), 157 deletions(-)
16
17 diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
18 deleted file mode 100644
19 index 8e81bcd..0000000
20 --- a/kde-base/plasma-workspace/ChangeLog
21 +++ /dev/null
22 @@ -1,11 +0,0 @@
23 -# ChangeLog for kde-base/plasma-workspace
24 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: $
26 -
27 -*plasma-workspace-4.4.5 (29 Nov 2010)
28 -
29 - 29 Nov 2010; Krzysztof Pawlik <nelchael@g.o>
30 - +files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch,
31 - +plasma-workspace-4.4.5.ebuild:
32 - Add plasma-workspace with a small sed fix to compile against current Qt.
33 -
34
35 diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
36 deleted file mode 100644
37 index 45aab12..0000000
38 --- a/kde-base/plasma-workspace/Manifest
39 +++ /dev/null
40 @@ -1,4 +0,0 @@
41 -AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
42 -DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
43 -EBUILD plasma-workspace-4.4.5.ebuild 3013 RMD160 1bc55e888d89101726049f456bc67535545bfaee SHA1 2ad27523e0038ce180fce39906673faa4ccf9399 SHA256 5bf18d5f354e5039f43992d30d1f634a827bedc9ee2b3f094f98b35fffb8bbfe
44 -MISC ChangeLog 393 RMD160 8ad3018eeaca4f845f2d23531f8dee1b77fb8c02 SHA1 06e2a22abcc6567d5aa395cb92d3da16f385c942 SHA256 803d771ef3884bee2d1c2b31d9da6ee60d833632d91facaaecab4586a200e4c6
45
46 diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
47 deleted file mode 100644
48 index 5596f41..0000000
49 --- a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
50 +++ /dev/null
51 @@ -1,18 +0,0 @@
52 -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
53 ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100
54 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200
55 -@@ -71,7 +71,14 @@
56 - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
57 - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
58 - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
59 -+
60 -+if(NOT WITH_X11_Xinerama)
61 -+ set(X11_Xinerama_FOUND FALSE)
62 -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
63 -+endif(NOT WITH_X11_Xinerama)
64 -+
65 - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
66 -+
67 - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
68 - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
69 - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
70
71 diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.5.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.5.ebuild
72 deleted file mode 100644
73 index 68e1046..0000000
74 --- a/kde-base/plasma-workspace/plasma-workspace-4.4.5.ebuild
75 +++ /dev/null
76 @@ -1,124 +0,0 @@
77 -# Copyright 1999-2010 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.5.ebuild,v 1.5 2010/08/09 17:34:34 scarabeus Exp $
80 -
81 -EAPI="3"
82 -
83 -KMNAME="kdebase-workspace"
84 -KMMODULE="plasma"
85 -PYTHON_DEPEND="python? 2"
86 -inherit python kde4-meta
87 -
88 -DESCRIPTION="Plasma: KDE desktop framework"
89 -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
90 -IUSE="debug +handbook google-gadgets python rss semantic-desktop xinerama"
91 -
92 -COMMONDEPEND="
93 - $(add_kdebase_dep kdelibs 'semantic-desktop?')
94 - $(add_kdebase_dep kephal)
95 - $(add_kdebase_dep ksysguard)
96 - $(add_kdebase_dep libkworkspace)
97 - $(add_kdebase_dep libplasmaclock)
98 - $(add_kdebase_dep libplasmagenericshell)
99 - $(add_kdebase_dep libtaskmanager)
100 - $(add_kdebase_dep solid)
101 - x11-libs/libXcomposite
102 - x11-libs/libXdamage
103 - x11-libs/libXfixes
104 - x11-libs/libXrender
105 - google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
106 - python? (
107 - >=dev-python/PyQt4-4.4.0[X]
108 - >=dev-python/sip-4.7.1
109 - $(add_kdebase_dep pykde4)
110 - )
111 - rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
112 - xinerama? ( x11-libs/libXinerama )
113 -"
114 -DEPEND="${COMMONDEPEND}
115 - x11-proto/compositeproto
116 - x11-proto/damageproto
117 - x11-proto/fixesproto
118 - x11-proto/renderproto
119 - xinerama? ( x11-proto/xineramaproto )
120 -"
121 -RDEPEND="${COMMONDEPEND}
122 - $(add_kdebase_dep plasma-runtime)
123 -"
124 -
125 -KMEXTRACTONLY="
126 - krunner/dbus/org.freedesktop.ScreenSaver.xml
127 - krunner/dbus/org.kde.krunner.App.xml
128 - ksmserver/org.kde.KSMServerInterface.xml
129 - libs/kworkspace/
130 - libs/taskmanager/
131 - libs/plasmagenericshell/
132 - libs/ksysguard/
133 - ksysguard/
134 -"
135 -
136 -KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
137 -
138 -PATCHES=(
139 - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
140 -)
141 -
142 -pkg_setup() {
143 - python_set_active_version 2
144 - kde4-meta_pkg_setup
145 -}
146 -
147 -src_unpack() {
148 - if use handbook; then
149 - KMEXTRA+=" doc/plasma-desktop"
150 - fi
151 -
152 - kde4-meta_src_unpack
153 -
154 - sed -i -e 's, NOTIFY labelAlphaChanged,,g' \
155 - "${S}/plasma/generic/applets/battery/battery.h" || die
156 -}
157 -
158 -src_configure() {
159 - mycmakeargs=(
160 - $(cmake-utils_use_with google-gadgets Googlegadgets)
161 - $(cmake-utils_use_with python SIP)
162 - $(cmake-utils_use_with python PyQt4)
163 - $(cmake-utils_use_with python PyKDE4)
164 - $(cmake-utils_use_with rss KdepimLibs)
165 - $(cmake-utils_use_with semantic-desktop Nepomuk)
166 - $(cmake-utils_use_with semantic-desktop Soprano)
167 - $(cmake-utils_use_with xinerama X11_Xinerama)
168 - -DWITH_Xmms=OFF
169 - )
170 -
171 - kde4-meta_src_configure
172 -}
173 -
174 -src_install() {
175 - kde4-meta_src_install
176 -
177 - rm -f \
178 - "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
179 - "${ED}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
180 -}
181 -
182 -pkg_postinst() {
183 - kde4-meta_pkg_postinst
184 -
185 - if use python; then
186 - python_mod_optimize \
187 - PyKDE4 \
188 - "${KDEDIR}"/share/apps/plasma_scriptengine_python
189 - fi
190 -}
191 -
192 -pkg_postrm() {
193 - kde4-meta_pkg_postrm
194 -
195 - if [[ -d ${EKDEDIR}/share/apps/plasma_scriptengine_python ]]; then
196 - python_mod_cleanup \
197 - PyKDE4 \
198 - "${KDEDIR}"/share/apps/plasma_scriptengine_python
199 - fi
200 -}