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