Gentoo Archives: gentoo-commits

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