diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-12-23 11:48:57 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-12-23 11:48:57 +0000 |
| commit | 00bf7130a896641494ca9be5fe06c8ee7cd03f5d (patch) | |
| tree | 8839ca89841cc58fba94b20e70a55e7f46e98b23 /kde-base/kde-env | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-00bf7130a896641494ca9be5fe06c8ee7cd03f5d.tar.gz gentoo-2-00bf7130a896641494ca9be5fe06c8ee7cd03f5d.tar.bz2 gentoo-2-00bf7130a896641494ca9be5fe06c8ee7cd03f5d.zip | |
Don't just define ED, it will be already defined and read-only in future EAPIs. Don't use ED in an EAPI that does not declare it.
(Portage version: 2.2.00.15134-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'kde-base/kde-env')
| -rw-r--r-- | kde-base/kde-env/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kde-env/kde-env-4.3.4.ebuild | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog index 9167b352e275..afaa8b6489b9 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.58 2009/12/22 23:45:40 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.59 2009/12/23 11:48:57 grobian Exp $ + + 23 Dec 2009; Fabian Groffen <grobian@gentoo.org> kde-env-4.3.4.ebuild: + Don't just define ED, it will be already defined and read-only in future + EAPIs. Don't use ED in an EAPI that does not declare it. 22 Dec 2009; Jonathan Callen <abcd@gentoo.org> kde-env-4.3.4.ebuild: Pull in changes from overlay and prefix support 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 c525f7af7000..a7aed9f6ac6d 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.2 2009/12/22 23:45:40 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild,v 1.3 2009/12/23 11:48:57 grobian Exp $ EAPI="2" @@ -33,8 +33,6 @@ src_compile() { } src_install() { - use prefix || ED=$D - dodir /etc/env.d dodir /etc/revdep-rebuild dodir ${KDEDIR}/share/config @@ -60,12 +58,12 @@ PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig" XDG_DATA_DIRS="${EKDEDIR}/share" EOF doenvd "${T}/43kdepaths-${SLOT}" - cat <<-EOF > "${ED}/etc/revdep-rebuild/50-kde-${SLOT}" + cat <<-EOF > "${D%/}${EPREFIX}/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 > "${ED}/${KDEDIR}/share/config/kdeglobals" + cat <<-EOF > "${D}/${EKDEDIR}/share/config/kdeglobals" [Directories][\$i] prefixes=${EPREFIX}/usr EOF |