summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2009-11-12 16:52:16 -0500
committerJonathan Callen <abcd@gentoo.org>2009-11-12 16:52:16 -0500
commit63c439da66a9a0841cd38b35b4d215cb7c6d5bb4 (patch)
tree9e4871907f35627a1e87448348d99782f963dfe8
parent7089854125f7a9af25393c631be6f4680c8f0965 (diff)
downloadkde-63c439da66a9a0841cd38b35b4d215cb7c6d5bb4.tar.gz
kde-63c439da66a9a0841cd38b35b4d215cb7c6d5bb4.tar.bz2
kde-63c439da66a9a0841cd38b35b4d215cb7c6d5bb4.zip
[kde-base/kdebase-startkde] Also change 4.3.74 (+revbump)
-rw-r--r--kde-base/kdebase-startkde/Manifest2
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.3.74-r1.ebuild (renamed from kde-base/kdebase-startkde/kdebase-startkde-4.3.74.ebuild)21
2 files changed, 13 insertions, 10 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 4a844e82bde..6cd77fb819e 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -2,7 +2,7 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1
AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
AUX gentoo-startkde4-1.patch 2361 RMD160 caeddd70bdcfe05fee59ad20a00262635c3c447d SHA1 9fb86f879ca15374e37554ced057e7329f68981c SHA256 c696de9156868788889d820e12c3e0255df2ee612624ce90080b4cebf163a1a9
DIST kdebase-workspace-4.3.74.tar.xz 60932980 RMD160 f9ef7643b8dd68a701df0ea202610f73096f9d0a SHA1 f615766bd6bc95ee7693e86a7ffe0013a8dcb316 SHA256 7a5ada921e9d1a5a0c5f16299ab6e7fc6367c9d9bec66e1d01dec524abcef82b
-EBUILD kdebase-startkde-4.3.74.ebuild 3593 RMD160 4e2225369802f9e678e94eee3c9074014c3f7240 SHA1 8f8f6a4dfef01456f6802c628a6b9993e3713475 SHA256 7ffcc796c8035eeea60a13182b4e3e2ee58b091fcd0bf4564dd56759346eaaff
+EBUILD kdebase-startkde-4.3.74-r1.ebuild 3766 RMD160 23f38357e97f3a9dfdbcc24e9e74107727253340 SHA1 e86d21d3bf48ed22e3237cd04a0486a6b8784dba SHA256 0c6d4d847da82604bf55bd27282993f1c6e90b6f459582743853bf93fb48e771
EBUILD kdebase-startkde-4.3.9999.ebuild 3724 RMD160 2349782461203d9c26ce0f27e1dd2d08e793199e SHA1 8064f7167204513017c350ba54d5780904f316d1 SHA256 5f31fb14bc28ef82376bea74198a4cf1886945a22b91ecdf1a97f227d1486b38
EBUILD kdebase-startkde-9999.ebuild 3724 RMD160 2349782461203d9c26ce0f27e1dd2d08e793199e SHA1 8064f7167204513017c350ba54d5780904f316d1 SHA256 5f31fb14bc28ef82376bea74198a4cf1886945a22b91ecdf1a97f227d1486b38
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.74.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.74-r1.ebuild
index 25d7aa1d79a..6ca62b9cd1c 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.74.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.74-r1.ebuild
@@ -101,22 +101,21 @@ src_install() {
fi
doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
+ if use kdeprefix; then
+ KDE_X="KDE-${SLOT}"
+ else
+ KDE_X="KDE-4"
+ fi
+
# x11 session script
- local DIR="kde-${SLOT}"
- cat <<-EOF > "${T}/${DIR}"
+ cat <<-EOF > "${T}/${KDE_X}"
#!/bin/sh
exec ${KDEDIR}/bin/startkde
EOF
exeinto /etc/X11/Sessions
- doexe "${T}/${DIR}" || die "doexe ${DIR} failed"
+ doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
# freedesktop compliant session script
- local KDE_X
- if use kdeprefix; then
- KDE_X="KDE-${SLOT}"
- else
- KDE_X="KDE-4"
- fi
sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
"${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop"
insinto /usr/share/xsessions
@@ -136,4 +135,8 @@ pkg_postinst () {
elog "/etc/kde/shutdown/agent-shutdown.sh"
fi
echo
+ elog "The name of the session script has changed."
+ elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
+ elog "configuration files, you will need to change it to"
+ elog "XSESSION=\"${KDE_X}\""
}