From: "Jonathan Callen (abcd)" <abcd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kde-env: kde-env-4.6.3.ebuild ChangeLog kde-env-4.6.2.ebuild
Date: Sun, 12 Jun 2011 22:54:49 +0000 (UTC) [thread overview]
Message-ID: <20110612225449.D0A702004E@flycatcher.gentoo.org> (raw)
abcd 11/06/12 22:54:49
Modified: kde-env-4.6.3.ebuild ChangeLog kde-env-4.6.2.ebuild
Log:
Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Revision Changes Path
1.6 kde-base/kde-env/kde-env-4.6.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild?r1=1.5&r2=1.6
Index: kde-env-4.6.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-env-4.6.3.ebuild 10 Jun 2011 11:51:02 -0000 1.5
+++ kde-env-4.6.3.ebuild 12 Jun 2011 22:54:49 -0000 1.6
@@ -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 @@
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() {
1.108 kde-base/kde-env/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?r1=1.107&r2=1.108
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog 10 Jun 2011 18:00:12 -0000 1.107
+++ ChangeLog 12 Jun 2011 22:54:49 -0000 1.108
@@ -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)
1.6 kde-base/kde-env/kde-env-4.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild?r1=1.5&r2=1.6
Index: kde-env-4.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde-env-4.6.2.ebuild 6 Jun 2011 20:30:06 -0000 1.5
+++ kde-env-4.6.2.ebuild 12 Jun 2011 22:54:49 -0000 1.6
@@ -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 @@
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() {
next reply other threads:[~2011-06-12 22:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-12 22:54 Jonathan Callen (abcd) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-14 23:26 [gentoo-commits] gentoo-x86 commit in kde-base/kde-env: kde-env-4.6.3.ebuild ChangeLog kde-env-4.6.2.ebuild Jonathan Callen (abcd)
2011-06-06 20:30 Jonathan Callen (abcd)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110612225449.D0A702004E@flycatcher.gentoo.org \
--to=abcd@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox