Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace: ChangeLog plasma-workspace-4.7.3-r7.ebuild plasma-workspace-4.7.3-r6.ebuild
Date: Tue, 29 Nov 2011 21:49:25
Message-Id: 20111129214908.56B8C2004B@flycatcher.gentoo.org
1 dilfridge 11/11/29 21:49:08
2
3 Modified: ChangeLog
4 Added: plasma-workspace-4.7.3-r7.ebuild
5 Removed: plasma-workspace-4.7.3-r6.ebuild
6 Log:
7 Another crash fix, bug 389991
8
9 (Portage version: 2.1.10.37/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.137 kde-base/plasma-workspace/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/ChangeLog?rev=1.137&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/ChangeLog?rev=1.137&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/ChangeLog?r1=1.136&r2=1.137
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v
21 retrieving revision 1.136
22 retrieving revision 1.137
23 diff -u -r1.136 -r1.137
24 --- ChangeLog 24 Nov 2011 22:33:17 -0000 1.136
25 +++ ChangeLog 29 Nov 2011 21:49:08 -0000 1.137
26 @@ -1,6 +1,13 @@
27 # ChangeLog for kde-base/plasma-workspace
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.136 2011/11/24 22:33:17 dilfridge Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.137 2011/11/29 21:49:08 dilfridge Exp $
31 +
32 +*plasma-workspace-4.7.3-r7 (29 Nov 2011)
33 +
34 + 29 Nov 2011; Andreas K. Huettel <dilfridge@g.o>
35 + -plasma-workspace-4.7.3-r6.ebuild, +plasma-workspace-4.7.3-r7.ebuild,
36 + +files/plasma-workspace-4.7.3-deletedwidget.patch:
37 + Another crash fix, bug 389991
38
39 *plasma-workspace-4.7.3-r6 (24 Nov 2011)
40
41
42
43
44 1.1 kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild?rev=1.1&content-type=text/plain
48
49 Index: plasma-workspace-4.7.3-r7.ebuild
50 ===================================================================
51 # Copyright 1999-2011 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild,v 1.1 2011/11/29 21:49:08 dilfridge Exp $
54
55 EAPI=4
56
57 KDE_HANDBOOK="optional"
58 KMNAME="kde-workspace"
59 KMMODULE="plasma"
60 PYTHON_DEPEND="python? 2"
61 inherit python kde4-meta
62
63 DESCRIPTION="Plasma: KDE desktop framework"
64 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
65 IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
66
67 COMMONDEPEND="
68 $(add_kdebase_dep kactivities)
69 $(add_kdebase_dep kdelibs 'semantic-desktop=')
70 $(add_kdebase_dep kephal)
71 $(add_kdebase_dep ksysguard)
72 $(add_kdebase_dep libkworkspace)
73 $(add_kdebase_dep libplasmagenericshell)
74 $(add_kdebase_dep libtaskmanager)
75 $(add_kdebase_dep solid)
76 x11-libs/libXcomposite
77 x11-libs/libXdamage
78 x11-libs/libXfixes
79 x11-libs/libXrender
80 google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
81 gps? ( >=sci-geosciences/gpsd-2.37 )
82 python? (
83 >=dev-python/PyQt4-4.4.0[X]
84 >=dev-python/sip-4.7.1
85 $(add_kdebase_dep pykde4)
86 )
87 qalculate? ( sci-libs/libqalculate )
88 rss? (
89 $(add_kdebase_dep kdepimlibs 'semantic-desktop=')
90 $(add_kdebase_dep libplasmaclock 'holidays')
91 )
92 !rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
93 xinerama? ( x11-libs/libXinerama )
94 "
95 DEPEND="${COMMONDEPEND}
96 rss? ( dev-libs/boost )
97 x11-proto/compositeproto
98 x11-proto/damageproto
99 x11-proto/fixesproto
100 x11-proto/renderproto
101 xinerama? ( x11-proto/xineramaproto )
102 "
103 RDEPEND="${COMMONDEPEND}
104 $(add_kdebase_dep activitymanager)
105 $(add_kdebase_dep plasma-runtime)
106 "
107
108 KMEXTRA="
109 statusnotifierwatcher/
110 "
111 KMEXTRACTONLY="
112 krunner/dbus/org.freedesktop.ScreenSaver.xml
113 krunner/dbus/org.kde.krunner.App.xml
114 ksmserver/org.kde.KSMServerInterface.xml
115 libs/kephal/
116 libs/kworkspace/
117 libs/taskmanager/
118 libs/plasmagenericshell/
119 libs/ksysguard/
120 ksysguard/
121 "
122
123 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
124
125 PATCHES=(
126 "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
127 "${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
128 "${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
129 "${FILESDIR}/${PN}-4.7.3-calendarcrash.patch"
130 "${FILESDIR}/${PN}-4.7.3-layoutcrash.patch"
131 "${FILESDIR}/${PN}-4.7.3-deletedwidget.patch"
132 )
133
134 pkg_setup() {
135 python_set_active_version 2
136 python_pkg_setup
137 kde4-meta_pkg_setup
138 }
139
140 src_unpack() {
141 if use handbook; then
142 KMEXTRA+=" doc/plasma-desktop"
143 fi
144
145 kde4-meta_src_unpack
146 }
147
148 src_prepare() {
149 sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
150
151 kde4-meta_src_prepare
152 }
153
154 src_configure() {
155 mycmakeargs=(
156 $(cmake-utils_use_with google-gadgets Googlegadgets)
157 $(cmake-utils_use_with gps libgps)
158 $(cmake-utils_use_with python SIP)
159 $(cmake-utils_use_with python PyQt4)
160 $(cmake-utils_use_with python PyKDE4)
161 $(cmake-utils_use_with qalculate)
162 $(cmake-utils_use_with rss KdepimLibs)
163 $(cmake-utils_use_with semantic-desktop Akonadi)
164 $(cmake-utils_use_with semantic-desktop Nepomuk)
165 $(cmake-utils_use_with semantic-desktop Soprano)
166 $(cmake-utils_use_with xinerama X11_Xinerama)
167 -DWITH_Xmms=OFF
168 )
169
170 kde4-meta_src_configure
171 }
172
173 src_install() {
174 kde4-meta_src_install
175
176 rm -f \
177 "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
178 "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
179 }
180
181 pkg_postinst() {
182 kde4-meta_pkg_postinst
183
184 if use python; then
185 python_mod_optimize \
186 PyKDE4 \
187 /usr/share/apps/plasma_scriptengine_python
188 fi
189 }
190
191 pkg_postrm() {
192 kde4-meta_pkg_postrm
193
194 if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
195 python_mod_cleanup \
196 PyKDE4 \
197 /usr/share/apps/plasma_scriptengine_python
198 fi
199 }