diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2011-06-12 22:57:37 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2011-06-12 22:57:37 +0000 |
commit | f7da02216b8f140ade639746ef5d9b3a2ba25b1f (patch) | |
tree | 06a17dc7e0b3f38302fd799205612d55f7ffb6de /kde-base | |
parent | Version bump. This fixes issues from bug #366107 and drops numerous patches ... (diff) | |
download | historical-f7da02216b8f140ade639746ef5d9b3a2ba25b1f.tar.gz historical-f7da02216b8f140ade639746ef5d9b3a2ba25b1f.tar.bz2 historical-f7da02216b8f140ade639746ef5d9b3a2ba25b1f.zip |
Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly
Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kde-env/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kde-env/kde-env-4.6.2.ebuild | 8 | ||||
-rw-r--r-- | kde-base/kde-env/kde-env-4.6.3.ebuild | 8 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild | 6 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild | 6 |
6 files changed, 24 insertions, 16 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog index f7eac612df2f..465060dcd1d1 100644 --- a/kde-base/kde-env/ChangeLog +++ b/kde-base/kde-env/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-env # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.107 2011/06/10 18:00:12 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.108 2011/06/12 22:54:49 abcd Exp $ + + 12 Jun 2011; Jonathan Callen <abcd@gentoo.org> kde-env-4.6.2.ebuild, + kde-env-4.6.3.ebuild: + Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly *kde-env-4.6.4 (10 Jun 2011) diff --git a/kde-base/kde-env/kde-env-4.6.2.ebuild b/kde-base/kde-env/kde-env-4.6.2.ebuild index fa15c3547285..1ed62692a091 100644 --- a/kde-base/kde-env/kde-env-4.6.2.ebuild +++ b/kde-base/kde-env/kde-env-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v 1.5 2011/06/06 20:30:06 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v 1.6 2011/06/12 22:54:49 abcd Exp $ EAPI=3 @@ -37,15 +37,15 @@ EOF doenvd 43kdepaths # Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env - cat <<EOF > 11-xdg-menu-kde-${SLOT} + cat <<EOF > 11-xdg-menu-kde-$(get_kde_version) #!/bin/sh if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then - export XDG_MENU_PREFIX="kde-${SLOT}-" + export XDG_MENU_PREFIX="kde-$(get_kde_version)-" fi EOF exeinto /etc/X11/xinit/xinitrc.d/ - doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed" + doexe 11-xdg-menu-kde-$(get_kde_version) || die "doexe failed" } pkg_preinst() { diff --git a/kde-base/kde-env/kde-env-4.6.3.ebuild b/kde-base/kde-env/kde-env-4.6.3.ebuild index 8289ba3b5a82..8d26cc50f91a 100644 --- a/kde-base/kde-env/kde-env-4.6.3.ebuild +++ b/kde-base/kde-env/kde-env-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v 1.5 2011/06/10 11:51:02 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v 1.6 2011/06/12 22:54:49 abcd Exp $ EAPI=4 @@ -37,15 +37,15 @@ EOF doenvd 43kdepaths # Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env - cat <<EOF > 11-xdg-menu-kde-${SLOT} + cat <<EOF > 11-xdg-menu-kde-$(get_kde_version) #!/bin/sh if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then - export XDG_MENU_PREFIX="kde-${SLOT}-" + export XDG_MENU_PREFIX="kde-$(get_kde_version)-" fi EOF exeinto /etc/X11/xinit/xinitrc.d/ - doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed" + doexe 11-xdg-menu-kde-$(get_kde_version) || die "doexe failed" } pkg_preinst() { diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index eefd278a381d..df86ca3adea9 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.237 2011/06/11 08:11:43 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.238 2011/06/12 22:57:37 abcd Exp $ + + 12 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdebase-startkde-4.6.2.ebuild, + kdebase-startkde-4.6.3.ebuild: + Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly 11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +files/KDE-4, kdebase-startkde-4.6.4.ebuild: diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild index f8f4339d67d5..2199b4dea714 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild,v 1.5 2011/06/06 20:28:22 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild,v 1.6 2011/06/12 22:57:37 abcd Exp $ EAPI=3 @@ -83,7 +83,7 @@ src_install() { doexe "${T}/KDE-4" || die "doexe KDE-4 failed" # freedesktop compliant session script - sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE $(get_kde_version):" \ "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop" insinto /usr/share/xsessions doins "${T}/KDE-4.desktop" || die "doins KDE-4.desktop failed" @@ -98,7 +98,7 @@ pkg_postinst () { elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" echo elog "The name of the session script has changed." - elog "If you currently have XSESSION=\"kde-${SLOT}\" in your" + elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your" elog "configuration files, you will need to change it to" elog "XSESSION=\"KDE-4\"" } diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild index 82efca9dc34e..cb89bd2f7b4c 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild,v 1.4 2011/06/10 11:50:23 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild,v 1.5 2011/06/12 22:57:37 abcd Exp $ EAPI=4 @@ -83,7 +83,7 @@ src_install() { doexe "${T}/KDE-4" # freedesktop compliant session script - sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE $(get_kde_version):" \ "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop" insinto /usr/share/xsessions doins "${T}/KDE-4.desktop" @@ -98,7 +98,7 @@ pkg_postinst () { elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh" echo elog "The name of the session script has changed." - elog "If you currently have XSESSION=\"kde-${SLOT}\" in your" + elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your" elog "configuration files, you will need to change it to" elog "XSESSION=\"KDE-4\"" } |