1 |
tgurr 08/01/11 20:46:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdebase-3.5.8-r6.ebuild |
5 |
Log: |
6 |
Add kdebase-3.5.8-r6.ebuild, fixes regression caused by the flash compatibility patch. |
7 |
(Portage version: 2.1.4_rc14) |
8 |
|
9 |
Revision Changes Path |
10 |
1.411 kde-base/kdebase/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?rev=1.411&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?rev=1.411&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/ChangeLog?r1=1.410&r2=1.411 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v |
19 |
retrieving revision 1.410 |
20 |
retrieving revision 1.411 |
21 |
diff -u -r1.410 -r1.411 |
22 |
--- ChangeLog 29 Dec 2007 17:31:25 -0000 1.410 |
23 |
+++ ChangeLog 11 Jan 2008 20:46:11 -0000 1.411 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for kde-base/kdebase |
26 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.410 2007/12/29 17:31:25 tgurr Exp $ |
28 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.411 2008/01/11 20:46:11 tgurr Exp $ |
30 |
+ |
31 |
+*kdebase-3.5.8-r6 (11 Jan 2008) |
32 |
+ |
33 |
+ 11 Jan 2008; Timo Gurr <tgurr@g.o> +kdebase-3.5.8-r6.ebuild: |
34 |
+ Add kdebase-3.5.8-r6.ebuild, fixes regression caused by the flash |
35 |
+ compatibility patch. |
36 |
|
37 |
*kdebase-3.5.8-r5 (29 Dec 2007) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 kde-base/kdebase/kdebase-3.5.8-r6.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/kdebase-3.5.8-r6.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase/kdebase-3.5.8-r6.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: kdebase-3.5.8-r6.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.8-r6.ebuild,v 1.1 2008/01/11 20:46:11 tgurr Exp $ |
52 |
|
53 |
inherit multilib kde-dist eutils flag-o-matic |
54 |
|
55 |
SRC_URI="${SRC_URI} |
56 |
mirror://gentoo/kdebase-3.5-patchset-10.tar.bz2" |
57 |
|
58 |
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." |
59 |
|
60 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
61 |
IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl |
62 |
pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" |
63 |
|
64 |
# hal: enables hal backend for 'media:' ioslave |
65 |
|
66 |
DEPEND=">=media-libs/freetype-2.3 |
67 |
media-libs/fontconfig |
68 |
dev-libs/openssl |
69 |
pam? ( kde-base/kdebase-pam ) |
70 |
>=dev-libs/cyrus-sasl-2 |
71 |
ldap? ( >=net-nds/openldap-2 ) |
72 |
cups? ( net-print/cups ) |
73 |
opengl? ( virtual/opengl ) |
74 |
openexr? ( >=media-libs/openexr-1.2.2-r2 ) |
75 |
samba? ( >=net-fs/samba-3.0.4 ) |
76 |
lm_sensors? ( sys-apps/lm_sensors ) |
77 |
logitech-mouse? ( >=dev-libs/libusb-0.1.10a ) |
78 |
ieee1394? ( sys-libs/libraw1394 ) |
79 |
hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* ) |
80 |
xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) |
81 |
x11-libs/libX11 |
82 |
x11-libs/libXau |
83 |
x11-libs/libXfixes |
84 |
x11-libs/libXrender |
85 |
x11-libs/libXtst |
86 |
x11-libs/libXext |
87 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
88 |
xinerama? ( x11-libs/libXinerama )" |
89 |
|
90 |
RDEPEND="${DEPEND} |
91 |
sys-apps/usbutils |
92 |
sys-devel/gdb |
93 |
java? ( >=virtual/jre-1.4 ) |
94 |
kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) |
95 |
virtual/ssh |
96 |
www-misc/htdig |
97 |
x11-apps/mkfontdir |
98 |
x11-apps/setxkbmap |
99 |
x11-apps/xinit |
100 |
|| ( x11-misc/xkeyboard-config x11-misc/xkbdata ) |
101 |
x11-apps/xmessage |
102 |
x11-apps/xprop |
103 |
x11-apps/xrandr |
104 |
x11-apps/xsetroot |
105 |
x11-apps/xset" |
106 |
|
107 |
DEPEND="${DEPEND} |
108 |
xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) |
109 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
110 |
xinerama? ( x11-proto/xineramaproto ) |
111 |
x11-apps/bdftopcf |
112 |
x11-apps/xhost" |
113 |
|
114 |
need-kde 3.5.8 |
115 |
|
116 |
EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff |
117 |
ksmserver-3.5.8-suspend_configure.diff" |
118 |
|
119 |
PATCHES="${FILESDIR}/ksmserver-3.5.8-gdm_interop_197133.patch |
120 |
${FILESDIR}/kdm-3.5.8-login.diff" |
121 |
|
122 |
pkg_setup() { |
123 |
kde_pkg_setup |
124 |
if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then |
125 |
eerror "To enable HAL support in this package is required to have" |
126 |
eerror "sys-apps/dbus compiled with Qt 3 support." |
127 |
eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." |
128 |
die "Please reemerge sys-apps/dbus with USE=\"qt3\"." |
129 |
fi |
130 |
} |
131 |
|
132 |
src_unpack() { |
133 |
kde_src_unpack |
134 |
|
135 |
# Avoid using imake (kde bug 114466). |
136 |
#epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" |
137 |
# ...included in patch set |
138 |
rm -f "${S}/configure" |
139 |
|
140 |
# FIXME - disable broken tests |
141 |
sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed" |
142 |
sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed" |
143 |
sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed" |
144 |
|
145 |
if ! use joystick ; then |
146 |
sed -e 's:$(JOYSTICK_SUBDIR)::' \ |
147 |
-e 's:kthememanager \\:kthememanager:' \ |
148 |
-i "${S}/kcontrol/Makefile.am" \ |
149 |
|| die "sed failed" |
150 |
fi |
151 |
if ! use arts ; then |
152 |
sed -e 's:arts::' \ |
153 |
-i "${S}/kcontrol/Makefile.am" \ |
154 |
|| die "sed failed" |
155 |
fi |
156 |
|
157 |
if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then |
158 |
einfo "User ${USER} has no X access, disabling some tests." |
159 |
for ioslave in media remote home system ; do |
160 |
sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ |
161 |
-i kioslave/${ioslave}/Makefile.am || die "sed failed" |
162 |
done |
163 |
fi |
164 |
} |
165 |
|
166 |
src_compile() { |
167 |
# Patch the startkde script to setup the environment for KDE 4.0 |
168 |
# Add our KDEDIR |
169 |
sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ |
170 |
"${S}/startkde" || die "Sed for PREFIX failed." |
171 |
|
172 |
# List all the multilib libdirs |
173 |
local _libdir _libdirs |
174 |
for _libdir in $(get_all_libdirs); do |
175 |
_libdirs="${_libdirs}:${PREFIX}/${_libdir}" |
176 |
done |
177 |
_libdirs=${_libdirs#:} |
178 |
|
179 |
# Complete LDPATH |
180 |
sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ |
181 |
"${S}/startkde" || die "Sed for LDPATH failed." |
182 |
|
183 |
local myconf="--with-dpms --enable-dnssd --with-sssl |
184 |
--with-usbids=/usr/share/misc/usb.ids |
185 |
$(use_with ieee1394 libraw1394) |
186 |
$(use_with hal) |
187 |
$(use_with ldap) |
188 |
$(use_with lm_sensors sensors) |
189 |
$(use_with logitech-mouse libusb) |
190 |
$(use_with openexr) |
191 |
$(use_with opengl gl) |
192 |
$(use_with pam) |
193 |
$(use_with samba) |
194 |
$(use_with xcomposite composite) |
195 |
$(use_with xinerama) |
196 |
$(use_with xscreensaver)" |
197 |
|
198 |
if ! use pam && use elibc_glibc; then |
199 |
myconf="${myconf} --with-shadow" |
200 |
fi |
201 |
|
202 |
# the java test is problematic (see kde bug 100729) and |
203 |
# useless. All that's needed for java applets to work is |
204 |
# to have the 'java' executable in PATH. |
205 |
myconf="${myconf} --without-java" |
206 |
|
207 |
export BINDNOW_FLAGS="$(bindnow-flags)" |
208 |
|
209 |
kde_src_compile |
210 |
} |
211 |
|
212 |
src_install() { |
213 |
kde_src_install |
214 |
cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install |
215 |
|
216 |
# startup and shutdown scripts |
217 |
insinto "${KDEDIR}/env" |
218 |
doins "${WORKDIR}/patches/agent-startup.sh" |
219 |
|
220 |
exeinto ${KDEDIR}/shutdown |
221 |
doexe "${WORKDIR}/patches/agent-shutdown.sh" |
222 |
|
223 |
# freedesktop environment variables |
224 |
cat <<EOF > "${T}/xdg.sh" |
225 |
export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" |
226 |
EOF |
227 |
insinto "${KDEDIR}/env" |
228 |
doins "${T}/xdg.sh" |
229 |
|
230 |
# x11 session script |
231 |
cat <<EOF > "${T}/kde-${SLOT}" |
232 |
#!/bin/sh |
233 |
exec ${KDEDIR}/bin/startkde |
234 |
EOF |
235 |
exeinto /etc/X11/Sessions |
236 |
doexe "${T}/kde-${SLOT}" |
237 |
|
238 |
# freedesktop compliant session script |
239 |
sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ |
240 |
"${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" |
241 |
insinto /usr/share/xsessions |
242 |
doins "${T}/kde-${SLOT}.desktop" |
243 |
|
244 |
# Customize the kdmrc configuration |
245 |
sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ |
246 |
"${D}/${KDEDIR}/share/config/kdm/kdmrc" || die |
247 |
|
248 |
rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" |
249 |
|
250 |
if use branding ; then |
251 |
dodir "${PREFIX}"/share/services/searchproviders |
252 |
insinto "${PREFIX}"/share/services/searchproviders |
253 |
doins "${WORKDIR}"/patches/*.desktop |
254 |
fi |
255 |
} |
256 |
|
257 |
pkg_preinst() { |
258 |
kde_pkg_preinst |
259 |
|
260 |
# We need to symlink here, as kfmclient freaks out completely, |
261 |
# if it does not find konqueror.desktop in the legacy path. |
262 |
dodir "${PREFIX}/share/applications/kde" |
263 |
dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop" |
264 |
} |
265 |
|
266 |
pkg_postinst() { |
267 |
kde_pkg_postinst |
268 |
|
269 |
# set the default kdm face icon if it's not already set by the system admin |
270 |
if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then |
271 |
mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" |
272 |
cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ |
273 |
"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" |
274 |
fi |
275 |
if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then |
276 |
mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" |
277 |
cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ |
278 |
"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" |
279 |
fi |
280 |
|
281 |
mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" |
282 |
|
283 |
echo |
284 |
elog "To enable gpg-agent and/or ssh-agent in KDE sessions," |
285 |
elog "edit ${KDEDIR}/env/agent-startup.sh and" |
286 |
elog "${KDEDIR}/shutdown/agent-shutdown.sh" |
287 |
echo |
288 |
if use branding ; then |
289 |
elog "We've added three Gentoo-related web shortcuts to Konqueror:" |
290 |
elog "- gb Gentoo Bugzilla searching" |
291 |
elog "- gf Gentoo Forums searching" |
292 |
elog "- gp Gentoo Package searching" |
293 |
echo |
294 |
elog "You'll have to activate them in 'Configure Konqueror...'." |
295 |
echo |
296 |
elog "If you can't open new konqueror windows and get something like" |
297 |
elog "'WARNING: Outdated database found' when starting konqueror in a console, run" |
298 |
elog "kbuildsycoca as the user you're running KDE under." |
299 |
elog "This is NOT a bug." |
300 |
echo |
301 |
fi |
302 |
} |
303 |
|
304 |
|
305 |
|
306 |
-- |
307 |
gentoo-commits@l.g.o mailing list |