Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdebase-startkde: ChangeLog kdebase-startkde-4.1.2.ebuild
Date: Thu, 02 Oct 2008 12:10:29
Message-Id: E1KlN0k-000098-B6@stork.gentoo.org
1 jmbsvicetto 08/10/02 12:10:26
2
3 Modified: ChangeLog
4 Added: kdebase-startkde-4.1.2.ebuild
5 Log:
6 Added a missing patch file.
7 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
8
9 Revision Changes Path
10 1.128 kde-base/kdebase-startkde/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.128&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?rev=1.128&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/ChangeLog?r1=1.127&r2=1.128
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v
19 retrieving revision 1.127
20 retrieving revision 1.128
21 diff -u -r1.127 -r1.128
22 --- ChangeLog 28 Sep 2008 17:24:53 -0000 1.127
23 +++ ChangeLog 2 Oct 2008 12:10:25 -0000 1.128
24 @@ -1,6 +1,12 @@
25 # ChangeLog for kde-base/kdebase-startkde
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.127 2008/09/28 17:24:53 cryos Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.128 2008/10/02 12:10:25 jmbsvicetto Exp $
29 +
30 +*kdebase-startkde-4.1.2 (02 Oct 2008)
31 +
32 + 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
33 + +files/gentoo-startkde4.patch, +kdebase-startkde-4.1.2.ebuild:
34 + Added a missing patch file.
35
36 *kdebase-startkde-3.5.10-r2 (28 Sep 2008)
37
38
39
40
41 1.1 kde-base/kdebase-startkde/kdebase-startkde-4.1.2.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.1.2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.1.2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: kdebase-startkde-4.1.2.ebuild
47 ===================================================================
48 # Copyright 1999-2008 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.1.2.ebuild,v 1.1 2008/10/02 12:10:25 jmbsvicetto Exp $
51
52 EAPI="2"
53
54 KMNAME=kdebase-workspace
55 KMNOMODULE=true
56 inherit kde4-meta multilib
57
58 DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
59 KEYWORDS="~amd64 ~x86"
60 IUSE=""
61
62 DEPEND=""
63 # The KDE apps called from the startkde script.
64 # These provide the most minimal KDE desktop.
65 RDEPEND="${DEPEND}
66 >=kde-base/kcminit-${PV}:${SLOT}
67 >=kde-base/kdebase-data-${PV}:${SLOT}
68 >=kde-base/kdebase-kioslaves-${PV}:${SLOT}
69 >=kde-base/kde-wallpapers-${PV}:${SLOT}
70 >=kde-base/knotify-${PV}:${SLOT}
71 >=kde-base/kreadconfig-${PV}:${SLOT}
72 >=kde-base/krunner-${PV}:${SLOT}
73 >=kde-base/ksmserver-${PV}:${SLOT}
74 >=kde-base/ksplash-${PV}:${SLOT}
75 >=kde-base/kstartupconfig-${PV}:${SLOT}
76 >=kde-base/kstyles-${PV}:${SLOT}
77 >=kde-base/kwin-${PV}:${SLOT}
78 >=kde-base/plasma-apps-${PV}:${SLOT}
79 >=kde-base/plasma-workspace-${PV}:${SLOT}
80 >=kde-base/systemsettings-${PV}:${SLOT}
81 x11-apps/xmessage
82 x11-apps/xsetroot
83 x11-apps/xset
84 x11-apps/xrandr
85 x11-apps/mkfontdir
86 x11-apps/xprop"
87
88 KMEXTRACTONLY="startkde.cmake
89 ConfigureChecks.cmake
90 kdm/
91 safestartkde.cmake"
92 KMCOMPILEONLY="kdm/kfrontend/sessions/"
93
94 PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
95
96 src_configure() {
97 # Patch the startkde script to setup the environment for KDE 4.0
98 # Add our KDEDIR
99 if use kdeprefix; then
100 sed -e "s#@REPLACE_LDFLAGS@#export LFFLAGS=${_libdirs}:\$LDFAGS#" \
101 -i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
102 else
103 sed -e "s#@REPLACE_LDFLAGS@##" -i "${S}/startkde.cmake" || \
104 die "sed for LDPATH failed"
105 fi
106 # List all the multilib libdirs
107 local _libdir _libdirs
108 for _libdir in $(get_all_libdirs); do
109 _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
110 done
111 _libdirs=${_libdirs#:}
112
113 # Complete LDPATH
114 sed -e "s#@REPLACE_LIBS@#${_libdirs}#" \
115 -i "${S}/startkde.cmake" || die "Sed for LDPATH failed."
116
117 kde4-meta_src_configure
118 }
119
120 src_install() {
121 local DIR
122
123 kde4-meta_src_install
124
125 # startup and shutdown scripts
126 if use kdeprefix; then
127 insinto "${KDEDIR}/env"
128 else
129 insinto "/etc/kde/startup"
130 fi
131 doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
132
133 if use kdeprefix; then
134 exeinto "${KDEDIR}/shutdown"
135 else
136 exeinto "/etc/kde/shutdown"
137 fi
138 doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
139
140 # freedesktop environment variables
141 cat <<-EOF > "${T}/xdg.sh"
142 export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
143 export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
144 EOF
145 if use kdeprefix; then
146 insinto "${KDEDIR}/env"
147 else
148 insinto "/etc/kde/startup"
149 fi
150 doins "${T}/xdg.sh" || die "doins xdg.sh failed"
151
152 # Set DIR to S{SLOT} for the kde-4 and kde-svn slot or kde-${SLOT} for all other slots
153 case "${SLOT}" in
154 kde-4 | kde-svn) DIR="${SLOT}" ;;
155 *) DIR="kde-${SLOT}"
156 esac
157
158 # x11 session script
159 cat <<-EOF > "${T}/${DIR}"
160 #!/bin/sh
161 exec ${KDEDIR}/bin/startkde
162 EOF
163 exeinto /etc/X11/Sessions
164 doexe "${T}/${DIR}" || die "doexe ${DIR} failed"
165
166 # freedesktop compliant session script
167 local KDE_X
168 if use kdeprefix; then
169 KDE_X="KDE-${SLOT}"
170 else
171 KDE_X="KDE-4"
172 fi
173 sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
174 "${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
175 insinto /usr/share/xsessions
176 doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
177 }
178
179 pkg_postinst () {
180 kde4-meta_pkg_postinst
181
182 echo
183 elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
184 if use kdeprefix; then
185 elog "edit ${KDEDIR}/env/agent-startup.sh and"
186 elog "${KDEDIR}/shutdown/agent-shutdown.sh"
187 else
188 elog "edit /etc/kde/startup/agent-startup.sh and"
189 elog "/etc/kde/shutdown/agent-shutdown.sh"
190 fi
191 echo
192 }