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: Mon, 6 Jun 2011 20:30:06 +0000 (UTC) [thread overview]
Message-ID: <20110606203006.EB12820036@flycatcher.gentoo.org> (raw)
abcd 11/06/06 20:30:06
Modified: kde-env-4.6.3.ebuild ChangeLog kde-env-4.6.2.ebuild
Log:
Remove mentions of kdeprefix
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Revision Changes Path
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild?rev=1.2&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.1&r2=1.2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-env-4.6.3.ebuild 7 May 2011 10:47:57 -0000 1.1
+++ kde-env-4.6.3.ebuild 6 Jun 2011 20:30:06 -0000 1.2
@@ -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.1 2011/05/07 10:47:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.6.3.ebuild,v 1.2 2011/06/06 20:30:06 abcd Exp $
EAPI=4
@@ -29,58 +29,19 @@
}
src_install() {
- if use kdeprefix; then
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs+=":${EKDEDIR}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-
- # number goes down with version
- cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
- doenvd 43kdepaths-${SLOT}
- cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
- insinto /etc/revdep-rebuild
- doins 50-kde-${SLOT}
-
- # kdeglobals needed to make third party apps installed in /usr work
- cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
- insinto ${KDEDIR}/share/config
- doins kdeglobals
-
- KDE_X="KDE-${SLOT}"
- else
- # Much simpler for the FHS compliant -kdeprefix install
- # number goes down with version
- cat <<-EOF > 43kdepaths
+ # Much simpler for the FHS compliant -kdeprefix install
+ # number goes down with version
+ cat <<-EOF > 43kdepaths
CONFIG_PROTECT="/usr/share/config"
#KDE_IS_PRELINKED=1
EOF
- doenvd 43kdepaths
-
- KDE_X="KDE-4"
- fi
+ doenvd 43kdepaths
# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
cat <<EOF > 11-xdg-menu-kde-${SLOT}
#!/bin/sh
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
export XDG_MENU_PREFIX="kde-${SLOT}-"
fi
EOF
1.103 kde-base/kde-env/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/ChangeLog?r1=1.102&r2=1.103
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog 2 Jun 2011 21:57:39 -0000 1.102
+++ ChangeLog 6 Jun 2011 20:30:06 -0000 1.103
@@ -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.102 2011/06/02 21:57:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.103 2011/06/06 20:30:06 abcd Exp $
+
+ 06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kde-env-4.6.2.ebuild,
+ kde-env-4.6.3.ebuild:
+ Remove mentions of kdeprefix
02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kde-env-4.4.5.ebuild,
-kde-env-4.4.5-r1.ebuild:
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kde-env/kde-env-4.6.2.ebuild?rev=1.5&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.4&r2=1.5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde-env-4.6.2.ebuild 1 Jun 2011 17:53:12 -0000 1.4
+++ kde-env-4.6.2.ebuild 6 Jun 2011 20:30:06 -0000 1.5
@@ -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.4 2011/06/01 17:53:12 ranger Exp $
+# $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 $
EAPI=3
@@ -29,58 +29,18 @@
}
src_install() {
- if use kdeprefix; then
- # List all the multilib libdirs
- local _libdir _libdirs
- for _libdir in $(get_all_libdirs); do
- _libdirs+=":${EKDEDIR}/${_libdir}"
- done
- _libdirs=${_libdirs#:}
-
- # number goes down with version
- cat <<-EOF > 43kdepaths-${SLOT}
-PATH="${EKDEDIR}/bin"
-ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${EKDEDIR}/share/man"
-CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${EKDEDIR}/share"
-EOF
- doenvd 43kdepaths-${SLOT}
- cat <<-EOF > 50-kde-${SLOT}
-SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
-EOF
- insinto /etc/revdep-rebuild
- doins 50-kde-${SLOT}
-
- # kdeglobals needed to make third party apps installed in /usr work
- cat <<-EOF > kdeglobals
-[Directories][\$i]
-prefixes=${EPREFIX}/usr
-EOF
- insinto ${KDEDIR}/share/config
- doins kdeglobals
-
- KDE_X="KDE-${SLOT}"
- else
- # Much simpler for the FHS compliant -kdeprefix install
- # number goes down with version
- cat <<-EOF > 43kdepaths
+ # number goes down with version
+ cat <<-EOF > 43kdepaths
CONFIG_PROTECT="/usr/share/config"
#KDE_IS_PRELINKED=1
EOF
- doenvd 43kdepaths
-
- KDE_X="KDE-4"
- fi
+ doenvd 43kdepaths
# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
cat <<EOF > 11-xdg-menu-kde-${SLOT}
#!/bin/sh
-if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
export XDG_MENU_PREFIX="kde-${SLOT}-"
fi
EOF
next reply other threads:[~2011-06-06 20:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 20:30 Jonathan Callen (abcd) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-12 22:54 [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-14 23:26 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=20110606203006.EB12820036@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