diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-22 23:45:40 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-22 23:45:40 +0000 |
| commit | 7ceb45dc9796b4594dc248c9bb55264ed1ed1538 (patch) | |
| tree | 2ea8a436ec79706192b5369b41de856a31ac546e /kde-base/kde-env | |
| parent | Pull in changes from overlay (diff) | |
| download | gentoo-2-7ceb45dc9796b4594dc248c9bb55264ed1ed1538.tar.gz gentoo-2-7ceb45dc9796b4594dc248c9bb55264ed1ed1538.tar.bz2 gentoo-2-7ceb45dc9796b4594dc248c9bb55264ed1ed1538.zip | |
Pull in changes from overlay and prefix support
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base/kde-env')
| -rw-r--r-- | kde-base/kde-env/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kde-env/kde-env-4.3.4.ebuild | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog index cd081be70b7f..9167b352e275 100644 --- a/kde-base/kde-env/ChangeLog +++ b/kde-base/kde-env/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kde-env # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.57 2009/12/10 20:07:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.58 2009/12/22 23:45:40 abcd Exp $ + + 22 Dec 2009; Jonathan Callen <abcd@gentoo.org> kde-env-4.3.4.ebuild: + Pull in changes from overlay and prefix support 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kde-env-4.3.1.ebuild: diff --git a/kde-base/kde-env/kde-env-4.3.4.ebuild b/kde-base/kde-env/kde-env-4.3.4.ebuild index 4f3708270c9e..c525f7af7000 100644 --- a/kde-base/kde-env/kde-env-4.3.4.ebuild +++ b/kde-base/kde-env/kde-env-4.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.3.4.ebuild,v 1.1 2009/12/01 10:20:45 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild,v 1.2 2009/12/22 23:45:40 abcd Exp $ EAPI="2" @@ -33,14 +33,16 @@ src_compile() { } src_install() { + use prefix || ED=$D + dodir /etc/env.d dodir /etc/revdep-rebuild - dodir "${PREFIX}/share/config" + dodir ${KDEDIR}/share/config # List all the multilib libdirs local _libdir _libdirs for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${PREFIX}/${_libdir}" + _libdirs+=":${EKDEDIR}/${_libdir}" done _libdirs=${_libdirs#:} @@ -48,24 +50,24 @@ src_install() { # number goes down with version cat <<-EOF > "${T}/43kdepaths-${SLOT}" -PATH="${PREFIX}/bin" -ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" +PATH="${EKDEDIR}/bin" +ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin" LDPATH="${_libdirs}" -MANPATH="${PREFIX}/share/man" -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" +MANPATH="${EKDEDIR}/share/man" +CONFIG_PROTECT="${EKDEDIR}/share/config ${EKDEDIR}/env ${EKDEDIR}/shutdown ${EPREFIX}/usr/share/config" #KDE_IS_PRELINKED=1 -PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig" -XDG_DATA_DIRS="${PREFIX}/share" +PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig" +XDG_DATA_DIRS="${EKDEDIR}/share" EOF doenvd "${T}/43kdepaths-${SLOT}" - cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" -SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" + cat <<-EOF > "${ED}/etc/revdep-rebuild/50-kde-${SLOT}" +SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*" EOF # kdeglobals needed to make third party apps installed in /usr work - cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals" + cat <<-EOF > "${ED}/${KDEDIR}/share/config/kdeglobals" [Directories][\$i] -prefixes=/usr +prefixes=${EPREFIX}/usr EOF else @@ -73,7 +75,7 @@ EOF # Much simpler for the FHS compliant -kdeprefix install # number goes down with version cat <<-EOF > "${T}/43kdepaths" -CONFIG_PROTECT="/usr/share/config" +CONFIG_PROTECT="${EPREFIX}/usr/share/config" #KDE_IS_PRELINKED=1 EOF doenvd "${T}/43kdepaths" |