Gentoo Archives: gentoo-commits

From: "Dror Levin (spatz)" <spatz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdebase-startkde: kdebase-startkde-4.4.2.ebuild ChangeLog
Date: Tue, 30 Mar 2010 19:51:30
Message-Id: E1NwhTD-0006gG-U8@stork.gentoo.org
1 spatz 10/03/30 19:51:27
2
3 Modified: ChangeLog
4 Added: kdebase-startkde-4.4.2.ebuild
5 Log:
6 Version bump KDE 4.4.2
7 (Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
8
9 Revision Changes Path
10 1.200 kde-base/kdebase-startkde/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.200&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.200&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?r1=1.199&r2=1.200
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v
19 retrieving revision 1.199
20 retrieving revision 1.200
21 diff -u -r1.199 -r1.200
22 --- ChangeLog 11 Mar 2010 18:34:28 -0000 1.199
23 +++ ChangeLog 30 Mar 2010 19:51:27 -0000 1.200
24 @@ -1,6 +1,11 @@
25 # ChangeLog for kde-base/kdebase-startkde
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.199 2010/03/11 18:34:28 ranger Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.200 2010/03/30 19:51:27 spatz Exp $
29 +
30 +*kdebase-startkde-4.4.2 (30 Mar 2010)
31 +
32 + 30 Mar 2010; Dror Levin <spatz@g.o> +kdebase-startkde-4.4.2.ebuild:
33 + Version bump
34
35 11 Mar 2010; Brent Baude <ranger@g.o>
36 kdebase-startkde-4.3.5.ebuild:
37
38
39
40 1.1 kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild?rev=1.1&content-type=text/plain
44
45 Index: kdebase-startkde-4.4.2.ebuild
46 ===================================================================
47 # Copyright 1999-2010 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.4.2.ebuild,v 1.1 2010/03/30 19:51:27 spatz Exp $
50
51 EAPI="3"
52
53 KMNAME="kdebase-workspace"
54 KMNOMODULE="true"
55 inherit kde4-meta multilib prefix
56
57 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
58 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
59 IUSE=""
60
61 # The KDE apps called from the startkde script.
62 # These provide the most minimal KDE desktop.
63 RDEPEND="
64 $(add_kdebase_dep kcminit)
65 $(add_kdebase_dep kdebase-runtime-meta)
66 $(add_kdebase_dep kdebase-wallpapers)
67 $(add_kdebase_dep kfmclient)
68 $(add_kdebase_dep knotify)
69 $(add_kdebase_dep kreadconfig)
70 $(add_kdebase_dep krunner)
71 $(add_kdebase_dep ksmserver)
72 $(add_kdebase_dep ksplash)
73 $(add_kdebase_dep kstartupconfig)
74 $(add_kdebase_dep kwin)
75 $(add_kdebase_dep phonon-kde)
76 $(add_kdebase_dep plasma-apps)
77 $(add_kdebase_dep plasma-workspace)
78 $(add_kdebase_dep systemsettings)
79 x11-apps/mkfontdir
80 x11-apps/xmessage
81 x11-apps/xprop
82 x11-apps/xrandr
83 x11-apps/xrdb
84 x11-apps/xsetroot
85 x11-apps/xset
86 "
87
88 KMEXTRACTONLY="
89 ConfigureChecks.cmake
90 kdm/
91 safestartkde.cmake
92 startkde.cmake
93 "
94
95 PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
96
97 src_prepare() {
98 kde4-meta_src_prepare
99
100 # Patch the startkde script to setup the environment for KDE
101 # List all the multilib libdirs
102 local _libdir _libdirs=
103 for _libdir in $(get_all_libdirs); do
104 _libdirs+=":${EKDEDIR}/${_libdir}"
105 done
106 _libdirs=${_libdirs#:}
107
108 # Sort the LDFLAGS out if necessary
109 if use kdeprefix; then
110 sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
111 -i startkde.cmake || die "Sed for LDPATH failed."
112 else
113 sed -e "s#@REPLACE_LDFLAGS@##" \
114 -i startkde.cmake || die "sed for LDPATH failed"
115 fi
116
117 # Complete LDPATH
118 sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
119 -i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
120 # Now fix the prefix
121 sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
122 -i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
123 # ... and fix ${EPREFIX}
124 eprefixify startkde.cmake
125 }
126
127 src_install() {
128 kde4-meta_src_install
129
130 # startup and shutdown scripts
131 if use kdeprefix; then
132 insinto "${KDEDIR}/env"
133 else
134 insinto "/etc/kde/startup"
135 fi
136 doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
137
138 if use kdeprefix; then
139 exeinto "${KDEDIR}/shutdown"
140 else
141 exeinto "/etc/kde/shutdown"
142 fi
143 doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
144
145 if use kdeprefix; then
146 KDE_X="KDE-${SLOT}"
147 else
148 KDE_X="KDE-4"
149 fi
150
151 # x11 session script
152 cat <<-EOF > "${T}/${KDE_X}"
153 #!/bin/sh
154 exec "${EKDEDIR}/bin/startkde"
155 EOF
156 exeinto /etc/X11/Sessions
157 doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
158
159 # freedesktop compliant session script
160 sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
161 "${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
162 insinto /usr/share/xsessions
163 doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
164 }
165
166 pkg_postinst () {
167 kde4-meta_pkg_postinst
168
169 echo
170 elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
171 if use kdeprefix; then
172 elog "edit ${EKDEDIR}/env/agent-startup.sh and"
173 elog "${EKDEDIR}/shutdown/agent-shutdown.sh"
174 else
175 elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
176 elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
177 fi
178 echo
179 elog "The name of the session script has changed."
180 elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
181 elog "configuration files, you will need to change it to"
182 elog "XSESSION=\"${KDE_X}\""
183 }