Gentoo Archives: gentoo-commits

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